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 ef9e80e3..00000000
--- a/.github/workflows/build-cmake.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - '*'
-  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 f5adba0c..642e22a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ Makefile.local
 *.swp
 *tags
 *~
+/.vscode/
+/baseq3
 
 # OS X
 ####################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac6ed6c8..ba983bc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,36 +1,58 @@
-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 "./")
 set(CMAKE_DEBUG_POSTFIX "-dbg")
 
+#
+# Microsoft compiler specific parameters
+#
 if(MSVC)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
 	# Treat no return type as error
 	add_compile_options(/we4715)
 endif()
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+#
+# 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
@@ -42,26 +64,40 @@ 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)
@@ -69,18 +105,60 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug)
 	#	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")
@@ -91,48 +169,104 @@ 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_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 10317740..9d221b94 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,49 @@
 # 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
 
-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).
+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).
 
 ## Getting started
 
-- [Installing OpenMoHAA](docs/getting_started_installation.md)
+- [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)
+
+If you encounter any issues, please refer to the [FAQ](docs/faq.md) for possible solutions.
 
 ## Current state
 
-### Multiplayer
-
-The Multiplayer part is almost fully stable.
-
-Server admins can use OpenMoHAA to [host](docs/getting_started_installation.md#server) a mohaa/mohaas/mohaab server. Bugs must be reported by creating a new [issue](https://github.com/openmoh/openmohaa/issues) on the OpenMoHAA GitHub project. Players can use OpenMoHAA to [play](docs/getting_started_installation.md#client) on a mohaa/mohaas/mohaab server.
-
-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.
-
 ### Single-player
 
-The `training` map can be played from start to end. The single-player campaign is not fully functional, but at least AI can breathe, talk, run, and shoot.
+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.
+
+### Multiplayer
+
+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.
+
+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).
+
+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.
 
 ## Features
 
-- [What's working and what's not](docs/features_implementation.md)
-- [New features](docs/features.md)
-- [Scripting commands](https://htmlpreview.github.io/?https://github.com/openmoh/openmohaa/blob/main/docs/features_g_allclasses.html)
+- [List of new features](docs/features.md)
+- [Scripting](docs/scripting.md)
+
+## Reporting issues
+
+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.
+
+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
 
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 1ec5a6a2..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
@@ -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 3a1b260e..3d944fb9 100644
--- a/code/cgame/cg_archive.cpp
+++ b/code/cgame/cg_archive.cpp
@@ -113,7 +113,7 @@ void CG_ArchiveModelHandle(MemArchiver& archiver, qhandle_t* handle)
 		if (tmp.length()) {
 			*handle = cgi.R_RegisterModel(tmp.c_str());
 		} else {
-			*handle = NULL;
+			*handle = (qhandle_t)0;
 		}
 	} else {
 		if (*handle) {
@@ -135,7 +135,7 @@ void CG_ArchiveShaderHandle(MemArchiver& archiver, qhandle_t* handle)
 		if (tmp.length()) {
 			*handle = cgi.R_RegisterShader(tmp.c_str());
 		} else {
-			*handle = NULL;
+			*handle = (qhandle_t)0;
 		}
 	} else {
 		if (*handle) {
@@ -163,7 +163,7 @@ void CG_ArchiveRefEntity(MemArchiver& archiver, refEntity_t* ref)
     archiver.ArchiveVec3(ref->axis[2]);
     archiver.ArchiveBoolean(&ref->nonNormalizedAxes);
     archiver.ArchiveVec3(ref->origin);
-    archiver.ArchiveRaw(ref->frameInfo, 192);
+    archiver.ArchiveRaw(ref->frameInfo, sizeof(ref->frameInfo));
     archiver.ArchiveFloat(&ref->actionWeight);
     archiver.ArchiveShort(&ref->wasframe);
     archiver.ArchiveFloat(&ref->scale);
@@ -171,7 +171,7 @@ void CG_ArchiveRefEntity(MemArchiver& archiver, refEntity_t* ref)
     archiver.ArchiveInteger(&ref->skinNum);
 
     CG_ArchiveShaderHandle(archiver, &ref->customShader);
-    archiver.ArchiveRaw(ref->shaderRGBA, 4);
+    archiver.ArchiveRaw(ref->shaderRGBA, sizeof(ref->shaderRGBA));
     archiver.ArchiveFloat(ref->shaderTexCoord);
     archiver.ArchiveFloat(&ref->shaderTexCoord[1]);
     archiver.ArchiveFloat(&ref->shaderTime);
diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 6103d7a9..0ccee1bc 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -196,7 +196,8 @@ Event EV_Client_SetColorVelocity
     "rVel gVel bVel",
     "Set the color velocity of the spawned dlight tempmodel"
 );
-Event EV_Client_SetRandomVelocity(
+Event EV_Client_SetRandomVelocity
+(
     "randvel",
     EV_DEFAULT,
     "SfFSfFSfF",
@@ -210,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",
@@ -225,6 +227,14 @@ Event EV_Client_SetRandomVelocityAlongAxis(
     "without randomness.\n"
     "This velocity is applied using the parent axis"
 );
+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",
@@ -554,7 +564,16 @@ Event EV_Client_LoopSound
     EV_DEFAULT,
     "sFFf",
     "soundName volume min_distance pitch",
-    "Play the specifed sound as a looping sound"
+    "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
 (
@@ -975,7 +994,7 @@ 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
@@ -1075,6 +1094,15 @@ Event EV_Client_Print
     "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",
@@ -1112,7 +1140,7 @@ Event EV_Client_SetAlignStretch(
     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
 (
@@ -1185,6 +1213,14 @@ Event EV_Client_SFXStartDelayed
     "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;
 
@@ -1221,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                   },
@@ -1250,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                 },
@@ -1312,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                  },
@@ -1383,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;
@@ -1402,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;
     }
 
@@ -1438,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;
         }
     }
 }
@@ -1462,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")) {
@@ -1541,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 {
@@ -1551,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)
@@ -2157,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);
+    }
 }
 
 //=============
@@ -2586,7 +2645,9 @@ void ClientGameCommandManager::SetColorRange(Event *ev)
         return;
     }
 
-    // FIXME: unused stub??
+    //
+    // Unused
+    //
 }
 
 //=============
@@ -2666,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) {
@@ -2803,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)
@@ -3032,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;
@@ -3794,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()
         );
@@ -3851,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()
                 );
             }
@@ -3965,6 +4037,9 @@ void ClientGameCommandManager::StopSound(Event *ev)
     cgi.S_StopSound(current_entity_number, channel);
 }
 
+//===============
+// StopAliasChannel
+//===============
 void ClientGameCommandManager::StopAliasChannel(Event *ev)
 {
     str              sound_name;
@@ -3991,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;
     }
 
@@ -4060,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
 //===============
@@ -4099,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());
 }
 
 //===============
@@ -4112,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)
@@ -4141,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;
     }
 
@@ -4181,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));
     }
 }
@@ -4223,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))) {
@@ -4976,7 +5118,15 @@ bool ClientGameCommandManager::GetTagPositionAndOrientation(str tagname, orienta
 //===============
 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;
+    }
 }
 
 //===============
@@ -5029,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
             );
         }
@@ -5075,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
                 );
             }
@@ -5148,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;
@@ -5187,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)) {
@@ -5342,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;
@@ -5351,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;
         }
@@ -5359,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;
                 }
@@ -5372,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;
             }
@@ -5384,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;
@@ -5690,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;
     }
 
diff --git a/code/cgame/cg_commands.h b/code/cgame/cg_commands.h
index 7bd22fd2..60e39dec 100644
--- a/code/cgame/cg_commands.h
+++ b/code/cgame/cg_commands.h
@@ -113,6 +113,7 @@ 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;
@@ -763,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);
@@ -788,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);
@@ -849,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);
diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index ef409d57..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.
 
@@ -160,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)
@@ -216,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");
@@ -340,65 +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          },
+    {"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         },
 };
 
 /*
@@ -565,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 da1fb632..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;
 
@@ -331,7 +331,7 @@ static void CG_DrawPauseIcon()
     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()
@@ -362,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);
@@ -577,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]) {
@@ -597,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;
@@ -627,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 {
@@ -675,14 +684,17 @@ 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) {
@@ -702,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;
         }
 
@@ -778,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;
@@ -787,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];
     }
 }
 
@@ -813,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
+        );
     }
 }
 
@@ -855,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()
@@ -900,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)
@@ -914,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;
@@ -922,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;
     }
@@ -937,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()
@@ -954,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()
@@ -1009,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()
@@ -1032,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) {
@@ -1048,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)) {
@@ -1059,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)) {
@@ -1072,20 +1208,27 @@ 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;
         color[0] = 0.5;
@@ -1093,10 +1236,14 @@ void CG_DrawSpectatorView_ver_15()
         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");
@@ -1105,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
+            );
         }
     }
 }
@@ -1139,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);
@@ -1153,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
+        );
     }
 }
 
@@ -1180,7 +1344,7 @@ void CG_DrawCrosshair()
     float      x, y;
     float      width, height;
 
-    shader = NULL;
+    shader = (qhandle_t)0;
 
     if (!cg_hud->integer || !ui_crosshair->integer) {
         return;
@@ -1190,7 +1354,7 @@ void CG_DrawCrosshair()
         return;
     }
 
-    if ((cg.snap->ps.pm_flags & PMF_NO_LEAN) || (cg.snap->ps.pm_flags & PMF_INTERMISSION)) {
+    if ((cg.snap->ps.pm_flags & PMF_NO_HUD) || (cg.snap->ps.pm_flags & PMF_INTERMISSION)) {
         return;
     }
 
@@ -1199,6 +1363,9 @@ void CG_DrawCrosshair()
         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);
 
@@ -1226,23 +1393,23 @@ void CG_DrawCrosshair()
                 || ((myFlags & EF_AXIS) && (friendEnt->currentState.eFlags & EF_AXIS))) {
                 // friend
                 if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-                    shader = cgi.R_RegisterShader(cg_crosshair_friend->string);
+                    shader = cgi.R_RegisterShaderNoMip(cg_crosshair_friend->string);
                 }
             } else {
                 // enemy
                 if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-                    shader = cgi.R_RegisterShader(cg_crosshair->string);
+                    shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
                 }
             }
         } else {
             if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-                shader = cgi.R_RegisterShader(cg_crosshair->string);
+                shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
             }
         }
     } else {
         // FFA
         if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-            shader = cgi.R_RegisterShader(cg_crosshair->string);
+            shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
         }
     }
 
@@ -1253,7 +1420,7 @@ void CG_DrawCrosshair()
         y      = (cgs.glconfig.vidHeight - height) * 0.5f;
 
         cgi.R_SetColor(NULL);
-        cgi.R_DrawStretchPic(x, y, width, height, 0, 0, 1, 1, shader);
+        cgi.R_DrawStretchPic(x, y, width * cgs.uiHiResScale[0], height * cgs.uiHiResScale[1], 0, 0, 1, 1, shader);
     }
 }
 
@@ -1284,15 +1451,17 @@ void CG_DrawVote()
     percentNo        = cgs.numVotesNo * 100 / (cgs.numUndecidedVotes + cgs.numVotesNo + cgs.numVotesYes);
     percentUndecided = cgs.numUndecidedVotes * 100 / (cgs.numUndecidedVotes + cgs.numVotesNo + cgs.numVotesYes);
 
-    x = 8;
-    y = (cgs.glconfig.vidHeight > 480) ? (cgs.glconfig.vidHeight * 0.725f) : (cgs.glconfig.vidHeight * 0.75f);
+    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, y, -1, qfalse);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
 
-    y += 12;
+    y += 12 * cgs.uiHiResScale[1];
 
     text =
         va("%s: %isec  %s: %i%%  %s: %i%%  %s: %i%%",
@@ -1304,7 +1473,9 @@ void CG_DrawVote()
            percentNo,
            cgi.LV_ConvertString("Undecided"),
            percentUndecided);
-    cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, qfalse);
+    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;
@@ -1313,15 +1484,19 @@ void CG_DrawVote()
         col[3] = 1.0;
         cgi.R_SetColor(col);
 
-        y += 12;
+        y += 12 * cgs.uiHiResScale[1];
 
         text = cgi.LV_ConvertString("Vote now, it's your patriotic duty!");
-        cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, qfalse);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
 
-        y += 12;
+        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, y, -1, qfalse);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
         cgi.R_SetColor(NULL);
     }
 }
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 314bf2b9..86921201 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -187,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;
 
@@ -269,6 +270,8 @@ extern "C" {
         qhandle_t hAlliedPlayerModelHandle;
         dtiki_t  *pAxisPlayerModel;
         qhandle_t hAxisPlayerModelHandle;
+        qboolean  serverAlliedModelValid;
+        qboolean  serverAxisModelValid;
 
         // view eyes
         vec3_t vOffsetViewAngles;
@@ -340,6 +343,7 @@ extern "C" {
         float        ObjectivesBaseAlpha;
         float        ObjectivesDesiredAlpha;
         float        ObjectivesCurrentAlpha;
+        int          ObjectivesCurrentIndex;
 
         // misc
         crain_t      rain;
@@ -378,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
@@ -429,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;
@@ -500,10 +506,18 @@ 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
     //
+    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);
@@ -519,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
@@ -726,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,
@@ -920,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
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 70f4346b..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;
@@ -109,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;
 
 /*
 =================
@@ -154,9 +162,9 @@ 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);
@@ -196,53 +204,113 @@ 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);
-
-    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");
-
-    startTime = cgi.Milliseconds();
-    CG_Command_ProcessFile(filename, 0, 0);
-    endTime = cgi.Milliseconds() - startTime;
-
-    Com_Printf("Parse/Load time: %f seconds.\n", endTime / 1000.0f);
-    Com_Printf("-------------UBERDIALOG DONE---------------\n\n");
+    cgi.FS_FreeFileList(fileList);
 }
 
 /*
@@ -252,13 +320,11 @@ CG_IsHandleUnique
 Check if the model handle is unique
 ================
 */
-static qboolean CG_IsHandleUnique(int num) {
-    qhandle_t handle;
+static qboolean CG_IsHandleUnique(qhandle_t handle) {
     int i;
     int numRef;
 
     numRef = 0;
-    handle = cgs.model_draw[num];
     for (i = 0; i < MAX_MODELS; i++) {
         if (cgs.model_draw[i] == handle) {
             numRef++;
@@ -301,6 +367,8 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             if (tiki) {
                 CG_ProcessCacheInitCommands(tiki);
             }
+
+            CG_ServerModelLoaded(str, hModel);
         } else {
             // clear out the model
             if (hOldModel && CG_IsHandleUnique(hOldModel)) {
@@ -308,6 +376,10 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
                 cgi.R_UnregisterServerModel(hOldModel);
             }
             cgs.model_draw[num - CS_MODELS] = 0;
+
+            if (!str || !str[0]) {
+                CG_ServerModelUnloaded(hOldModel);
+            }
         }
     }
 
@@ -335,28 +407,39 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             cg.rain.width = atof(str);
             return;
         case CS_RAIN_SHADER:
+            Q_strncpyz(cg.rain.currentShader, str, sizeof(cg.rain.currentShader));
             if (cg.rain.numshaders) {
-                for (i = 0; i < cg.rain.numshaders; i++) {
-                    sprintf(cg.rain.shader[i], "%s%i", str, i);
+                // 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;
                 }
-            } else {
-                strcpy(cg.rain.shader[0], str);
+            }
+            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++) {
-                    sprintf(cg.rain.shader[i], "%s%i", str, 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;
         }
 
         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"));
+            Q_strncpyz(objective->text, Info_ValueForKey(str, "text"), sizeof(objective->text));
         }
 
         switch (num) {
@@ -411,7 +494,7 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             if (len) {
                 qboolean streamed;
                 char     buf[1024];
-                strcpy(buf, str);
+                Q_strncpyz(buf, str, sizeof(buf));
         
                 streamed     = buf[len - 1] != '0';
                 buf[len - 1] = 0;
@@ -525,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);
 }
 
 /*
@@ -623,6 +707,8 @@ void CG_Init(clientGameImport_t *imported, int serverMessageNum, int serverComma
     cgi = *imported;
 
     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);
 
@@ -811,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);
@@ -823,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);
diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 4c413d1a..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;
 
@@ -693,26 +690,16 @@ void CG_ImpactMark(
     // 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 5386db19..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,118 @@ 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
@@ -187,20 +326,20 @@ CG_CastFootShadow
 Cast complex foot shadow using lights
 ===============
 */
-void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag, refEntity_t* model)
+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;
+    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);
@@ -210,8 +349,7 @@ void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag,
         VectorMA(vPos, vEnd[i], model->axis[i], vPos);
     }
 
-    if (cg_shadowdebug->integer)
-    {
+    if (cg_shadowdebug->integer) {
         vec3_t vDir;
 
         //
@@ -262,12 +400,11 @@ void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag,
     }
 
     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;
+    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)
-    {
+
+    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);
     }
@@ -281,7 +418,7 @@ void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag,
         trace.fraction = 0;
     }
 
-    fWidth = 10.f - (1.f - trace.fraction) * 6.f;
+    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]));
@@ -334,13 +471,21 @@ 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)
+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;
+    int           i;
+    float         fShadowYaw;
+    float         fLength;
+    vec3_t        vPos, vRightPos, vLeftPos;
+    vec3_t        vDelta;
     orientation_t oFoot;
 
     //
@@ -374,7 +519,7 @@ void CG_CastSimpleFeetShadow(const trace_t* pTrace, float fWidth, float fAlpha,
 
     // get the facing yaw
     fShadowYaw = vectoyaw(vDelta);
-    fLength = VectorNormalize(vDelta) * 0.5 + 12;
+    fLength    = VectorNormalize(vDelta) * 0.5 + 12;
     if (fLength < fWidth * 0.7) {
         fLength = fWidth * 0.7;
     }
@@ -439,15 +584,13 @@ qboolean CG_EntityShadow(centity_t *cent, refEntity_t *model)
         }
 
         if (iTagR != -1) {
-            int iNumLights, iCurrLight;
+            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++)
-                {
+            if (iNumLights) {
+                for (iCurrLight = 0; iCurrLight < iNumLights; iCurrLight++) {
                     CG_CastFootShadow(avLightPos[iCurrLight], avLightIntensity[iCurrLight], iTagL, model);
                     CG_CastFootShadow(avLightPos[iCurrLight], avLightIntensity[iCurrLight], iTagR, model);
                 }
@@ -550,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)) {
@@ -614,6 +757,11 @@ void CG_AttachEntity(
     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
 )
@@ -626,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);
         }
@@ -639,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;
@@ -697,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;
@@ -709,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;
     }
@@ -834,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;
@@ -859,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];
@@ -880,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;
@@ -1190,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) {
@@ -1201,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) {
@@ -1227,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
@@ -1323,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 12fc0e4d..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"
 
@@ -84,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;
     }
 
@@ -160,49 +166,49 @@ static void CG_MakeBulletHoleType(
         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:
@@ -252,7 +258,12 @@ CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t
         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;
     }
 
@@ -267,7 +278,7 @@ CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t
         break;
     case SURF_SNOW:
         sBulletHole += "snow";
-        iEffect = SFX_BHIT_FOLIAGE_LITE;
+        iEffect = SFX_BHIT_SNOW_LITE;
         break;
     case SURF_CARPET:
         sBulletHole += "carpet";
@@ -283,7 +294,7 @@ CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t
         break;
     case SURF_GLASS:
         sBulletHole += "glass";
-        iEffect = SFX_BHIT_GRASS_LITE;
+        iEffect = SFX_BHIT_GLASS_LITE;
         break;
     case SURF_GRAVEL:
         fRadius = 0.f;
@@ -366,7 +377,7 @@ static void CG_MakeBubbleTrail(const vec3_t i_vStart, const vec3_t i_vEnd, int i
     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 * alpha;
         fDist -= fMove;
@@ -426,7 +437,7 @@ static void CG_BulletTracerEffect(const vec3_t i_vStart, const vec3_t i_vEnd, in
         0,
         1,
         1.0,
-        1.0,
+        scale,
         BEAM_INVERTED,
         1000.0,
         iLife,
@@ -459,35 +470,36 @@ static void CG_MakeBulletTracerInternal(
     float         alpha
 )
 {
-    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   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;
+    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;
@@ -535,7 +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;
@@ -554,7 +566,7 @@ static void CG_MakeBulletTracerInternal(
                             vec_zero,
                             vTraceStart,
                             ENTITYNUM_NONE,
-                            MASK_SHOT,
+                            MASK_SHOT_FLUID,
                             qfalse,
                             qfalse,
                             "CG_MakeBulletTracerInternal"
@@ -564,11 +576,11 @@ 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++;
                     }
@@ -583,7 +595,8 @@ static void CG_MakeBulletTracerInternal(
                              || (trace.contents & CONTENTS_WATER))
                             && iContinueCount < 5) {
                             if (bInWater) {
-                                VectorSubtract(trace.endpos, vDir, vTmp);
+                                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);
@@ -595,8 +608,7 @@ static void CG_MakeBulletTracerInternal(
                                 bInWater = qtrue;
                             }
 
-                            VectorAdd(vDir, vDir, vTraceStart);
-                            VectorAdd(vTraceStart, vTraceStart, trace.endpos);
+                            VectorMA(trace.endpos, 2.0, vDir, vTraceStart);
 
                             iContinueCount++;
                         } else {
@@ -658,46 +670,46 @@ static void CG_MakeBulletTracerInternal(
     if (iNumImpacts > 2) {
         fImpSndDistRA  = 9999.0f;
         fImpSndDistRB  = 9999.0f;
-        iImpSndIndexRA = 0;
-        iImpSndIndexRB = 0;
+        fImpSndDistLA  = 9999.0f;
         fImpSndDistLB  = 9999.0f;
+        iImpSndIndexRA = 0;
+        iImpSndIndexLA = 0;
+        iImpSndIndexRB = 0;
         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 (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) {
                     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,6 +729,24 @@ 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(
@@ -735,8 +765,14 @@ static void CG_MakeBulletTracerInternal(
         }
 
         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);
+            }
+        }
     }
 }
 
@@ -859,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";
@@ -897,7 +934,8 @@ 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 {
                             sSoundName = "snd_bh_wood";
@@ -923,14 +961,14 @@ 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 {
                         sSoundName = "snd_bh_wood";
@@ -945,14 +983,15 @@ void CG_AddBulletImpacts()
             }
 
             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 {
                         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 {
                         sSoundName = "snd_bh_wood";
@@ -987,14 +1026,16 @@ void CG_AddBulletImpacts()
     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) {
+                    if (iHeadDist < fImpSndDistRB) {
                         fImpSndDistRA  = iHeadDist;
                         iImpSndIndexRA = i;
                     }
@@ -1003,6 +1044,30 @@ void CG_AddBulletImpacts()
                     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;
@@ -1031,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(
@@ -1074,14 +1150,18 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             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;
@@ -1115,14 +1195,18 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             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;
@@ -1144,7 +1228,9 @@ 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;
@@ -1156,14 +1242,18 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             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;
@@ -1211,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)
@@ -1247,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();
@@ -1259,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];
@@ -1279,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();
@@ -1324,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();
@@ -1337,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]);
@@ -1346,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);
@@ -1365,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);
@@ -1375,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;
@@ -1398,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();
@@ -1407,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];
@@ -1446,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_";
@@ -1463,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();
@@ -1474,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;
@@ -1487,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();
@@ -1496,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;
@@ -1509,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;
@@ -1519,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();
@@ -1533,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);
@@ -1582,7 +1686,7 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
 
-        case 40:
+        case CGM_VOICE_CHAT:
             {
                 int iOldEnt;
 
@@ -1598,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");
@@ -1647,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();
@@ -1659,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];
@@ -1670,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();
@@ -1705,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();
@@ -1717,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);
@@ -1736,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);
@@ -1746,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;
@@ -1769,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();
@@ -1778,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];
@@ -1815,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_";
@@ -1832,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();
@@ -1847,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();
@@ -1860,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;
@@ -1870,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();
@@ -1884,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);
@@ -1933,7 +2075,7 @@ void CG_ParseCGMessage_ver_6()
             }
             break;
 
-        case 37:
+        case CGM6_VOICE_CHAT:
             {
                 int iOldEnt;
 
@@ -1950,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 03f9a3e9..4eeb4ac1 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -190,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,
@@ -329,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;
@@ -342,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);
@@ -493,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;
@@ -515,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 1b895795..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);
@@ -311,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 =============
@@ -360,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);
@@ -430,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;
@@ -463,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,
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 25c0e356..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.
 
@@ -25,12 +26,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #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) {
@@ -134,6 +150,7 @@ 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"));
@@ -148,10 +165,10 @@ void CG_ParseServerinfo(void)
     cgi.Cvar_Set("cg_scoreboardpicover", Info_ValueForKey(info, "g_scoreboardpicover"));
     mapChecksumStr = Info_ValueForKey(info, "sv_mapChecksum");
     if (mapChecksumStr && mapChecksumStr[0]) {
-        cgs.mapChecksum = atoi(mapChecksumStr);
+        cgs.mapChecksum    = atoi(mapChecksumStr);
         cgs.useMapChecksum = qtrue;
     } else {
-        cgs.mapChecksum = 0;
+        cgs.mapChecksum    = 0;
         cgs.useMapChecksum = qfalse;
     }
 
@@ -169,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");
@@ -296,7 +317,7 @@ static void CG_ServerCommand(qboolean modelOnly)
     }
 
     if (!strcmp(cmd, "cs")) {
-        CG_ConfigStringModified(atoi(cgi.Argv(1)), modelOnly);
+        CG_ConfigStringModified(cgi.getConfigStringIdNormalized(atoi(cgi.Argv(1))), modelOnly);
         return;
     }
 
@@ -311,12 +332,12 @@ static void CG_ServerCommand(qboolean modelOnly)
         }
         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);
@@ -352,7 +373,14 @@ static void CG_ServerCommand(qboolean modelOnly)
     }
 
     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;
     }
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/renderer/tr_ghost.cpp b/code/cgame/cg_servercmds_filter.h
similarity index 82%
rename from code/renderer/tr_ghost.cpp
rename to code/cgame/cg_servercmds_filter.h
index 2b619982..f8351028 100644
--- a/code/renderer/tr_ghost.cpp
+++ b/code/cgame/cg_servercmds_filter.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,7 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-// tr_ghost.cpp
+// DESCRIPTION:
+// cg_servercmds_filter.h -- filtered server commands
 
-#include "tr_local.h"
-#include "tr_ghost.h"
+#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 051d1fb9..06b6d67d 100644
--- a/code/cgame/cg_snapshot.c
+++ b/code/cgame/cg_snapshot.c
@@ -73,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 {
@@ -87,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;
@@ -346,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 fae4fd55..3ce3ab04 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -79,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;
@@ -86,6 +91,22 @@ 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;
+    }
 }
 
 //===============
@@ -110,10 +131,10 @@ void ClientGameCommandManager::FreeAllTempModels(void)
 //===============
 void ClientGameCommandManager::FreeSomeTempModels(void)
 {
-    ctempmodel_t* model;
-    int count = 0;
-    unsigned int i;
-    unsigned int numToFree;
+    ctempmodel_t *model;
+    int           count = 0;
+    unsigned int  i;
+    unsigned int  numToFree;
 
     if (!m_free_tempmodels) {
         return;
@@ -138,10 +159,10 @@ void ClientGameCommandManager::FreeSomeTempModels(void)
 //===============
 // FreeSpawnthing
 //===============
-void ClientGameCommandManager::FreeSpawnthing(spawnthing_t* sp)
+void ClientGameCommandManager::FreeSpawnthing(spawnthing_t *sp)
 {
-    ctempmodel_t* model;
-    ctempmodel_t* prev;
+    ctempmodel_t *model;
+    ctempmodel_t *prev;
 
     if (sp->numtempmodels) {
         for (model = m_active_tempmodels.prev; model != &m_active_tempmodels; model = prev) {
@@ -178,7 +199,7 @@ void ClientGameCommandManager::ResetTempModels(void)
 }
 
 static int lastTempModelFrameTime = 0;
-int next_tempmodel_warning = 0;
+int        next_tempmodel_warning = 0;
 
 void CG_ResetTempModels(void)
 {
@@ -207,11 +228,16 @@ void ClientGameCommandManager::InitializeTempModels(void)
 
 void ClientGameCommandManager::InitializeTempModelCvars(void)
 {
-    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);
+    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) {
@@ -232,9 +258,9 @@ 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
@@ -418,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
@@ -468,16 +496,16 @@ void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t *p, Vector ori
     if (p->number != -1) {
         refEntity_t *old_entity;
         dtiki_t     *old_tiki;
-        int         oldnum;
-        float       oldscale;
+        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;
+        old_tiki   = current_tiki;
+        oldnum     = current_entity_number;
+        oldscale   = current_scale;
 
         current_scale         = newEnt->scale;
         current_entity        = newEnt;
@@ -502,7 +530,7 @@ void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t *p, Vector ori
 
     if (p->cgd.flags2 & T2_ALIGNSTRETCH) {
         Vector vDelta;
-        float fScale;
+        float  fScale;
 
         vDelta = p->cgd.origin - p->cgd.oldorigin;
         fScale = vDelta.length() * p->cgd.scale2;
@@ -518,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);
@@ -538,8 +567,8 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
 
     // 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;
-        refEntity_t* e;
+        centity_t   *pc;
+        refEntity_t *e;
 
         pc = &cg_entities[p->cgd.parent];
         if (!pc->currentValid) {
@@ -553,8 +582,7 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
 
         parentOrigin = e->origin;
         vectoangles(e->axis[0], parentAngles);
-    }
-    else if (p->cgd.flags & T_SWARM) {
+    } else if (p->cgd.flags & T_SWARM) {
         p->cgd.parentOrigin = p->cgd.velocity + p->cgd.accel * ftime * scale;
     }
 
@@ -633,9 +661,7 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
             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);
-        }
-
-        if (p->cgd.flags2 & T2_CLAMP_VEL_AXIS) {
+        } 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]);
@@ -650,8 +676,48 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
             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 {
         Vector normal;
@@ -829,10 +895,11 @@ void ClientGameCommandManager::AddTempModels(void)
     refEntity_t  *old_ent;
 
     // To counteract cg.time going backwards
-    if (lastTempModelFrameTime && ((cg.time < lastTempModelFrameTime) || (cg.time - lastTempModelFrameTime > TOO_MUCH_TIME_PASSED))) {
+    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;
+            next               = p->prev;
             p->lastPhysicsTime = cg.time;
         }
         lastTempModelFrameTime = cg.time;
@@ -913,7 +980,12 @@ void ClientGameCommandManager::AddTempModels(void)
         // time of this tempmodel
         lerpfrac = (float)(cg.time - p->lastPhysicsTime) / (float)physics_rate;
         // Clamp
-        lerpfrac = Q_clamp_float(lerpfrac, 0, 1);
+        if (lerpfrac > 1 || (p->cgd.flags2 & T2_PHYSICS_EVERYFRAME)) {
+            lerpfrac = 1;
+        }
+        if (lerpfrac < 0) {
+            lerpfrac = 0;
+        }
 
         // Increment the time this tempmodel has been alive
         p->aliveTime += frameTime;
@@ -927,7 +999,7 @@ void ClientGameCommandManager::AddTempModels(void)
         // Run physics if the lastEnt is not valid to get a valid lerp
         if (!p->lastEntValid) {
             float t;
-            t  = physics_rate / 1000.0f;
+            t = physics_rate / 1000.0f;
 
             ret = TempModelPhysics(p, t, scale);
             if (!ret) {
@@ -1113,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;
@@ -1137,7 +1209,13 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             {
                 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);
@@ -1146,7 +1224,7 @@ 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;
@@ -1390,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
@@ -1424,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;
             }
@@ -1446,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 5c011963..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";
@@ -192,8 +193,36 @@ void CG_HudPrint_f(void)
     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 6e7a63ef..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;
 
@@ -560,17 +577,6 @@ static int CG_CalcViewValues(void)
     CG_CalcVrect();
     CG_SetupFog();
 
-    // 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);
-
     ps = &cg.predicted_player_state;
 
     VectorCopy(ps->origin, cg.refdef.vieworg);
@@ -723,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) {
@@ -811,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();
 
@@ -882,13 +927,13 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
                     {
                     default:
                     case 0:
-                        cgi.UI_HideMenu("mission_success_1", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_success_1", qtrue);
                         break;
                     case 2:
-                        cgi.UI_HideMenu("mission_success_2", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_success_2", qtrue);
                         break;
                     case 3:
-                        cgi.UI_HideMenu("mission_success_3", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_success_3", qtrue);
                         break;
                     }
                 } else {
@@ -896,21 +941,21 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
                     {
                     default:
                     case 0:
-                        cgi.UI_HideMenu("mission_failed_1", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_failed_1", qtrue);
                         break;
                     case 2:
-                        cgi.UI_HideMenu("mission_failed_2", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_failed_2", qtrue);
                         break;
                     case 3:
-                        cgi.UI_HideMenu("mission_failed_3", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_failed_3", qtrue);
                         break;
                     }
                 }
             } else {
                 if (cgi.Cvar_Get("g_success", "", 0)->integer) {
-                    cgi.UI_HideMenu("StatsScreen_Success", qfalse);
+                    cgi.UI_HideMenu("StatsScreen_Success", qtrue);
                 } else {
-                    cgi.UI_HideMenu("StatsScreen_Failed", qfalse);
+                    cgi.UI_HideMenu("StatsScreen_Failed", qtrue);
                 }
             }
         }
@@ -918,6 +963,9 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
         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
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 33cf3769..eeb6a3ce 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -42,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;
@@ -78,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);
     }
 }
 
@@ -206,7 +209,7 @@ void ClientGameCommandManager::ResetVSSSources()
 
 void ClientGameCommandManager::ResetVSSSources(Event *ev)
 {
-    // FIXME: stub??
+    ResetVSSSources();
 }
 
 void CG_ResetVSSSources()
@@ -286,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
@@ -312,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,
@@ -334,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);
@@ -358,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++) {
@@ -619,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++) {
@@ -638,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];
@@ -741,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;
             }
@@ -772,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;
 
@@ -794,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());
@@ -803,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;
@@ -825,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());
@@ -836,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++) {
@@ -869,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);
         }
@@ -890,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;
         }
     }
 }
@@ -1222,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) {
@@ -1237,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;
                 }
@@ -1262,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;
             }
@@ -1335,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
index f934fe65..a07c4211 100644
--- a/code/cgame/memarchiver.cpp
+++ b/code/cgame/memarchiver.cpp
@@ -42,23 +42,23 @@ MemArchiver::~MemArchiver()
 
 void MemArchiver::SetupForWriting(size_t initialSize)
 {
-    state = MEMARC_WRITING;
-    buffer = (byte*)cgi.Malloc(initialSize);
-    allocatedSize = initialSize;
-    bufferSize = 0;
+    this->state = MEMARC_WRITING;
+    this->buffer = (byte*)cgi.Malloc(initialSize);
+    this->allocatedSize = initialSize;
+    this->bufferSize = 0;
 }
 
 void MemArchiver::SetupForReading(byte* buffer, size_t size)
 {
-    state = MEMARC_READING;
-    buffer = buffer;
-    allocatedSize = size;
-    bufferSize = 0;
+    this->state = MEMARC_READING;
+    this->buffer = buffer;
+    this->allocatedSize = size;
+    this->bufferSize = 0;
 }
 
 void MemArchiver::SetBaseTime(unsigned int time)
 {
-    svsTime = time;
+    this->svsTime = time;
 }
 
 size_t MemArchiver::BufferSize() const
diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index babaf736..259e055b 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -1,49 +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_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)
 
-if (USE_SOUND_NEW)
-	# Try to use OpenAL
-	find_package(OpenAL)
+if (NOT NO_MODERN_DMA)
+	# Use OpenAL
+	find_package(OpenAL REQUIRED)
+
 	if (OPENAL_FOUND)
-		target_compile_definitions(omohclient INTERFACE USE_SOUND_NEW=1)
+		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()
-		target_link_libraries(omohclient INTERFACE ${OPENAL_LIBRARY})
+
+		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()
 
-if (USE_OPENAL)
-	# Try to use OpenAL
-	find_package(OpenAL)
-	if (OPENAL_FOUND)
-		target_compile_definitions(omohclient INTERFACE USE_OPENAL=1)
-		target_include_directories(omohclient INTERFACE ${OPENAL_INCLUDE_DIR}/AL)
-		target_link_libraries(omohclient INTERFACE ${OPENAL_LIBRARY})
-	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})
-
-add_subdirectory("../libmad-0.15.1b" "./libmad")
-target_link_libraries(omohclient INTERFACE libmad)
\ No newline at end of file
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 13471caa..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;
     }
 
@@ -578,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);
 	}
 }
 
@@ -621,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;
@@ -765,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;
@@ -813,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;
@@ -912,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();
@@ -927,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();
@@ -1105,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;
@@ -1155,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 38d7a0d6..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
@@ -1091,8 +1102,6 @@ static void RoQReset( void ) {
 
 static void RoQInterrupt(void)
 {
-	// Removed in OPM
-#if 0
 	byte				*framedata;
         short		sbuf[32768];
         int		ssize;
@@ -1144,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;
@@ -1216,7 +1221,6 @@ redump:
 //	assert(cinTable[currentHandle].RoQFrameSize <= 65536);
 //	r = FS_Read( cin.file, cinTable[currentHandle].RoQFrameSize+8, cinTable[currentHandle].iFile );
 	cinTable[currentHandle].RoQPlayed	+= cinTable[currentHandle].RoQFrameSize+8;
-#endif
 }
 
 /******************************************************************************
@@ -1229,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;
 
@@ -1276,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
@@ -1289,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", "");
+    }
 }
 
 /*
@@ -1331,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;
 
@@ -1360,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;
@@ -1400,9 +1455,6 @@ CIN_PlayCinematic
 ==================
 */
 int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBits ) {
-	return 0;
-	// Removed in OPM
-#if 0
 	unsigned short RoQID;
 	char	name[MAX_OSPATH];
 	int		i;
@@ -1428,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);
@@ -1474,17 +1526,12 @@ 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");
 
 	RoQShutdown();
 	return -1;
-#endif
 }
 
 void CIN_SetExtents (int handle, int x, int y, int w, int h) {
@@ -1600,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_StopAllSounds2( 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);
 }
 
 
@@ -1646,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_StopAllSounds2( qtrue );
-		CL_handle = -1;
 	}
 }
diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index 7f763b44..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);
@@ -577,9 +611,9 @@ void CL_MouseMove( usercmd_t *cmd ) {
 		cmd->forwardmove = ClampChar(cmd->forwardmove - m_forward->value * my);
 
 	if (!isfinite(cl.viewangles[PITCH]) || !isfinite(cl.viewangles[YAW])) {
-		Com_Printf("Invalid client viewangles encountered!\n");
-		Com_Printf("cgameSensitivity: %f - mx: %f - my: %f - m_pitch: %f - m_yaw: %f", cgameSensitivity, mx, my, m_pitch->value, m_yaw->value);
-		Com_Printf("Resetting client viewangles");
+		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;
 	}
@@ -617,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;
 	}
 
@@ -726,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 ) {
@@ -826,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" );
 	}
@@ -917,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 );
@@ -973,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 );
-	}
 }
 
 /*
@@ -999,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;
 	}
 
@@ -1094,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 a4c50dd4..850d766d 100644
--- a/code/client/cl_inv.cpp
+++ b/code/client/cl_inv.cpp
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_ui.h"
 
 typedef struct {
-    char *string;
-    int   value;
+    const char *string;
+    int         value;
 } equipment_event_table_t;
 
 static equipment_event_table_t s_equipTable[] = {
diff --git a/code/client/cl_invrender.cpp b/code/client/cl_invrender.cpp
index 0b5bd6f9..cfbdb3f1 100644
--- a/code/client/cl_invrender.cpp
+++ b/code/client/cl_invrender.cpp
@@ -148,7 +148,7 @@ void CL_Draw3DModel(
 
             hModel[iCurrNum] = model;
             iIndex[iCurrNum] = -1;
-            strcpy(szAnimName[iCurrNum], anim);
+            Q_strncpyz(szAnimName[iCurrNum], anim, sizeof(szAnimName[iCurrNum]));
         } else {
             iCurrNum = i;
 
@@ -164,7 +164,7 @@ void CL_Draw3DModel(
                 }
             } else {
                 iIndex[iCurrNum] = -1;
-                strcpy(szAnimName[iCurrNum], anim);
+                Q_strncpyz(szAnimName[iCurrNum], anim, sizeof(szAnimName[iCurrNum]));
             }
         }
 
@@ -295,7 +295,7 @@ void UI_DoInventory(qboolean activate_mouse)
     if (client_inv.align == INV_ALIGN_RIGHT) {
         s_main_inv->InitFrame(
             NULL,
-            client_inv.horizoffset + cls.glconfig.vidWidth - client_inv.typewidth,
+            client_inv.horizoffset + uid.vidWidth - client_inv.typewidth,
             client_inv.vertoffset,
             client_inv.typewidth,
             client_inv.typeheight * client_inv.types.NumObjects(),
diff --git a/code/client/cl_keys.cpp b/code/client/cl_keys.cpp
index 660ab4e2..39474cb9 100644
--- a/code/client/cl_keys.cpp
+++ b/code/client/cl_keys.cpp
@@ -984,6 +984,8 @@ CL_InitKeyCommands
 */
 void CL_InitKeyCommands(void)
 {
+    int i;
+
     // register our functions
     Cmd_AddCommand("bind", Key_Bind_f);
     Cmd_AddCommand("unbind", Key_Unbind_f);
@@ -997,6 +999,10 @@ void CL_InitKeyCommands(void)
     Cmd_AddCommand("ctrlbindlist", Key_AltBindlist_f);
 
     memset(menubound, 0, sizeof(menubound));
+
+    for (i = K_F1; i <= K_F15; i++) {
+        menubound[i] = qtrue;
+    }
 }
 
 /*
@@ -1089,7 +1095,7 @@ void CL_KeyEvent(int key, qboolean down, unsigned time)
 
     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)) {
+        if (key != K_CONSOLE && (!keys[K_SHIFT].down || key != K_ESCAPE)) {
             return;
         }
     }
@@ -1134,9 +1140,9 @@ void CL_KeyEvent(int key, qboolean down, unsigned time)
 
     if (key >= K_MOUSE1 && key <= K_MOUSE5) {
         if (down) {
-            cl.mouseButtons |= (1 << (key + (256 - K_MOUSE1)));
+            cl.mouseButtons |= (1 << (key - K_MOUSE1));
         } else {
-            cl.mouseButtons &= ~(1 << (key + (256 - K_MOUSE1)));
+            cl.mouseButtons &= ~(1 << (key - K_MOUSE1));
         }
 
         if (in_guimouse) {
@@ -1346,5 +1352,5 @@ Key_SetCatcher
 */
 void Key_SetCatcher(int catcher)
 {
-    keyCatchers = catcher;
+    cls.keyCatchers = catcher;
 }
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 5f836f81..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,7 @@ void CL_ShutdownAll(qboolean shutdownRef) {
 	CL_cURL_Shutdown();
 #endif
 	// clear sounds
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_DisableSounds();
 #endif
 	// shutdown CGame
@@ -781,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;
@@ -832,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));
@@ -843,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();
@@ -912,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;
 	}
@@ -947,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 ) );
 
@@ -1049,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 );
 }
 
 /*
@@ -1132,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 );
 }
 
 /*
@@ -1174,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 );
@@ -1201,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_StopAllSounds2(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();
 	}
 }
 
@@ -1234,12 +1273,12 @@ 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 ) );
 }
 
 /*
@@ -1275,9 +1314,9 @@ void CL_Connect( const char *server, netadrtype_t family ) {
 	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, family ) ) {
+	if( !NET_StringToAdr( clc.servername, &clc.serverAddress, family ) ) {
 		Com_Printf( "Bad server address\n" );
 		clc.state = CA_DISCONNECTED;
 		UI_PushMenu("badserveraddy");
@@ -1288,7 +1327,7 @@ void CL_Connect( const char *server, netadrtype_t family ) {
 	}
 	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));
@@ -1464,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);
+	}
 }
 
 /*
@@ -1483,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 );
 }
@@ -1515,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;
 	}
@@ -1522,38 +1570,59 @@ 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_StopAllSounds2(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();
 	// clear aliases
 	Alias_Clear();
 
-	cls.rendererRegistered = qfalse;
-
 	// 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();
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
-	S_Init();
-#else
-	S_Init(qtrue);
-#endif
+    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)
 	{
@@ -1575,15 +1644,52 @@ handles will be invalid
 =================
 */
 void CL_Snd_Restart_f( void ) {
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#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];
+
+	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);
-#endif
 
-	CL_Vid_Restart_f();
+	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
 }
 
 
@@ -1648,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" );
@@ -1849,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 );
@@ -1908,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:
 /*
@@ -1937,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] = '"';
@@ -2176,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
@@ -2260,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;
 	}
 
@@ -2268,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;
 	}
 
@@ -2383,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
 	//
@@ -2390,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;
@@ -2439,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);
 		}
 
@@ -2449,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
@@ -2482,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_StopAllSounds2( 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
@@ -2521,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, ":" );
@@ -2555,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();
 
@@ -2643,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
@@ -2765,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 )
@@ -2828,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
@@ -2852,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;
@@ -2881,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;
@@ -2892,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;
@@ -2942,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);
@@ -2991,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++;
 }
 
 
@@ -3029,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 );
 	}
 }
@@ -3048,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" );
@@ -3143,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;
@@ -3174,7 +3490,6 @@ static void CL_GenerateQKey(void)
 		FS_FCloseFile( f );
 		Com_Printf( "QKEY generated\n" );
 	}
-	*/
 }
 
 /*
@@ -3222,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 );
@@ -3336,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
 	//
@@ -3369,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 );
@@ -3398,11 +3706,12 @@ void CL_Init( void ) {
 
 	Cvar_Set( "cl_running", "1" );
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#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 );
@@ -3411,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 );
 }
 
@@ -3441,7 +3756,7 @@ void CL_Shutdown(const char* finalmsg, qboolean disconnect, qboolean quit) {
 	if(disconnect)
 		CL_Disconnect();
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_Shutdown();
 #else
 	S_Shutdown(qtrue);
@@ -3473,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;
@@ -3492,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"));
@@ -3540,6 +3858,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 	char	*infoString;
 	int		prot;
 	char	*gamename;
+	char	*pszVersion;
+	char	*pszServerType;
 	qboolean gameMismatch;
 
 	infoString = MSG_ReadString( msg );
@@ -3568,12 +3888,42 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 #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++)
 	{
@@ -3719,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;
 		}
 	}
@@ -3731,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;
@@ -3743,10 +4093,10 @@ CL_ServerStatusResponse
 ===================
 */
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
-	char	*s;
-	char	info[MAX_INFO_STRING];
-	int		i, l, score, ping;
-	int		len;
+	const char	*s;
+	char		info[MAX_INFO_STRING];
+	int			i, l, ping;
+	int			len;
 	serverStatus_t *serverStatus;
 
 	serverStatus = NULL;
@@ -3799,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++) {
 
@@ -3807,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);
@@ -3870,133 +4218,22 @@ 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
@@ -4022,7 +4259,7 @@ void CL_GlobalServers_f( void ) {
 		int numAddress = 0;
 
 		for ( i = 1; i <= MAX_MASTER_SERVERS; i++ ) {
-			sprintf(command, "sv_master%d", i);
+			Com_sprintf(command, sizeof(command), "sv_master%d", i);
 			masteraddress = Cvar_VariableString(command);
 
 			if(!*masteraddress)
@@ -4040,7 +4277,7 @@ void CL_GlobalServers_f( void ) {
 		return;
 	}
 
-	sprintf(command, "sv_master%d", masterNum);
+	Com_sprintf(command, sizeof(command), "sv_master%d", masterNum);
 	masteraddress = Cvar_VariableString(command);
 	
 	if(!*masteraddress)
@@ -4096,7 +4333,7 @@ void CL_GlobalServers_f( void ) {
 		Q_strcat(command, sizeof(command), Cmd_Argv(i));
 	}
 
-	NET_OutOfBandPrint( NS_SERVER, to, "%s", command );
+	CL_NET_OutOfBandPrint( to, "%s", command );
 }
 
 
@@ -4316,7 +4553,7 @@ void CL_Ping_f( void ) {
 
 	CL_SetServerInfoByAddress(pingptr->adr, NULL, 0);
 		
-	NET_OutOfBandPrint( NS_CLIENT, to, "\x02getinfo xxx" );
+	CL_NET_OutOfBandPrint( to, "\x02getinfo xxx" );
 }
 
 /*
@@ -4369,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 ) );
@@ -4386,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;
 	}
@@ -4410,7 +4647,10 @@ CL_ServerRestarted
 ==================
 */
 void CL_ServerRestarted( void ) {
-	S_StopAllSounds2( qfalse );
+	//S_StopAllSounds2( qfalse );
+	// Fixed in OPM
+	//  Also stop the music
+	S_StopAllSounds2( qtrue );
 
 	UI_ServerLoaded();
 	UI_ClearState();
@@ -4483,7 +4723,7 @@ qboolean CL_UpdateVisiblePings_f(int source) {
 						memcpy(&cl_pinglist[j].adr, &server[i].adr, sizeof(netadr_t));
 						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++;
 					}
 				}
@@ -4571,7 +4811,7 @@ void CL_ServerStatus_f(void) {
 			return;
 	}
 
-	NET_OutOfBandPrint( NS_CLIENT, *toptr, "getstatus" );
+	CL_NET_OutOfBandPrint( *toptr, "getstatus" );
 
 	serverStatus = CL_GetServerStatus( *toptr );
 	serverStatus->address = *toptr;
@@ -4640,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;
@@ -4662,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 56e01306..e8cef7f9 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.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.
 
@@ -29,6 +29,7 @@ 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>
 
@@ -136,18 +137,26 @@ static unsigned int  startCountHigh;
 static unsigned int  loadCountLow;
 static unsigned int  loadCountHigh;
 static unsigned int  loadCount;
-static unsigned int  lastTime;
+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];
 
+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);
@@ -211,15 +220,15 @@ static UIRect2D getDefaultConsoleRectangle(void)
             f[i] = floor(f[i]);
         }
 
-        rect.pos.x       = f[0] - cls.glconfig.vidWidth;
-        rect.pos.y       = f[1] - cls.glconfig.vidHeight;
+        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  = (cls.glconfig.vidWidth - 50);
-        rect.size.height = (cls.glconfig.vidHeight / 2);
+        rect.size.width  = (uid.vidWidth - 50);
+        rect.size.height = (uid.vidHeight / 2);
     }
 
     return rect;
@@ -265,7 +274,7 @@ 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->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;
@@ -966,15 +975,15 @@ static UIRect2D getDefaultDMConsoleRectangle(void)
             f[i] = floor(f[i]);
         }
 
-        rect.pos.x       = f[0] - cls.glconfig.vidWidth;
-        rect.pos.y       = f[1] - cls.glconfig.vidHeight;
+        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       = cls.glconfig.vidHeight * 0.58;
-        rect.size.width  = cls.glconfig.vidWidth;
-        rect.size.height = cls.glconfig.vidHeight * 0.415;
+        rect.pos.y       = uid.vidHeight * 0.58;
+        rect.size.width  = uid.vidWidth;
+        rect.size.height = uid.vidHeight * 0.415;
     }
 
     return rect;
@@ -996,15 +1005,19 @@ static UIRect2D getQuickMessageDMConsoleRectangle(void)
             f[i] = floor(f[i]);
         }
 
-        rect.pos.x       = f[0] - cls.glconfig.vidWidth;
-        rect.pos.y       = f[1] - cls.glconfig.vidHeight;
+        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       = cls.glconfig.vidHeight * 0.65;
-        rect.size.width  = cls.glconfig.vidWidth;
-        rect.size.height = 38.0;
+        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;
@@ -1017,7 +1030,7 @@ UI_DMMessageModesMatch
 */
 static qboolean UI_DMMessageModesMatch(int iMode)
 {
-    qboolean bQuickMessage;
+    qboolean bQuickMessage = qfalse;
 
     if (iMode && (iMode != 300 || dm_console->GetQuickMessageMode())) {
         if (iMode < 0) {
@@ -1048,13 +1061,15 @@ static void UI_SetDMConsoleMode(int iMode)
         return;
     }
 
+    bQuickMessage = qfalse;
+
     if (iMode < 0) {
         bQuickMessage = qtrue;
         iMode         = -iMode;
     }
 
     if (iMode == 300) {
-        bQuickMessage = dm_console->GetMessageMode();
+        iMode = dm_console->GetMessageMode();
     }
 
     if (dm_console->GetQuickMessageMode()) {
@@ -1064,8 +1079,8 @@ static void UI_SetDMConsoleMode(int iMode)
         }
     } else {
         if (bQuickMessage) {
-            dm_console->setFrame(getDefaultDMConsoleRectangle());
-            dm_console->SetQuickMessageMode(qfalse);
+            dm_console->setFrame(getQuickMessageDMConsoleRectangle());
+            dm_console->SetQuickMessageMode(bQuickMessage);
         }
     }
 
@@ -1086,7 +1101,7 @@ static void UI_SetDMConsoleMode(int iMode)
             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) {
+        } 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"
             ));
@@ -1121,6 +1136,20 @@ static void DMConsoleCommandHandler(const char *txt)
     CL_AddReliableCommand(szStringOut, qfalse);
 }
 
+/*
+====================
+getScreenWidth
+====================
+*/
+static float getScreenWidth()
+{
+    if (uid.bHighResScaling) {
+        return maxWidthRes;
+    } else {
+        return uid.vidWidth;
+    }
+}
+
 /*
 ====================
 getNewConsole
@@ -1182,14 +1211,14 @@ getDefaultGMBoxRectangle
 static UIRect2D getDefaultGMBoxRectangle(void)
 {
     UIRect2D dmRect = getDefaultDMBoxRectangle();
-    float    height = cls.glconfig.vidHeight * ui_compass_scale->value * 0.25f;
+    float    height = uid.vidHeight * ui_compass_scale->value * 0.25f;
     float    y      = dmRect.size.height + dmRect.pos.y;
 
     if (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]);
 }
 
 /*
@@ -1199,9 +1228,37 @@ getDefaultDMBoxRectangle
 */
 static UIRect2D getDefaultDMBoxRectangle(void)
 {
-    float width = cls.glconfig.vidWidth * ui_compass_scale->value * 0.2f;
+    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;
+    }
 }
 
 /*
@@ -1251,11 +1308,11 @@ UI_PrintConsole
 */
 void UI_PrintConsole(const char *msg)
 {
-    UColor     *pColor = NULL;
-    const char *pszString;
-    char        szString[1024];
-    char        szBlah[1024];
-    qboolean    bPrintedDMBox = qfalse;
+    const UColor *pColor = NULL;
+    const char   *pszString;
+    char          szString[1024];
+    char          szBlah[1024];
+    qboolean      bPrintedDMBox = qfalse;
 
     pszString = msg;
     strncpy(szString, msg, 1024);
@@ -1273,7 +1330,7 @@ void UI_PrintConsole(const char *msg)
             break;
         case MESSAGE_CHAT_WHITE:
             bDMMessage = qtrue;
-            pColor     = &UGrey;
+            pColor     = &UWhiteChatMessageColor;
             break;
         case MESSAGE_WHITE:
             bBold  = qtrue;
@@ -1281,15 +1338,17 @@ void UI_PrintConsole(const char *msg)
             break;
         case MESSAGE_CHAT_RED:
             bDeathMessage = MESSAGE_CHAT_RED;
-            pColor        = &ULightRed;
+            pColor        = &URedChatMessageColor;
             break;
         case MESSAGE_CHAT_GREEN:
             bDeathMessage = MESSAGE_CHAT_GREEN;
-            pColor        = &UGreen;
+            pColor        = &UGreenChatMessageColor;
             break;
         }
 
-        pszString++;
+        if (*pszString != 0) {
+            pszString++;
+        }
 
         //
         // print to the deathmatch console
@@ -1458,7 +1517,7 @@ void UI_FocusMenuIfExists(void)
         currentMenu->ActivateMenu();
 
         if (ui_newvidmode->integer == -1) {
-            Cvar_Get("ui_newvidmode", va("%d", r_mode), CVAR_SERVER_CREATED);
+            Cvar_Get("ui_newvidmode", va("%d", r_mode), CVAR_RESETSTRING);
             Cvar_SetValue("ui_newvidmode", r_mode);
         }
     } else {
@@ -1662,11 +1721,11 @@ 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
+        0, 0, uid.vidWidth, uid.vidHeight, 0, uid.vidWidth, uid.vidHeight, 0, -1, 1
     );
-    re.Scissor(0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight);
+    re.Scissor(0, 0, uid.vidWidth, uid.vidHeight);
     re.SetColor(g_color_table[0]);
-    re.DrawBox(0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight);
+    re.DrawBox(0, 0, uid.vidWidth, uid.vidHeight);
     re.SetColor(NULL);
 }
 
@@ -1700,7 +1759,36 @@ void UI_DrawIntro(void)
     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();
+    }
 }
 
 /*
@@ -1775,6 +1863,8 @@ void UI_Update(void)
                 hud_compass->GetContainerWidget()->Display(frame, 1.0);
             }
         }
+
+        return;
     }
 
     if (fakk_console) {
@@ -1805,17 +1895,9 @@ void UI_Update(void)
     }
 
     // don't care about the intro
-    /*
-	if( CL_FinishedIntro() )
-	{
-	}
-	else
-	{
-		UI_DrawIntro();
-	}
-	*/
-
-    if (!server_loading && (clc.state == CA_CONNECTING || clc.state == CA_CHALLENGING) && ui_pConnectingMenu) {
+    if (!CL_FinishedIntro()) {
+        UI_DrawIntro();
+    } else if (!server_loading && (clc.state == CA_CONNECTING || clc.state == CA_CHALLENGING) && ui_pConnectingMenu) {
         view3d->setShow(false);
         UI_ClearBackground();
 
@@ -1853,7 +1935,7 @@ void UI_Update(void)
             if (clc.state <= CA_PRIMED) {
                 view3d->setShow(false);
                 UI_ClearBackground();
-            } else if (clc.state == CA_PRIMED || clc.state == CA_ACTIVE) {
+            } else if (clc.state == CA_ACTIVE || clc.state == CA_CINEMATIC) {
                 Com_FakeUnpause();
                 view3d->setShow(true);
             } else {
@@ -1887,7 +1969,7 @@ void UI_Update(void)
                     UI_CloseConsole();
                 }
             } else if (ui_static_materials.loading) {
-                ui_static_materials.loading->ReregisterMaterial();
+                ui_static_materials.loading->GetMaterial();
             }
         }
     }
@@ -2634,7 +2716,7 @@ void UI_PushMenuSP_f(void)
     }
 
     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_sv_running || !com_sv_running->integer || g_gametype->integer == GT_SINGLE_PLAYER)) {
         UI_PushMenu(Cmd_Argv(1));
     }
 }
@@ -2655,7 +2737,7 @@ void UI_PushMenuMP_f(void)
     }
 
     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_sv_running && com_sv_running->integer && g_gametype->integer != GT_SINGLE_PLAYER) {
         cmd = Cmd_Argv(1);
 
         //
@@ -3009,14 +3091,14 @@ void CL_PingServers_f(void)
     if (!noudp->integer) {
         adr.type = NA_BROADCAST;
         adr.port = BigShort(12203);
-        NET_OutOfBandPrint(NS_SERVER, adr, "info %i", 8);
+        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);
+        CL_NET_OutOfBandPrint(adr, "info %i", 8);
     }
 
     for (i = 0; i < 16; i++) {
@@ -3031,7 +3113,7 @@ void CL_PingServers_f(void)
                     adr.port = BigShort(12203);
                 }
 
-                NET_OutOfBandPrint(NS_SERVER, adr, "info %i", 8);
+                CL_NET_OutOfBandPrint(adr, "info %i", 8);
             } else {
                 Com_Printf("Bad address: %s\n", adrstring);
             }
@@ -3056,7 +3138,7 @@ void UI_MapList_f(void)
     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);
 }
 
 /*
@@ -3096,7 +3178,7 @@ void UI_DMMapSelect_f(void)
     MpMapPickerClass *map = new MpMapPickerClass;
     map->Setup(basepath, mappath, gametype);
 
-    CL_SetMousePos(cls.glconfig.vidWidth / 2, cls.glconfig.vidHeight / 2);
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3280,7 +3362,7 @@ void UI_PlayerModel_f(void)
     PlayerModelPickerClass *picker = new PlayerModelPickerClass;
     picker->Setup("models/player", modelpath, bGermanModel);
 
-    CL_SetMousePos(cls.glconfig.vidWidth / 2, cls.glconfig.vidHeight / 2);
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3333,6 +3415,7 @@ void UI_GetPlayerModel_f(void)
     Cvar_Set("ui_dm_playergermanmodel_set", 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 {
@@ -3544,7 +3627,7 @@ UI_WantsKeyboard
 */
 void UI_WantsKeyboard()
 {
-    cls.keyCatchers |= KEYCATCH_UI;
+    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
 }
 
 struct widgettrans_s {
@@ -3669,12 +3752,13 @@ void CL_FillUIImports(void)
     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.Cvar_Set                    = UI_Cvar_Set;
     uii.File_PickFile               = PickFile;
     uii.File_FreeFile               = FS_FreeFile;
     uii.File_ListFiles              = ListFilesForUI;
@@ -3708,101 +3792,8 @@ void CL_FillUIImports(void)
     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;
 }
 
 /*
@@ -3859,7 +3850,7 @@ void UI_CreateDialog(
 {
     UIDialog *dlg = new UIDialog;
     UIRect2D  rect =
-        UIRect2D((cls.glconfig.vidWidth - width) >> 1, (cls.glconfig.vidHeight - height) >> 1, width, height);
+        UIRect2D((uid.vidWidth - width) / 2, (uid.vidHeight - height) / 2, width, height);
     UColor bgColor = UWindowColor;
 
     dlg->Create(NULL, rect, title, bgColor, UHudColor);
@@ -3885,10 +3876,32 @@ void UI_ResolutionChange(void)
 {
     UIRect2D frame;
 
-    ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);
+    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);
+    }
+
     CL_FillUIImports();
     CL_FillUIDef();
 
+    // Added in OPM
+    //  Scaling for high resolutions
+    if (uid.vidWidth > maxWidthRes && uid.vidHeight > maxHeightRes) {
+        const float vidRatio = (float)uid.vidWidth / (float)uid.vidHeight;
+
+        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;
+    }
+
     if (!uie.ResolutionChange) {
         return;
     }
@@ -3923,7 +3936,7 @@ void UI_ResolutionChange(void)
     menuManager.RealignMenus();
 
     if (view3d) {
-        frame = UIRect2D(0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight);
+        frame = UIRect2D(0, 0, uid.vidWidth, uid.vidHeight);
         view3d->setFrame(frame);
     }
 
@@ -3971,13 +3984,13 @@ void S_ServerLoaded(void)
     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 );
-    //}
+    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);
+    }
 }
 
 /*
@@ -4022,6 +4035,11 @@ void UI_ServerLoaded(void)
         return;
     }
 
+    if (ui_sCurrentLoadingMenu == "loading_default") {
+        UI_FinishLoadingScreen_f();
+        return;
+    }
+
     server_loading_waiting = qtrue;
 
     event = new Event(EV_Widget_Enable);
@@ -4317,7 +4335,7 @@ public:
     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}
@@ -4354,10 +4372,8 @@ 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();
-            }
+        if (scoreboard_menuname.length() && str::icmp(scoreboard_menuname, pszMenuName) && scoreboard_menu) {
+            scoreboard_menu->ForceHide();
         }
 
         scoreboard_menuname = pszMenuName;
@@ -4406,7 +4422,10 @@ void UI_HideScoreboard_f(void)
     }
 
     if (scoreboard_menuname.length()) {
-        scoreboard_menu->ForceHide();
+        // Fixed in 2.30 (scoreboard_menu check)
+        if (scoreboard_menu) {
+            scoreboard_menu->ForceHide();
+        }
     }
 }
 
@@ -4451,7 +4470,7 @@ void ScoreboardListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
 {
     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);
+    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;
@@ -4504,7 +4523,7 @@ void UI_CreateScoreboard(void)
     scoreboard_h = h;
 
     SCR_AdjustFrom640(&x, &y, &w, &h);
-    fColumnScale = cls.glconfig.vidWidth / 640.0;
+    fColumnScale = uid.vidWidth / 640.0;
     cge->CG_GetScoreBoardColor(&fR, &fG, &fB, &fA);
     cge->CG_GetScoreBoardFontColor(&fFontR, &fFontG, &fFontB, &fFontA);
 
@@ -4728,7 +4747,7 @@ CL_FinishedIntro
 */
 qboolean CL_FinishedIntro(void)
 {
-    return !cls.startStage;
+    return cls.startStage == 0;
 }
 
 /*
@@ -4738,7 +4757,87 @@ CL_FinishedStartStage
 */
 void CL_FinishedStartStage(void)
 {
-    // FIXME: stub
+    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;
+    }
 }
 
 /*
@@ -4754,9 +4853,6 @@ void UI_StartStageKeyEvent(void)
             SCR_StopCinematic();
         }
         break;
-    case 12:
-        SCR_StopCinematic();
-        break;
     case 3:
     case 4:
     case 5:
@@ -4775,11 +4871,9 @@ void UI_StartStageKeyEvent(void)
         break;
     case 9:
     case 10:
-    case 11:
-        if (ui_skip_legalscreen->integer) {
-            cls.startStage = 11;
-            CL_FinishedStartStage();
-        }
+        SCR_StopCinematic();
+        break;
+    default:
         break;
     }
 }
@@ -4807,8 +4901,8 @@ void CL_TryStartIntro(void)
         UI_ToggleConsole();
     } else {
         // FIXME: no intro from now
-        //Cvar_Set( cl_playintro->name, "0" );
-        //UI_StartIntro_f();
+        Cvar_Set(cl_playintro->name, "0");
+        UI_StartIntro_f();
     }
 }
 
@@ -4969,6 +5063,20 @@ void UI_HideStatistics_f()
     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
@@ -5164,7 +5272,7 @@ void CL_InitializeUI(void)
     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_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);
@@ -5239,6 +5347,8 @@ void CL_InitializeUI(void)
     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;
@@ -5260,7 +5370,7 @@ void CL_InitializeUI(void)
     // 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->InitFrame(NULL, 0, 0, uid.vidWidth, uid.vidHeight, -1, "facfont-20");
     view3d->setName("view3d");
     view3d->InitSubtitle();
 
@@ -5360,6 +5470,10 @@ void CL_InitializeUI(void)
     CL_ClearButtons();
 
     cls.uiStarted = qtrue;
+
+    if (!com_dedicated->integer) {
+        CL_TryStartIntro();
+    }
 }
 
 static char        **loadStrings;
@@ -5397,7 +5511,16 @@ 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;
+}
 
 /*
 ====================
@@ -5443,7 +5566,7 @@ qboolean UI_IsResourceLoaded(const char *name)
     case 107:
         return S_IsSoundRegistered(name + 1);
     case 110:
-        return R_ImageExists(name + 1);
+        return uii.Rend_ImageExists(name + 1);
     default:
         return qfalse;
     }
@@ -5463,19 +5586,17 @@ void UI_RegisterLoadResource(const char *name)
     high = loadNumber - 1;
 
     while (low <= high) {
-        i = (high + low) / 2;
+        i = (low + high) / 2;
         j = strcmp(name, loadStrings[i]);
 
-        if (j >= 0) {
-            if (j <= 0) {
-                currentLoadTime += loadTimes[i];
-                loadTimes[i] = 0;
-                return;
-            }
-
+        if (j < 0) {
+            high = i - 1;
+        } else if (j > 0) {
             low = i + 1;
         } else {
-            high = i - 1;
+            currentLoadTime += loadTimes[i];
+            loadTimes[i] = 0;
+            break;
         }
     }
 }
@@ -5488,12 +5609,19 @@ UI_TestUpdateScreen
 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;
 }
 
 /*
@@ -5531,7 +5659,7 @@ void UI_LoadResource(const char *name)
         Cvar_SetValue("loadingbar", (float)currentLoadTime / (float)totalLoadTime);
     }
 
-    UI_TestUpdateScreen(333u);
+    UI_TestUpdateScreen(33);
 }
 
 /*
@@ -5699,8 +5827,15 @@ void UI_BeginLoad(const char *pszMapName)
 
         loadName = "maps/";
         loadName += pszMapName;
+        mapfile = loadName;
         loadName += ".min";
-        mapfile = loadName + ".bsp";
+
+        if (CL_UseLargeLightmap(pszMapName)) {
+            mapfile += ".bsp";
+        } else {
+            // Added in 2.0
+            mapfile += "_sml.bsp";
+        }
 
         if (UI_ArchiveLoadMapinfo(mapfile)) {
             cls.loading = SS_LOADING2;
@@ -5807,12 +5942,12 @@ void UI_EndLoad(void)
         }
 
         file = FS_FOpenFileWrite(loadName);
-        sprintf(buf, "%d\n%d %d\n", 3, loadNumber, size);
+        Com_sprintf(buf, sizeof(buf), "%d\n%d %d\n", 3, loadNumber, size);
 
         FS_Write(buf, strlen(buf), file);
 
         for (i = 0; i < loadNumber; i++) {
-            sprintf(buf, "%s\n%d\n", base[i]->name, base[i]->loadCount);
+            Com_sprintf(buf, sizeof(buf), "%s\n%d\n", base[i]->name, base[i]->loadCount);
             FS_Write(buf, strlen(buf), file);
         }
 
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 257161a7..ab3a001e 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.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.
 
@@ -35,6 +35,7 @@ typedef struct {
 extern cvar_t *ui_health_start;
 extern cvar_t *ui_health_end;
 extern cvar_t *sound_overlay;
+extern cvar_t *cl_movieaudio;
 
 //
 // initialization
@@ -46,14 +47,20 @@ 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);
+float       UI_GetObjectivesTop(void);
+void        UI_GetHighResolutionScale(vec2_t scale);
 
 //
 // menu
@@ -110,6 +117,7 @@ void UI_DeleteScoreBoardItems(int iMaxIndex);
 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);
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 4a368691..ad8914c9 100644
--- a/code/client/cl_uifilepicker.cpp
+++ b/code/client/cl_uifilepicker.cpp
@@ -47,7 +47,7 @@ FilePickerClass::FilePickerClass()
     window = new UIFloatingWindow();
     window->Create(
         NULL,
-        UIRect2D((cls.glconfig.vidWidth - 400) / 2, (cls.glconfig.vidHeight - 300) / 2, 400, 300),
+        UIRect2D((uid.vidWidth - 400) / 2, (uid.vidHeight - 300) / 2, 400, 300),
         "File Picker",
         UColor(0.15f, 0.195f, 0.278f),
         UHudColor
@@ -104,8 +104,10 @@ void FilePickerClass::Initialize(
         currentDirectory += "/";
     }
 
-    extension    = ext;
-    ignoredFiles = ignore_files;
+    extension = ext;
+    if (ignore_files) {
+        ignoredFiles = ignore_files;
+    }
 
     SetupFiles();
 }
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 5b301b68..e821a464 100644
--- a/code/client/cl_uilangame.cpp
+++ b/code/client/cl_uilangame.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.
 
@@ -25,12 +25,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class LANGameItem : public UIListCtrlItem
 {
-    str strings[5];
+    str strings[6];
 
 public:
     LANGameItem();
     LANGameItem(
-        const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping
+        const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping, const str& ipAddress
     );
 
     int            getListItemValue(int which) const override;
@@ -65,6 +65,11 @@ UILANGameClass::UILANGameClass()
 
     m_iLastUpdateTime = 0;
     m_noservers_mat   = uWinMan.RegisterShader("textures/menu/noservers");
+
+    //
+    // Added in OPM
+    //
+    m_bVirtual = false;
 }
 
 void UILANGameClass::Draw(void)
@@ -102,11 +107,12 @@ void UILANGameClass::UpdateUIElement(void)
 
     width = getClientFrame().size.width - 16.f;
 
-    AddColumn(Sys_LV_CL_ConvertString("Server Name"), 0, width * 0.4f, false, false);
-    AddColumn(Sys_LV_CL_ConvertString("Map"), 1, width * 0.15f, false, false);
-    AddColumn(Sys_LV_CL_ConvertString("Players"), 2, width * 0.165f, true, true);
-    AddColumn(Sys_LV_CL_ConvertString("GameType"), 3, width * 0.22f, false, false);
-    AddColumn(Sys_LV_CL_ConvertString("Ping"), 4, width * 0.065f, true, false);
+    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);
 
@@ -134,7 +140,9 @@ void UILANGameClass::SetupServers(void)
             pServerInfo->mapName,
             va("%02i/%02i", pServerInfo->clients, pServerInfo->maxClients),
             pServerInfo->gameTypeString,
-            str(pServerInfo->ping)
+            str(pServerInfo->ping),
+            // Added in OPM
+            NET_AdrToStringwPort(pServerInfo->adr)
         );
     }
 
@@ -167,7 +175,7 @@ void UILANGameClass::JoinServer(Event *ev)
     const serverInfo_t& serverInfo = cls.localServers[getCurrentItem() - 1];
 
     UI_SetReturnMenuToCurrent();
-    CL_Connect(NET_AdrToString(serverInfo.adr), netadrtype_t::NA_UNSPEC);
+    CL_Connect(NET_AdrToStringwPort(serverInfo.adr), netadrtype_t::NA_UNSPEC);
 }
 
 qboolean UILANGameClass::KeyEvent(int key, unsigned int time)
@@ -197,7 +205,7 @@ qboolean UILANGameClass::KeyEvent(int key, unsigned int time)
 LANGameItem::LANGameItem() {}
 
 LANGameItem::LANGameItem(
-    const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping
+    const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping, const str& ipAddress
 )
 {
     strings[0] = hostName;
@@ -205,6 +213,12 @@ LANGameItem::LANGameItem(
     strings[2] = players;
     strings[3] = gameTypeString;
     strings[4] = ping;
+
+    //
+    // Added in OPM
+    //
+
+    strings[5] = ipAddress;
 }
 
 int LANGameItem::getListItemValue(int which) const
diff --git a/code/client/cl_uiloadsave.cpp b/code/client/cl_uiloadsave.cpp
index a0b8e566..206bb38b 100644
--- a/code/client/cl_uiloadsave.cpp
+++ b/code/client/cl_uiloadsave.cpp
@@ -95,7 +95,7 @@ UIFAKKLoadGameClass::UIFAKKLoadGameClass()
 {
     Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
     Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
-    AllowActivate(false);
+    AllowActivate(true);
     m_bRemovePending = false;
 
     setHeaderFont("facfont-20");
@@ -155,12 +155,17 @@ void UIFAKKLoadGameClass::SetupFiles(void)
 
         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;
 
@@ -282,7 +287,7 @@ qboolean UIFAKKLoadGameClass::KeyEvent(int key, unsigned int time)
         }
         break;
     default:
-        return UIListBase::KeyEvent(key, time);
+        return UIListCtrl::KeyEvent(key, time);
     }
 
     return qfalse;
@@ -328,6 +333,7 @@ str FAKKLoadGameItem::getListItemString(int which) const
         {
             int numseconds;
             int numseconds_hours;
+            int seconds;
 
             // hours
             numseconds = atol(strings[1]);
@@ -336,17 +342,18 @@ str FAKKLoadGameItem::getListItemString(int which) const
 
             // minutes
             numseconds_hours = numseconds % 3600;
-            if (numseconds_hours / 60 <= 9) {
+            if (numseconds_hours / 60 < 10) {
                 itemstring += "0";
             }
             itemstring += (numseconds_hours / 60);
             itemstring += ":";
 
             // seconds
-            if (numseconds_hours / 60 <= 9) {
+            seconds = numseconds_hours % 60;
+            if (seconds < 10) {
                 itemstring += "0";
             }
-            itemstring += (numseconds_hours % 60);
+            itemstring += seconds;
         }
         break;
     case 2:
@@ -355,7 +362,7 @@ str FAKKLoadGameItem::getListItemString(int which) const
             char   buffer[2048];
 
             time = atol(strings[2]);
-            strftime(buffer, sizeof(buffer), "%a %b %d %H:%M:%S %Y", localtime(&time));
+            strftime(buffer, sizeof(buffer), "%a %b %d %Y %H:%M:%S", localtime(&time));
             itemstring = buffer;
         }
         break;
diff --git a/code/client/cl_uimaprotationsetup.cpp b/code/client/cl_uimaprotationsetup.cpp
index 98ec6861..3189d19f 100644
--- a/code/client/cl_uimaprotationsetup.cpp
+++ b/code/client/cl_uimaprotationsetup.cpp
@@ -76,7 +76,7 @@ void UIMapRotationListBox::PopulateRotationList()
         maplistVar = Cvar_Get("ui_maplist_ffa", "", 0);
     }
 
-    strcpy(mapBuffer, maplistVar->string);
+    Q_strncpyz(mapBuffer, maplistVar->string, sizeof(mapBuffer));
 
     for (token = strtok(mapBuffer, " /"); token; token = strtok(NULL, " /")) {
         if (!Q_stricmp(token, "dm")) {
@@ -143,7 +143,7 @@ void UIMapListBox::PopulateMapList()
         bool        bHasTOW = false;
         bool        bHasLib = false;
 
-        strcpy(mapName, filename);
+        Q_strncpyz(mapName, filename, sizeof(mapName));
         mapName[strlen(mapName) - 4] = 0;
 
         if (!COM_IsMapValid(mapName)) {
@@ -151,7 +151,7 @@ void UIMapListBox::PopulateMapList()
         }
 
         if (bTugOfWar || bLiberation) {
-            strcpy(tokenized, mapName);
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
 
             for (token = strtok(tokenized, "_"); token; token = strtok(NULL, "_")) {
                 if (bLiberation) {
@@ -181,7 +181,7 @@ void UIMapListBox::PopulateMapList()
                 }
             }
         } else if (bObjective) {
-            strcpy(tokenized, mapName);
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
 
             for (token = strtok(tokenized, "_"); token; token = strtok(NULL, "_")) {
                 if (!Q_stricmp(token, "obj")) {
@@ -209,9 +209,9 @@ void UIMapListBox::PopulateMapList()
             char        mapName[256];
             char        tokenized[256];
 
-            strcpy(mapName, filename);
+            Q_strncpyz(mapName, filename, sizeof(mapName));
             mapName[strlen(mapName) - 4] = 0;
-            strcpy(tokenized, mapName);
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
 
             token = strtok(tokenized, "_");
             if (!Q_stricmp(token, "obj") || !Q_stricmp(mapName, "mp_ship_lib")) {
@@ -237,7 +237,7 @@ void UIMapListBox::PopulateMapList()
                 const char *filename = filenames[i];
                 char        mapName[256];
 
-                strcpy(mapName, filename);
+                Q_strncpyz(mapName, filename, sizeof(mapName));
                 mapName[strlen(mapName) - 4] = 0;
 
                 if (!COM_IsMapValid(mapName)) {
@@ -277,20 +277,27 @@ void UIAddToRotationButton::Released(Event *ev)
 
     if (mapList && rotationList) {
         size_t mapLength = 0;
-        int    item      = mapList->getCurrentItem();
+        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) {
-            str text = mapList->getItemText(item);
-
-            if (prefixLength + mapLength + text.length() < 256) {
-                rotationList->AddItem(text, NULL);
-            }
+        if (item && prefixLength + mapLength + currentItemText.length() < 256) {
+            rotationList->AddItem(currentItemText, NULL);
         }
     }
 
@@ -356,7 +363,7 @@ void UIRotationApplyButton::Released(Event *ev)
             char        map[256];
             bool        bHasTOW = false, bHasObj = false, bHasLib = false, bHasShip = false;
 
-            strcpy(map, text);
+            Q_strncpyz(map, text, sizeof(map));
             for (token = strtok(map, "_"); token; token = strtok(NULL, "_")) {
                 if (!Q_stricmp(token, "TOW")) {
                     bHasTOW = true;
@@ -387,11 +394,12 @@ void UIRotationApplyButton::Released(Event *ev)
             }
 
             maplistStr += text;
-            maplistStr += " ";
 
             if (i == 1) {
                 Cvar_Set("ui_dmmap", maplistStr);
             }
+
+            maplistStr += " ";
         }
     }
 
@@ -413,10 +421,10 @@ void UIRotationMoveItemUpButton::Released(Event *ev)
     list = static_cast<UIListBox *>(uWinMan.FindWidget("Rotation List"));
     item = list->getCurrentItem();
 
-    if (item < list->getNumItems() && list->getNumItems() > 1) {
-        str text = list->getItemText(item + 1);
+    if (item > 1 && list->getNumItems() > 1) {
+        str text = list->getItemText(item - 1);
 
-        list->DeleteItem(list->getCurrentItem() - 1);
+        list->DeleteItem(item - 1);
         list->InsertItem(text, item);
         list->setCurrentItem(item - 1);
     }
@@ -440,7 +448,7 @@ void UIRotationMoveItemDownButton::Released(Event *ev)
     if (item < list->getNumItems() && list->getNumItems() > 1) {
         str text = list->getItemText(item + 1);
 
-        list->DeleteItem(list->getCurrentItem() + 1);
+        list->DeleteItem(item + 1);
         list->InsertItem(text, item);
         list->setCurrentItem(item + 1);
     }
diff --git a/code/client/cl_uimaprunner.cpp b/code/client/cl_uimaprunner.cpp
index 6a5cf205..20f4fbb9 100644
--- a/code/client/cl_uimaprunner.cpp
+++ b/code/client/cl_uimaprunner.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.
 
@@ -83,7 +83,7 @@ void PickFile(const char *name, Listener *obj, Event& event)
     if (name && *name && strchr(name, '/')) {
         currentpath = name;
 
-        for (i = currentpath.length(); i > 0; i--) {
+        for (i = currentpath.length() - 1; i > 0; i--) {
             if (currentpath[i] == '/') {
                 break;
             }
@@ -94,7 +94,7 @@ void PickFile(const char *name, Listener *obj, Event& event)
         currentpath = "";
     }
 
-    picker->Setup("", currentpath, ".*");
+    picker->Setup("", currentpath, ".*", "");
 }
 
 CLASS_DECLARATION(FilePickerClass, ViewSpawnerClass, NULL) {
diff --git a/code/client/cl_uiminicon.cpp b/code/client/cl_uiminicon.cpp
index d0d02723..c1c8e6db 100644
--- a/code/client/cl_uiminicon.cpp
+++ b/code/client/cl_uiminicon.cpp
@@ -112,7 +112,7 @@ void FakkMiniconsole::PostMoveinEvent(void)
 
 void FakkMiniconsole::OnSizeChanged(Event *ev)
 {
-    m_maxlines = m_frame.size.height / m_font->getHeight(false);
+    m_maxlines = m_frame.size.height / m_font->getHeight(getHighResScale());
 }
 
 void FakkMiniconsole::MoveInEvent(Event *ev)
@@ -163,14 +163,14 @@ void FakkMiniconsole::Draw(void)
     HandleBoxMoving();
 
     m_font->setColor(m_foreground_color);
-    aty = m_frame.size.height - m_font->getHeight(false);
+    aty = m_frame.size.height - m_font->getHeight(getHighResScale());
     for (i = m_lines.NumObjects(); i > 0; i--) {
-        if (-m_font->getHeight(false) >= aty) {
+        if (-m_font->getHeight(getHighResScale()) >= aty) {
             break;
         }
 
-        m_font->Print(0, aty, m_lines.ObjectAt(i), -1, false);
-        aty -= m_font->getHeight(false);
+        m_font->Print(0, aty / getHighResScale()[1], m_lines.ObjectAt(i), -1, getHighResScale());
+        aty -= m_font->getHeight(getHighResScale());
     }
 }
 
diff --git a/code/client/cl_uimpmappicker.cpp b/code/client/cl_uimpmappicker.cpp
index 577f9b48..8146459f 100644
--- a/code/client/cl_uimpmappicker.cpp
+++ b/code/client/cl_uimpmappicker.cpp
@@ -51,7 +51,7 @@ MpMapPickerClass::MpMapPickerClass()
     window = new UIFloatingWindow();
     window->Create(
         NULL,
-        UIRect2D((cls.glconfig.vidWidth - 300) / 2, (cls.glconfig.vidHeight - 200) / 2, 300, 200),
+        UIRect2D((uid.vidWidth - 300) / 2, (uid.vidHeight - 200) / 2, 300, 200),
         "Select a Map",
         UColor(0.15f, 0.195f, 0.278f),
         UHudColor
@@ -180,12 +180,14 @@ void MpMapPickerClass::SetupFiles(void)
         FS_FreeFileList(filenames);
     }
 
-    if (currentDirectory.length()) {
-        if (currentDirectory == "maps/-/") {
-            SetupSecondaryFiles(currentDirectory, bTugOfWar, bObjective, bLiberation);
-        } else {
-            SetupSecondaryFiles("maps/obj/", bTugOfWar, bObjective, bLiberation);
-            SetupSecondaryFiles("maps/lib/", bTugOfWar, bObjective, bLiberation);
+    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);
+            }
         }
     }
 
@@ -278,9 +280,9 @@ void MpMapPickerClass::FileSelected(Event *ev)
 
     uii.Snd_PlaySound("sound/menu/apply.wav");
 
-    UIListCtrlItem* item = listbox->GetItem(listbox->getCurrentItem());
-    str name = item->getListItemString(0);
-    str directory = item->getListItemString(1);
+    UIListCtrlItem *item      = listbox->GetItem(listbox->getCurrentItem());
+    str             name      = item->getListItemString(0);
+    str             directory = item->getListItemString(1);
 
     FileSelected(directory, name, directory + name);
 }
@@ -305,9 +307,9 @@ void MpMapPickerClass::FileChosen(Event *ev)
 
     uii.Snd_PlaySound("sound/menu/apply.wav");
 
-    UIListCtrlItem* item = listbox->GetItem(listbox->getCurrentItem());
-    str name = item->getListItemString(0);
-    str directory = item->getListItemString(1);
+    UIListCtrlItem *item      = listbox->GetItem(listbox->getCurrentItem());
+    str             name      = item->getListItemString(0);
+    str             directory = item->getListItemString(1);
 
     FileSelected(directory, name, directory + name);
 }
diff --git a/code/client/cl_uiplayermodelpicker.cpp b/code/client/cl_uiplayermodelpicker.cpp
index 1ef4e1e5..ca89a42d 100644
--- a/code/client/cl_uiplayermodelpicker.cpp
+++ b/code/client/cl_uiplayermodelpicker.cpp
@@ -155,7 +155,7 @@ PlayerModelPickerClass::PlayerModelPickerClass()
     window = new UIFloatingWindow();
     window->Create(
         NULL,
-        UIRect2D((cls.glconfig.vidWidth - 400) / 2, (cls.glconfig.vidHeight - 300) / 2, 400, 300),
+        UIRect2D((uid.vidWidth - 400) / 2, (uid.vidHeight - 300) / 2, 400, 300),
         "Player Model Select...",
         UColor(0.15f, 0.195f, 0.278f),
         UHudColor
@@ -295,7 +295,7 @@ void PlayerModelPickerClass::FileSelected(Event *ev)
     fullname = PM_DisplaynameToFilename(name);
 
     if (!Q_stricmpn(fullname, "german_waffen_", 14)) {
-        Q_strncpyz(donotshowssindeorfr, "german_waffen_", sizeof(donotshowssindeorfr));
+        Q_strncpyz(donotshowssindeorfr, "german_waffenss_", sizeof(donotshowssindeorfr));
         Q_strcat(donotshowssindeorfr, sizeof(donotshowssindeorfr), fullname.c_str() + 14);
     } else {
         Q_strncpyz(donotshowssindeorfr, fullname, sizeof(donotshowssindeorfr));
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 c6bd8278..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,73 +80,83 @@ Event EV_FAKKServerList_UpdateServer(
 );
 
 struct ServerListInstance {
-    int iServerType;
-    UIFAKKServerList* serverList;
+    int               iServerType;
+    UIFAKKServerList *serverList;
 };
 
-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;
+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(UIFAKKServerList* parent, 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(UIFAKKServerList* parent, 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_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
@@ -163,11 +179,11 @@ 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 };
+    UIRect2D       newRect       = drawRect;
+    vec2_t         virtualScale  = {1.f, 1.f};
 
     /*
     if (m_parent->isVirtual()) {
@@ -177,7 +193,10 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
         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) {
@@ -210,7 +229,7 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
             newRect.pos.y / virtualScale[1],
             getListItemString(iColumn).c_str(),
             -1,
-            false //m_parent->isVirtual()
+            virtualScale
         );
     } else {
         if (IsDifferentVersion()) {
@@ -266,7 +285,7 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
                 newRect.pos.y / virtualScale[1],
                 getListItemString(iColumn).c_str(),
                 -1,
-                false //m_parent->isVirtual()
+                virtualScale
             );
 
             if (IsDifferentVersion()) {
@@ -356,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 {
@@ -429,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);
@@ -453,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':
@@ -473,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++;
                         }
                     }
@@ -506,7 +535,7 @@ qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
     }
 }
 
-void UIFAKKServerList::UpdateUIElement( void )
+void UIFAKKServerList::UpdateUIElement(void)
 {
     float width;
 
@@ -524,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);
@@ -538,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;
     }
@@ -547,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();
     }
 
@@ -557,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));
@@ -604,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 {
@@ -648,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;
@@ -670,105 +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);
+        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);
+            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;
@@ -776,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;
@@ -793,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);
@@ -809,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);
@@ -843,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;
                 }
             }
@@ -865,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]);
@@ -884,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);
         }
 
@@ -921,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);
@@ -936,7 +988,7 @@ void UIFAKKServerList::SortByColumn( int column )
             // found one
             numeric = def.numeric;
             reverse = def.reverse_sort;
-            exists = true;
+            exists  = true;
             break;
         }
     }
@@ -947,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());
@@ -977,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;
                 }
@@ -1030,68 +1079,80 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
             return;
         }
 
-        Cvar_Set("dm_serverstatusbar", va("%i", (int)(uintptr_t)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;
-        const char* pszGameVerNumber;
+    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(pszGameVerNumber) - com_target_version->value) > 0.1f) {
+                //if (fabs(fGameVer - com_target_version->value) > 0.1f) {
                 //    bDiffVersion = true;
                 //}
-                if (fabs(atof(pszGameVerNumber)) < 2.3f) {
+                if (fabs(fGameVer) < 2.3f) {
                     bDiffVersion = true;
                 }
             } else {
-                //if (fabs(atof(pszGameVerNumber) - com_target_version->value) > 0.3f) {
+                //if (fabs(fGameVer - com_target_version->value) > 0.3f) {
                 //    bDiffVersion = true;
                 //}
-                if (fabs(atof(pszGameVerNumber)) < 2.1f) {
+                if (fabs(fGameVer) < 2.1f) {
                     bDiffVersion = true;
                 }
             }
         } else {
-            if (fabs(atof(pszGameVerNumber) - 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(uiServerList, "?", sAddress, "?", "?/?", "?", "?", "?");
-            pNewServerItem->m_sIP = ServerGetAddress(server);
+            pNewServerItem             = new FAKKServerListItem(uiServerList, "?", sAddress, "?", "?/?", "?", "?", "?");
+            pNewServerItem->m_sIP      = ServerGetAddress(server);
             pNewServerItem->m_uiRealIP = iRealIP;
             pNewServerItem->m_iGameSpyPort = iGameSpyPort;
 
@@ -1111,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) {
@@ -1143,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.");
@@ -1159,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);
         
@@ -1198,6 +1268,7 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
 
             uiServerList->AddItem(pNewServerItem);
         }
+#endif
 
         /*
         for (i = 1; i <= uiServerList->getNumItems(); i++)
@@ -1225,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_uistd.cpp b/code/client/cl_uistd.cpp
index d3780aa8..4fd41c6e 100644
--- a/code/client/cl_uistd.cpp
+++ b/code/client/cl_uistd.cpp
@@ -439,8 +439,11 @@ void UIFakkLabel::LayoutRenderModelAnim(Event *ev)
 
 void UIFakkLabel::DrawStatbar(float frac)
 {
-    vec4_t col;
-    float  alpha;
+    vec4_t    col;
+    float     alpha;
+    qhandle_t hMat;
+    float     w, h;
+    float     fvWidth, fvHeight;
 
     col[0] = col[1] = col[2] = col[3] = 1.0;
 
@@ -475,11 +478,7 @@ void UIFakkLabel::DrawStatbar(float frac)
     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;
-    }
+    alpha = Q_clamp_float(alpha, 0, 1);
 
     col[3] = alpha;
 
@@ -490,13 +489,38 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     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());
+                    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);
-                        m_statbar_material_flash->ReregisterMaterial();
-                        re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
+
+                        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;
                 }
@@ -507,14 +531,39 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     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());
+                    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);
-                        m_statbar_material_flash->ReregisterMaterial();
-                        re.DrawTilePic(
-                            0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material_flash->GetMaterial()
+
+                        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;
@@ -528,14 +577,12 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     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,
@@ -548,6 +595,24 @@ void UIFakkLabel::DrawStatbar(float frac)
                             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:
@@ -557,14 +622,12 @@ void UIFakkLabel::DrawStatbar(float frac)
                     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,
@@ -577,20 +640,36 @@ void UIFakkLabel::DrawStatbar(float frac)
                             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;
 
-                    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,
@@ -686,12 +765,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                 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 {
@@ -709,12 +786,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                     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());
                 }
 
@@ -739,12 +814,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                 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 {
@@ -766,12 +839,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                     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());
                 }
 
@@ -846,12 +917,10 @@ void UIFakkLabel::DrawStatNeedle(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) {
         re.SetColor(col);
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 
@@ -867,11 +936,9 @@ void UIFakkLabel::DrawStatNeedle(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());
     }
 }
@@ -913,8 +980,8 @@ void UIFakkLabel::DrawStatRotator(float frac)
     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;
@@ -937,11 +1004,9 @@ void UIFakkLabel::DrawStatRotator(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());
     }
 
@@ -959,11 +1024,9 @@ void UIFakkLabel::DrawStatRotator(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());
     }
 }
@@ -1137,7 +1200,6 @@ void UIFakkLabel::DrawStatCompass(float frac)
     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];
@@ -1150,7 +1212,6 @@ void UIFakkLabel::DrawStatCompass(float frac)
     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());
 }
 
@@ -1227,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());
     }
 
@@ -1249,11 +1308,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());
     }
 }
@@ -1319,7 +1376,7 @@ void UIFakkLabel::Draw(void)
                 m_iFontAlignmentVertical,
                 Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(cl.snap.ps.stats[m_stat_configstring]))),
                 UBlack,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         } else {
             m_font->PrintJustified(
@@ -1327,7 +1384,7 @@ void UIFakkLabel::Draw(void)
                 m_iFontAlignmentHorizontal,
                 m_iFontAlignmentVertical,
                 Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(cl.snap.ps.stats[m_stat_configstring]))),
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         }
         return;
@@ -1346,7 +1403,7 @@ void UIFakkLabel::Draw(void)
                     m_iFontAlignmentVertical,
                     va("%d", delta),
                     UBlack,
-                    m_bVirtual ? m_vVirtualScale : NULL
+                    getVirtualScale()
                 );
             } else {
                 m_font->PrintJustified(
@@ -1354,7 +1411,7 @@ void UIFakkLabel::Draw(void)
                     m_iFontAlignmentHorizontal,
                     m_iFontAlignmentVertical,
                     va("%d", delta),
-                    m_bVirtual ? m_vVirtualScale : NULL
+                    getVirtualScale()
                 );
             }
             return;
@@ -1425,6 +1482,12 @@ void UIFakkLabel::Draw(void)
             return;
         }
 
+        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;
+        }
+
         m_font->setColor(m_foreground_color);
 
         if (m_bOutlinedText) {
@@ -1434,7 +1497,7 @@ void UIFakkLabel::Draw(void)
                 m_iFontAlignmentVertical,
                 Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[m_itemindex]))),
                 UBlack,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         } else {
             m_font->PrintJustified(
@@ -1442,7 +1505,7 @@ void UIFakkLabel::Draw(void)
                 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
+                getVirtualScale()
             );
         }
 
diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 71a127b6..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.
 
@@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_ui.h"
 #include "../qcommon/localization.h"
 
+#include "../server/server.h"
+
 CLASS_DECLARATION(UIWidget, View3D, NULL) {
     {&W_Activated,     &View3D::OnActivate  },
     {&W_Deactivated,   &View3D::OnDeactivate},
@@ -30,8 +32,6 @@ CLASS_DECLARATION(UIWidget, View3D, NULL) {
     {NULL,             NULL                 }
 };
 
-#define MAX_SUBTITLES 4
-
 cvar_t *subs[MAX_SUBTITLES];
 cvar_t *teams[MAX_SUBTITLES];
 float   fadeTime[MAX_SUBTITLES];
@@ -52,16 +52,6 @@ View3D::View3D()
     m_locationprint = qfalse;
 }
 
-void View3D::UpdateLocationPrint(int x, int y, const char *s, float alpha)
-{
-    m_printstring   = s;
-    m_printalpha    = alpha;
-    m_printfadetime = 4000.0;
-    m_x_coord       = x;
-    m_y_coord       = y;
-    m_locationprint = qtrue;
-}
-
 void View3D::UpdateCenterPrint(const char *s, float alpha)
 {
     m_printstring = s;
@@ -77,41 +67,20 @@ void View3D::UpdateCenterPrint(const char *s, float alpha)
     m_locationprint = qfalse;
 }
 
-void View3D::PrintSound(int channel, const char *name, float vol, int rvol, float pitch, float base, int& line)
+void View3D::UpdateLocationPrint(int x, int y, const char *s, float alpha)
 {
-    char  buf[255];
-    float x;
-    float xStep;
-    float height;
+    m_printstring   = s;
+    m_printalpha    = alpha;
+    m_printfadetime = 4000.0;
+    m_x_coord       = x;
+    m_y_coord       = y;
+    m_locationprint = qtrue;
+}
 
-    height = m_font->getHeight(false);
-    xStep  = height;
-
-    x = 0;
-    sprintf(buf, "%d", channel);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
-
-    x += xStep + xStep;
-    sprintf(buf, "%s", name);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
-
-    x += xStep * 30.0;
-    sprintf(buf, "vol:%.2f", vol);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
-
-    x += xStep * 8;
-    sprintf(buf, "rvol:%.2f", (float)(rvol / 128.f));
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
-
-    x += xStep * 5;
-    sprintf(buf, "pit:%.2f", pitch);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
-
-    x += xStep * 5;
-    sprintf(buf, "base:%d", (int)base);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
-
-    line++;
+void View3D::FrameInitialized(void)
+{
+    Connect(this, W_Activated, W_Activated);
+    Connect(this, W_Deactivated, W_Deactivated);
 }
 
 void View3D::Pressed(Event *ev)
@@ -120,18 +89,13 @@ void View3D::Pressed(Event *ev)
     OnActivate(ev);
 }
 
-void View3D::OnDeactivate(Event *ev)
-{
-    cls.keyCatchers |= KEYCATCH_UI;
-}
-
 void View3D::OnActivate(Event *ev)
 {
     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) {
@@ -146,262 +110,9 @@ void View3D::OnActivate(Event *ev)
     }
 }
 
-void View3D::LocationPrint(void)
+void View3D::OnDeactivate(Event *ev)
 {
-    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(false) - 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,
-        m_bVirtual ? m_vVirtualScale : NULL
-    );
-
-    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,
-        m_bVirtual ? m_vVirtualScale : NULL
-    );
-
-    m_font->setColor(UBlack);
-    m_printfadetime -= cls.frametime;
-
-    if (m_printfadetime < 0) {
-        m_printfadetime = 0;
-    }
-}
-
-qboolean View3D::LetterboxActive(void)
-{
-    return m_letterbox_active;
-}
-
-float avWidth = 0.0;
-
-void View3D::InitSubtitle(void)
-{
-    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;
-    }
-
-    totalWidth = 0.0;
-    for (char j = 'A'; j <= 'Z'; j++) {
-        totalWidth += m_font->getCharWidth(j);
-    }
-
-    avWidth = totalWidth / 26.0;
-}
-
-void View3D::FrameInitialized(void)
-{
-    Connect(this, W_Activated, W_Activated);
-    Connect(this, W_Deactivated, W_Deactivated);
-}
-
-void View3D::DrawSubtitleOverlay(void)
-{
-    cvar_t *subAlpha;
-    int     i;
-    float   minX, maxY;
-    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;
-            Cvar_Set(va("subtitle%d", i), "");
-        }
-    }
-
-    minX = m_screenframe.size.height - m_font->getHeight(false) * 10;
-    maxY = (m_frame.pos.x + m_frame.size.width) - (m_frame.pos.x + m_frame.size.width) * 0.2f;
-    line = 0;
-
-    for (i = 0; i < MAX_SUBTITLES; i++) {
-        if (m_font->getWidth(subs[i]->string, sizeof(oldStrings[i])) > maxY) {
-            char  buf[2048];
-            char *c;
-            char *end;
-            char *start;
-            float total;
-            int   blockcount;
-
-            c = buf;
-            strcpy(buf, subs[i]->string);
-
-            total = 0;
-            end   = NULL;
-            start = buf;
-            while (*c) {
-                blockcount = m_font->DBCSGetWordBlockCount(c, -1);
-                if (!blockcount) {
-                    break;
-                }
-
-                total += m_font->getWidth(c, blockcount);
-                c += blockcount;
-
-                if (total > maxY) {
-                    total = 0;
-                    if (end < start) {
-                        Com_Printf("ERROR - word longer than possible line\n");
-                        break;
-                    }
-
-                    m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-                    m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, start, -1, false);
-
-                    m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-                    m_font->Print(20, m_font->getHeight(false) * line + minX, start, -1, false);
-
-                    start = end + 1;
-                    c     = end + 1;
-                    line++;
-                }
-            }
-
-            m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-            m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, start, -1, qfalse);
-
-            m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-            m_font->Print(20, m_font->getHeight(false) * line + minX, start, -1, qfalse);
-            line++;
-        } else {
-            m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-            m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, subs[i]->string, -1, qfalse);
-
-            m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-            m_font->Print(20, m_font->getHeight(false) * line + minX, subs[i]->string, -1, qfalse);
-
-            line++;
-        }
-    }
-}
-
-void View3D::DrawSoundOverlay(void)
-{
-    setFont("verdana-14");
-    m_font->setColor(UWhite);
-
-    // FIXME: TODO
-    if (sound_overlay->integer) {
-        Com_Printf("sound_overlay isn't supported with OpenAL/SDL right now.\n");
-        Cvar_Set("sound_overlay", "0");
-    }
-}
-
-void View3D::DrawProf(void)
-{
-    // Normal empty function
-}
-
-void View3D::DrawLetterbox(void)
-{
-    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;
-    }
-}
-
-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);
-        }
-    }
+    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
 }
 
 void View3D::DrawFPS(void)
@@ -413,13 +124,13 @@ void View3D::DrawFPS(void)
         re.SetColor(UBlack);
         re.DrawBox(
             0.0,
-            m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 4.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(qfalse) * 4.0
+            m_font->getHeight() * 4.0
         );
     }
 
-    sprintf(string, "FPS %4.1f", currentfps);
+    Com_sprintf(string, sizeof(string), "FPS %4.1f", currentfps);
     if (currentfps > 23.94) {
         if (cl_greenfps->integer) {
             m_font->setColor(UGreen);
@@ -434,11 +145,11 @@ void View3D::DrawFPS(void)
     }
 
     m_font->Print(
-        m_font->getHeight(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 3.0,
+        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,
-        qfalse
+        getHighResScale()
     );
 
     // Draw elements count
@@ -448,29 +159,343 @@ void View3D::DrawFPS(void)
         m_font->setColor(UWhite);
     }
 
-    sprintf(string, "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
+    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(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 2.0,
+        (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,
-        qfalse
+        getHighResScale()
     );
 
-    sprintf(string, "t%5d v%5d Mtex%5.2f", cls.total_tris, cls.total_verts, (float)cls.total_texels * 0.00000095367432);
+    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(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse),
+        (m_font->getHeight(getHighResScale()) * 10.0) / getHighResScale()[0],
+        (m_frame.pos.y + m_frame.size.height - m_font->getHeight(getHighResScale())) / getHighResScale()[1],
         string,
         -1,
-        qfalse
+        getHighResScale()
     );
 
     m_font->setColor(UBlack);
 }
 
+/*
+void ProfPrint(UIFont* m_font, float minY, int line, char* label, prof_var_t* var, int level)
+{
+
+}
+*/
+
+void View3D::DrawProf(void)
+{
+    // FIXME: unimplemented
+}
+
+void View3D::PrintSound(int channel, const char *name, float vol, int rvol, float pitch, float base, int& line)
+{
+    char  buf[255];
+    float x;
+    float xStep;
+    float height;
+
+    height = m_font->getHeight(getHighResScale());
+    xStep  = height;
+
+    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::DrawSoundOverlay(void)
+{
+    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");
+    }
+}
+
+void DisplayServerNetProfileInfo(UIFont *font, float y, netprofclient_t *netprofile)
+{
+    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) {
@@ -494,6 +519,7 @@ void View3D::Draw2D(void)
 
         if (!cls.no_menus) {
             DrawSoundOverlay();
+            DrawNetProfile();
             DrawSubtitleOverlay();
         }
     }
@@ -504,24 +530,6 @@ void View3D::Draw2D(void)
     }
 }
 
-void View3D::Draw(void)
-{
-    if (clc.state != CA_DISCONNECTED) {
-        SCR_DrawScreenField();
-    }
-
-    set2D();
-
-    re.SavePerformanceCounters();
-
-    Draw2D();
-}
-
-void View3D::ClearCenterPrint(void)
-{
-    m_printfadetime = 0.0;
-}
-
 void View3D::CenterPrint(void)
 {
     float       alpha;
@@ -556,7 +564,7 @@ void View3D::CenterPrint(void)
             m_iFontAlignmentHorizontal,
             m_iFontAlignmentVertical,
             p,
-            m_bVirtual ? m_vVirtualScale : NULL
+            getVirtualScale()
         );
 
         m_font->setColor(UColor(1, 1, 1, alpha));
@@ -564,7 +572,7 @@ void View3D::CenterPrint(void)
         frame = getClientFrame();
 
         m_font->PrintJustified(
-            frame, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, p, m_bVirtual ? m_vVirtualScale : NULL
+            frame, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, p, getVirtualScale()
         );
 
         m_font->setColor(UBlack);
@@ -588,6 +596,275 @@ void View3D::CenterPrint(void)
     }
 }
 
+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)
+{
+    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);
+        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);
+    }
+
+    avWidth = totalWidth / 26.0;
+}
+
+void View3D::DrawSubtitleOverlay(void)
+{
+    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::ClearCenterPrint(void)
+{
+    m_printfadetime = 0.0;
+}
+
+qboolean View3D::LetterboxActive(void)
+{
+    return m_letterbox_active;
+}
+
 CLASS_DECLARATION(UIWidget, ConsoleView, NULL) {
     {NULL, NULL}
 };
diff --git a/code/client/cl_uiview3d.h b/code/client/cl_uiview3d.h
index fc908a9f..ef11c986 100644
--- a/code/client/cl_uiview3d.h
+++ b/code/client/cl_uiview3d.h
@@ -51,6 +51,9 @@ protected:
     void OnDeactivate(Event *ev);
     void DrawSubtitleOverlay(void);
 
+    // Added in 2.0
+    void DrawNetProfile(void);
+
 public:
     View3D();
 
diff --git a/code/client/client.h b/code/client/client.h
index 6fe6eed4..c693fbe8 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -36,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
@@ -174,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;
@@ -239,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;
@@ -297,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;
@@ -353,12 +383,14 @@ typedef struct {
 	void* savedCgameState;
 	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;
@@ -385,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;
@@ -445,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;
@@ -499,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
 //
@@ -520,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);
@@ -545,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 );
 
@@ -583,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);
@@ -670,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
diff --git a/code/client/new/snd_local_new.h b/code/client/new/snd_local_new.h
index 1f336208..69ae7dcf 100644
--- a/code/client/new/snd_local_new.h
+++ b/code/client/new/snd_local_new.h
@@ -59,6 +59,9 @@ 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 3490119d..2bb4aa37 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -21,8 +21,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "../snd_local.h"
+#include "../client.h"
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
+
+qboolean s_bSoundPaused = qfalse;
 
 void S_Init2()
 {
@@ -32,6 +35,10 @@ void S_Init2()
     // 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);
 }
 
 /*
@@ -52,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);
 }
 
@@ -363,6 +381,16 @@ void MUSIC_CheckForStoppedSongs(void)
     STUB();
 }
 
+/*
+==============
+S_CurrentSoundtrack
+==============
+*/
+const char* S_CurrentSoundtrack()
+{
+    return "";
+}
+
 /*
 =================
 S_IsSoundRegistered
@@ -427,28 +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 0b298c01..4b98fb86 100644
--- a/code/client/new/snd_public_new.h
+++ b/code/client/new/snd_public_new.h
@@ -64,6 +64,12 @@ 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);
@@ -74,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 dd0fbfca..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 );
diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index f08bb524..47fb79eb 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -20,10 +20,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if USE_SOUND_NEW
-
 #include "snd_local.h"
 #include "snd_openal_new.h"
+#include "client.h"
+#include "cl_ui.h"
 
 typedef struct {
     vec3_t origin;
@@ -32,10 +32,6 @@ typedef struct {
     int    mergeFrame;
 } loopSound_t;
 
-#    define MAX_SFX         1400
-#    define MAX_SFX_INFOS   1000
-#    define MAX_LOOP_SOUNDS 64
-
 qboolean s_bLastInitSound  = qfalse;
 qboolean s_bSoundStarted   = qfalse;
 qboolean s_bSoundPaused    = qfalse;
@@ -70,81 +66,412 @@ cvar_t *s_dialogscale;
 int         numLoopSounds;
 loopSound_t loopSounds[MAX_LOOP_SOUNDS];
 
+/*
+==============
+S_SoundInfo_f
+==============
+*/
 void S_SoundInfo_f()
 {
-    // FIXME: unimplemented
+    S_PrintInfo();
 }
 
+/*
+==============
+S_SoundDump_f
+==============
+*/
 void S_SoundDump_f()
 {
-    // FIXME: unimplemented
+    S_DumpInfo();
 }
 
+/*
+==============
+S_Init
+==============
+*/
 void S_Init(qboolean full_startup)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
-    return NULL;
+    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()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    sfx->data = NULL;
+    sfx->iFlags |= SFX_FLAG_DEFAULT_SOUND;
 }
 
+/*
+==============
+S_IsSoundRegistered
+==============
+*/
 qboolean S_IsSoundRegistered(const char *name)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    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)
 {
-    // FIXME: unimplemented
-    return 0;
+    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)
 {
-    // FIXME: unimplemented
-    return 0;
+    return s_knownSfx[handle].time_length;
 }
 
+/*
+==============
+S_EndRegistration
+==============
+*/
 void S_EndRegistration()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    s_fAmbientVolume = volume;
 }
 
+/*
+==============
+S_StartSound
+==============
+*/
 void S_StartSound(
     const vec3_t origin,
     int          entnum,
@@ -157,29 +484,171 @@ void S_StartSound(
     int          streamed
 )
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_ClearLoopingSounds();
 }
 
+/*
+==============
+S_AddLoopingSound
+==============
+*/
 void S_AddLoopingSound(
     const vec3_t origin,
     const vec3_t velocity,
@@ -191,42 +660,171 @@ void S_AddLoopingSound(
     int          flags
 )
 {
-    // FIXME: unimplemented
+    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])
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_Respatialize(entityNum, head, axis);
 }
 
+/*
+==============
+S_Update
+==============
+*/
 void S_Update()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (server_loading) {
+        return;
+    }
+
+    S_Driver_Update();
 }
 
+/*
+==============
+S_StopSound
+==============
+*/
 void S_StopSound(int entnum, int channel)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_SetReverb(reverb_type, reverb_level);
 }
 
+/*
+==============
+S_Play
+==============
+*/
 void S_Play()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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
 }
 
-#endif
+/*
+==============
+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 e0ec8609..04c6ba9f 100644
--- a/code/client/snd_local.h
+++ b/code/client/snd_local.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/qcommon.h"
 #include "snd_public.h"
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 
 #define	PAINTBUFFER_SIZE		4096					// this is in samples
 
diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 8707f56c..877df120 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -29,6 +29,29 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 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;
@@ -39,6 +62,7 @@ typedef struct {
 
     int dataofs;
     int datasize;
+    int dataalign;
 } wavinfo_t;
 
 typedef struct sfx_s {
@@ -127,13 +151,61 @@ typedef struct {
 } channelbasesavegame_t;
 
 typedef struct {
-    channelbasesavegame_t Channels[96];
+    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);
 
@@ -141,6 +213,11 @@ 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
 
 //
@@ -150,6 +227,7 @@ void S_ClearSoundBuffer();
 #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)
@@ -158,6 +236,16 @@ void S_ClearSoundBuffer();
 #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
 }
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/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
index e2146254..2e35801c 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -20,18 +20,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if USE_SOUND_NEW
-
-#    include "snd_local.h"
-#    include "snd_openal_new.h"
+#include "snd_local.h"
+#include "snd_openal_new.h"
+#include "client.h"
+#include "../server/server.h"
+#include "snd_codec.h"
 
 typedef struct {
-    char  *funcname;
-    void **funcptr;
-    bool   required;
+    const char *funcname;
+    void      **funcptr;
+    bool        required;
 } extensions_table_t;
 
-#    define MAX_MUSIC_SONGS 16
+#define MAX_MUSIC_SONGS 16
 
 static int   s_iNextLoopingWarning = 0;
 static int   s_iReverbType         = 0;
@@ -39,6 +40,9 @@ 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;
@@ -49,6 +53,9 @@ 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,
@@ -56,15 +63,17 @@ static float reverb_table[] = {
     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 void        *al_context_id             = NULL;
-static ALCdevice   *al_device                 = NULL;
+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)();
@@ -84,180 +93,1228 @@ 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 __alDieIfError(char *file)
+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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
-    return false;
+    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()
 {
-    // FIXME: unimplemented
-    return false;
+    /*
+    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)
 {
-    // FIXME: unimplemented
-    return false;
+    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()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    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()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
-    return 0;
+    return s_volume->value * s_fFadeVolume;
 }
 
+/*
+==============
+S_NeedFullRestart
+==============
+*/
 qboolean S_NeedFullRestart()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return Cvar_Get("s_initsound", "1", 0)->integer != s_bLastInitSound;
 }
 
+/*
+==============
+S_PrintInfo
+==============
+*/
 void S_PrintInfo()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    Com_Printf("S_OPENAL_Pitch() needs to be implemented!\n");
 }
 
+/*
+==============
+S_OPENAL_LoadMP3
+==============
+*/
 static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
 {
-    // FIXME: unimplemented
-    return false;
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    S_OPENAL_NukeChannel(&openal.chan_mp3);
 }
 
+/*
+==============
+MUSIC_Pause
+==============
+*/
 void MUSIC_Pause()
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        openal.chan_song[i].pause();
+    }
 }
 
+/*
+==============
+MUSIC_Unpause
+==============
+*/
 void MUSIC_Unpause()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    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)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    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)
 {
-    // FIXME: unimplemented
-    return 0;
+    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)
 {
-    // FIXME: unimplemented
-    return 0;
+    return S_OPENAL_PickChannelBase(iEntNum, iEntChannel, 0, MAX_SOUNDSYSTEM_CHANNELS_3D - 1);
 }
 
+/*
+==============
+S_OPENAL_PickChannel2D
+==============
+*/
 static int S_OPENAL_PickChannel2D(int iEntNum, int iEntChannel)
 {
-    // FIXME: unimplemented
-    return 0;
+    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)
 {
-    // FIXME: unimplemented
-    return 0;
+    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)
 {
-    // FIXME: unimplemented
+    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,
@@ -269,9 +1326,138 @@ static void S_OPENAL_Start2DSound(
     float        fMaxDistance
 )
 {
-    // FIXME: unimplemented
+    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,
@@ -284,9 +1470,172 @@ void S_OPENAL_StartSound(
     qboolean     bStreamed
 )
 {
-    // FIXME: unimplemented
+    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,
@@ -298,42 +1647,263 @@ void S_OPENAL_AddLoopingSound(
     int          iFlags
 )
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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]);
+    }
 }
 
-void S_OPENAL_StopSound(int iEntNum)
+/*
+==============
+S_OPENAL_StopSound
+==============
+*/
+void S_OPENAL_StopSound(int iEntNum, int iEntChannel)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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
 )
 {
-    // FIXME: unimplemented
-    return 0;
+    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,
@@ -343,10 +1913,64 @@ static int S_OPENAL_Start3DLoopSound(
     const vec3_t         vListenerOrigin
 )
 {
-    // FIXME: unimplemented
-    return 0;
+    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,
@@ -357,401 +1981,3065 @@ static bool S_OPENAL_UpdateLoopSound(
     const vec3_t         vLoopOrigin
 )
 {
-    // FIXME: unimplemented
-    return false;
+    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)
 {
-    // FIXME: unimplemented
+    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])
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
-    return 0;
+    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: unimplemented
+    // 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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    qalSource3f(source, AL_VELOCITY, v0, v1, v2);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_position
+==============
+*/
 void openal_channel::set_position(float v0, float v1, float v2)
 {
-    // FIXME: unimplemented
+    qalSource3f(source, AL_POSITION, v0, v1, v2);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_gain
+==============
+*/
 void openal_channel::set_gain(float gain)
 {
-    // FIXME: unimplemented
+    qalSourcef(source, AL_GAIN, gain);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_no_3d
+==============
+*/
 void openal_channel::set_no_3d()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    qalSourcePause(source);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::stop
+==============
+*/
 void openal_channel::stop()
 {
-    // FIXME: unimplemented
-}
-
-ALint openal_channel::get_state()
-{
-    // FIXME: unimplemented
-    return 0;
+    qalSourceStop(source);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::is_free
+==============
+*/
 bool openal_channel::is_free()
 {
-    // FIXME: unimplemented
-    return false;
+    ALint state = sample_status();
+
+    return state == AL_INITIAL || state == AL_STOPPED;
 }
 
+/*
+==============
+openal_channel::is_paused
+==============
+*/
 bool openal_channel::is_paused()
 {
-    // FIXME: unimplemented
-    return false;
+    ALint state = sample_status();
+
+    return state == AL_PAUSED;
 }
 
+/*
+==============
+openal_channel::is_playing
+==============
+*/
 bool openal_channel::is_playing()
 {
-    // FIXME: unimplemented
-    return false;
+    ALint state = sample_status();
+
+    return state == AL_PLAYING;
 }
 
+/*
+==============
+openal_channel::force_free
+==============
+*/
 void openal_channel::force_free()
 {
-    // FIXME: unimplemented
+    stop();
+    iFlags = 0;
 }
 
+/*
+==============
+openal_channel::set_sfx
+==============
+*/
 bool openal_channel::set_sfx(sfx_t *pSfx)
 {
-    // FIXME: unimplemented
-    return false;
+    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()
 {
-    // FIXME: unimplemented
+    play();
 }
 
+/*
+==============
+openal_channel::stop_sample
+==============
+*/
 void openal_channel::stop_sample()
 {
-    // FIXME: unimplemented
+    pause();
 }
 
+/*
+==============
+openal_channel::resume_sample
+==============
+*/
 void openal_channel::resume_sample()
 {
-    // FIXME: unimplemented
+    play();
 }
 
+/*
+==============
+openal_channel::end_sample
+==============
+*/
 void openal_channel::end_sample()
 {
-    // FIXME: unimplemented
+    stop();
 }
 
+/*
+==============
+openal_channel::set_sample_pan
+==============
+*/
 void openal_channel::set_sample_pan(S32 pan)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    // 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()
 {
-    // FIXME: unimplemented
-    return 0;
+    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()
 {
-    // FIXME: unimplemented
-    return 0;
+    ALfloat gain = 0;
+
+    qalGetSourcef(source, AL_GAIN, &gain);
+    alDieIfError();
+
+    return (gain / S_GetBaseVolume()) * 100;
 }
 
+/*
+==============
+openal_channel::sample_offset
+==============
+*/
 U32 openal_channel::sample_offset()
 {
-    // FIXME: unimplemented
-    return 0;
+    ALint offset = 0;
+
+    qalGetSourcei(source, AL_SAMPLE_OFFSET, &offset);
+    alDieIfError();
+
+    return offset;
 }
 
+/*
+==============
+openal_channel::sample_ms_offset
+==============
+*/
 U32 openal_channel::sample_ms_offset()
 {
-    // FIXME: unimplemented
-    return 0;
+    if (!is_playing()) {
+        return 0;
+    }
+
+    return sample_offset() * 1000ull / sample_playback_rate();
 }
 
+/*
+==============
+openal_channel::sample_loop_count
+==============
+*/
 U32 openal_channel::sample_loop_count()
 {
-    // FIXME: unimplemented
-    return 0;
+    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)
 {
-    // FIXME: unimplemented
+    qalSourcei(source, AL_SAMPLE_OFFSET, offset);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_sample_ms_offset
+==============
+*/
 void openal_channel::set_sample_ms_offset(U32 offset)
 {
-    // FIXME: unimplemented
+    set_sample_offset(offset * sample_playback_rate() / 1000);
 }
 
+/*
+==============
+openal_channel::set_sample_loop_count
+==============
+*/
 void openal_channel::set_sample_loop_count(S32 count)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
-    return 0;
+    ALint retval;
+
+    qalGetSourcei(source, AL_SOURCE_STATE, &retval);
+    alDieIfError();
+
+    return retval;
 }
 
+/*
+==============
+MUSIC_LoadSoundtrackFile
+==============
+*/
 qboolean MUSIC_LoadSoundtrackFile(const char *filename)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    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)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return MUSIC_FindSong(mood) != -1;
 }
 
+/*
+==============
+MUSIC_Loaded
+==============
+*/
 qboolean MUSIC_Loaded()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return music_loaded;
 }
 
+/*
+==============
+Music_Update
+==============
+*/
 void Music_Update()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    for (int i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        MUSIC_StopChannel(i);
+    }
+
+    music_currentsong = -1;
 }
 
+/*
+==============
+MUSIC_FreeAllSongs
+==============
+*/
 void MUSIC_FreeAllSongs()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return MUSIC_CurrentSongChannel() != -1;
 }
 
+/*
+==============
+MUSIC_FindSong
+==============
+*/
 int MUSIC_FindSong(const char *name)
 {
-    // FIXME: unimplemented
-    return 0;
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
-    return NULL;
+    return current_soundtrack;
 }
 
+/*
+==============
+S_PlaySong
+==============
+*/
 void S_PlaySong()
 {
-    // FIXME: unimplemented
+    if (Cmd_Argc() != 2) {
+        Com_Printf("playsong <song alias>\n");
+        return;
+    }
+
+    MUSIC_PlaySong(Cmd_Argv(1));
+    music_active = true;
 }
 
+/*
+==============
+MUSIC_CurrentSongChannel
+==============
+*/
 int MUSIC_CurrentSongChannel()
 {
-    // FIXME: unimplemented
-    return 0;
+    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)
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (openal.chan_trig_music.is_playing()) {
+        openal.chan_trig_music.pause();
+    }
 }
 
+/*
+==============
+S_TriggeredMusic_Unpause
+==============
+*/
 void S_TriggeredMusic_Unpause()
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
+    S_TriggeredMusic_SetupHandle("sound/music/mus_MainTheme.mp3", 0, 0, true);
 }
 
+/*
+==============
+S_StopMovieAudio
+==============
+*/
 void S_StopMovieAudio()
 {
-    // FIXME: unimplemented
+    openal.chan_movie.stop();
 }
 
+/*
+==============
+S_SetupMovieAudio
+==============
+*/
 void S_SetupMovieAudio(const char *pszMovieName)
 {
-    // FIXME: unimplemented
+    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()
 {
-    // FIXME: unimplemented
-    return 0;
+    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
index a7b54ace..a22e2d6f 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -29,6 +29,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 typedef int          S32;
 typedef unsigned int U32;
 
+#define MAX_STREAM_BUFFERS              16
+#define MAX_BUFFER_SAMPLES              16384
+
 typedef enum {
     FADE_NONE,
     FADE_IN,
@@ -36,53 +39,64 @@ typedef enum {
 } fade_t;
 
 typedef struct {
-    vec3_t   vOrigin;
-    vec3_t   vRelativeOrigin;
-    vec3_t   vVelocity;
+    vec3_t vOrigin;
+    vec3_t vRelativeOrigin;
+    vec3_t vVelocity;
+
     sfx_t   *pSfx;
     qboolean bPlaying;
-    int      iChannel;
-    float    fVolume;
-    float    fPitch;
+
+    int   iChannel;
+    float fVolume;
+    float fPitch;
+
     int      iStartTime;
     qboolean bInUse;
     qboolean bCombine;
-    float    fBaseVolume;
-    float    fMinDist;
-    float    fMaxDist;
-    int      iFlags;
+
+    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;
+    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;
 
-    void play();
-    void stop();
-    void pause();
+public:
+    void         play();
+    virtual void stop();
+    void         pause();
 
     void  set_no_3d();
     void  set_3d();
-    ALint get_state();
+    void  set_no_virtualization();
+    void  set_virtualization();
 
     void set_gain(float gain);
     void set_velocity(float v0, float v1, float v2);
@@ -92,8 +106,8 @@ struct openal_channel {
     bool is_paused();
     bool is_playing();
 
-    void force_free();
-    bool set_sfx(sfx_t *pSfx);
+    void         force_free();
+    virtual bool set_sfx(sfx_t *pSfx);
 
     void start_sample();
     void stop_sample();
@@ -104,66 +118,120 @@ struct openal_channel {
     void set_sample_playback_rate(S32 pan);
     S32  sample_playback_rate();
 
-    S32  sample_volume();
-    U32  sample_offset();
-    U32  sample_ms_offset();
-    U32  sample_loop_count();
-    void set_sample_offset(U32 offset);
-    void set_sample_ms_offset(U32 offset);
-    void set_sample_loop_count(S32 count);
-    void set_sample_loop_block(S32 start_offset, S32 end_offset);
+    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[32];
-    openal_channel      chan_2D[32];
-    openal_channel      chan_2D_stream[32];
-    openal_channel      chan_song[2];
-    openal_channel      chan_mp3;
-    openal_channel      chan_trig_music;
-    openal_channel      chan_movie;
-    openal_channel     *channel[101];
-    openal_loop_sound_t loop_sounds[64];
-    openal_channel      movieChannel;
-    sfx_t               movieSFX;
-    char                tm_filename[64];
-    int                 tm_loopcount;
+    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_StartSound(
+    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,
-        int          iEntNum,
-        int          iEntChannel,
+        const vec3_t vVelocity,
         sfxHandle_t  sfxHandle,
         float        fVolume,
         float        fMinDist,
-        float        fPitch,
         float        fMaxDist,
-        qboolean     bStreamed
+        float        fPitch,
+        int          iFlags
     );
-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);
-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();
+    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
 }
diff --git a/code/client/snd_public.h b/code/client/snd_public.h
index ce3069bf..9edf4768 100644
--- a/code/client/snd_public.h
+++ b/code/client/snd_public.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 
 #ifdef __cplusplus
 extern "C" {
@@ -150,6 +150,7 @@ void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffs
 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();
@@ -157,8 +158,29 @@ 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/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/Entities.cpp b/code/fgame/Entities.cpp
index 139d6e8f..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.
 
@@ -80,7 +80,8 @@ Event EV_PG_MaxDuration
     "Sets the maximum duration of bursts(in seconds)\nDefault=3",
     EV_NORMAL
 );
-Event EV_PG_MinNumShots(
+Event EV_PG_MinNumShots
+(
     "MinNumShots",
     EV_DEFAULT,
     "i",
@@ -88,7 +89,8 @@ Event EV_PG_MinNumShots(
     "Sets the minimum # of shots to fire in a cycle\nDefault=1",
     EV_NORMAL
 );
-Event EV_PG_MaxNumShots(
+Event EV_PG_MaxNumShots
+(
     "MaxNumShots",
     EV_DEFAULT,
     "i",
@@ -275,7 +277,8 @@ Event EV_PG_SetPreImpactSoundTime
     "Set the time before impact to play the preimpact sound.",
     EV_NORMAL
 );
-Event EV_PG_SetPreImpactSoundProbability(
+Event EV_PG_SetPreImpactSoundProbability
+(
     "preimpactsoundprob",
     EV_DEFAULT,
     "f",
@@ -324,7 +327,7 @@ void ClearProjectileTargets()
 
 ProjectileTarget::ProjectileTarget()
 {
-    m_iTarget = -1;
+    m_iID = -1;
     setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_NOT);
     hideModel();
@@ -334,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") {
@@ -492,6 +502,7 @@ void ProjectileGenerator::TurnOn(Event *ev)
     if (!m_bIsTurnedOn) {
         CancelEventsOfType(EV_PG_BeginCycle);
         CancelEventsOfType(EV_TickCycle);
+        SetupNextCycle();
         m_bIsTurnedOn = true;
     }
 }
@@ -519,6 +530,7 @@ void ProjectileGenerator::SetupNextCycle()
 
     // 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;
     }
@@ -578,7 +590,7 @@ void ProjectileGenerator::GetLocalTargets()
     m_projectileTargets.ClearObjectList();
     for (i = 1; i <= g_projectileTargets.NumObjects(); i++) {
         ProjectileTarget *target = g_projectileTargets.ObjectAt(i);
-        if (m_iId == target->GetTarget()) {
+        if (m_iId == target->GetId()) {
             m_projectileTargets.AddObject(target);
         }
     }
@@ -1630,7 +1642,7 @@ ThrobbingBox_Explosive::ThrobbingBox_Explosive()
 
     setModel("items\\\\pulse_explosive.tik");
     m_sUsedModel     = "items/explosive.tik";
-    m_sSound         = "explose_flak88";
+    m_sSound         = "explode_flak88";
     m_sActivateSound = "plantbomb";
     m_sTickSound     = "bombtick";
 
@@ -1804,6 +1816,7 @@ void ThrobbingBox_Explosive::OnBlowUp(Event *ev)
 
                 ent = veh->QueryDriverSlotEntity(0);
                 if (ent) {
+                    ent->takedamage = DAMAGE_YES;
                     ent->Damage(this, this, ent->health * 2.f, vec_zero, vec_zero, vec_zero, 50, 0, MOD_VEHICLE);
                 }
             }
@@ -1837,7 +1850,7 @@ void ThrobbingBox_Explosive::OnUse(Event *ev)
 
     if (m_fStopwatchDuration > 0) {
         Player *player = static_cast<Player *>(G_FindTarget(this, "player"));
-        player->SetStopwatch(m_fStopwatchDuration, SWT_FUSE);
+        player->SetStopwatch(m_fStopwatchDuration, SWT_NORMAL);
         LoopSound(m_sTickSound);
     }
 
@@ -1894,6 +1907,13 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerFlak88, "Thr
     {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.
@@ -1916,6 +1936,12 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodeFlak88, "Throbbing
     {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.
@@ -1938,6 +1964,11 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodeNebelwerfer, "Thro
     {NULL, NULL}
 };
 
+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.
@@ -1956,10 +1987,16 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodeNebelwerfer, "Thro
  ---------------------------------------------------------------------------------------------
 */
 
-CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerNebelwerfer, "ThrobbingBox_ExplodeNebelwerfer") {
+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.
@@ -1979,13 +2016,33 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerNebelwerfer,
 
 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;
@@ -1997,7 +2054,7 @@ void ThrobbingBox_Stickybomb::OnStickyBombWet(Event *ev)
 
     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)
@@ -2193,10 +2250,110 @@ int Objective::GetObjectiveIndex() const
 */
 
 CLASS_DECLARATION(Entity, FencePost, "func_fencepost") {
-    {&EV_Killed, NULL},
-    {NULL,       NULL}
+    {&EV_Killed, &FencePost::Killed},
+    {NULL,       NULL              }
 };
 
+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",
@@ -2213,7 +2370,7 @@ Event EV_SetEnemyName2
     "s",
     "enemyname",
     "",
-    EV_GETTER
+    EV_SETTER
 );
 Event EV_GetEnemyName
 (
@@ -2222,7 +2379,7 @@ Event EV_GetEnemyName
     "s",
     "enemyname",
     "",
-    EV_SETTER
+    EV_GETTER
 );
 Event EV_Sentient_GetDontDropWeapons
 (
@@ -2337,31 +2494,38 @@ CLASS_DECLARATION(SimpleArchivedEntity, AISpawnPoint, "info_aispawnpoint") {
 
 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_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_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)
@@ -2371,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);
 }
@@ -2538,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 c08365f8..16ed9600 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -26,26 +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_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
+#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);
@@ -53,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
@@ -106,16 +108,16 @@ public:
     bool ShouldRotateYaw() const;
     bool ShouldRotateRoll() const;
 
-    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    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;
@@ -123,7 +125,7 @@ public:
     void         GetMuzzlePos(Vector& pos);
     void         Fire();
     void         TryLaunchSound();
-    void         SetWeaponAnim(const char* name, Event* ev);
+    void         SetWeaponAnim(const char *name, Event *ev);
     void         EventAccuracy(Event *ev);
     void         EventMaxDelay(Event *ev);
     void         EventMinDelay(Event *ev);
@@ -134,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;
@@ -164,8 +166,8 @@ public:
     void SetProjectileModel(Event *ev);
 
     float EstimateImpactTime(const Vector& targetOrigin, const Vector& fromOrigin, float speed) const;
-    bool Attack(int count) override;
-    void Archive(Archiver& arc) override;
+    bool  Attack(int count) override;
+    void  Archive(Archiver& arc) override;
 };
 
 class ProjectileGenerator_Gun : public ProjectileGenerator
@@ -275,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
@@ -306,6 +320,8 @@ private:
 public:
     CLASS_PROTOTYPE(ThrobbingBox_Stickybomb);
 
+    ThrobbingBox_Stickybomb();
+
     void OnStickyBombWet(Event *ev);
     void OnStickyBombUse(Event *ev);
 
@@ -325,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);
@@ -340,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 d4b1921b..b59c2ec7 100644
--- a/code/fgame/Tow_Entities.cpp
+++ b/code/fgame/Tow_Entities.cpp
@@ -269,13 +269,13 @@ 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;
     }
@@ -308,13 +308,13 @@ void TOWObjective::OnInitialize(Event *ev)
 
     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 a63a51e6..8c53faa6 100644
--- a/code/fgame/VehicleCollisionEntity.cpp
+++ b/code/fgame/VehicleCollisionEntity.cpp
@@ -24,69 +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;
 
-	showModel();
-	setMoveType( MOVETYPE_PUSH );
-	setSolidType(SOLID_NOT);
+    showModel();
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_NOT);
 
-	edict->clipmask |= MASK_VEHICLE;
-	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)
 {
-	m_pOwner->ProcessEvent(*ev);
+    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 8da80156..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.
 
@@ -31,6 +31,8 @@ cVehicleSlot::cVehicleSlot()
     prev_takedamage = (damage_t)-1;
     prev_solid      = (solid_t)-1;
     prev_contents   = -1;
+
+    prev_num_children = 0;
 }
 
 void cVehicleSlot::NotSolid(void)
@@ -51,23 +53,37 @@ void cVehicleSlot::NotSolid(void)
     prev_contents   = ent->edict->r.contents;
 
     ent->takedamage = DAMAGE_NO;
-    ent->setSolidType(SOLID_NOT);
+
+    prev_num_children = 0;
 
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
-        if (sub && !sub->IsSubclassOfWeapon()) {
+        // 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);
         }
     }
 
-    if (!ent->IsSubclassOfPlayer()) {
-        ent->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)
 {
-    int i;
+    int i, j;
 
     if (!(flags & FL_SWIM)) {
         return;
@@ -87,12 +103,24 @@ void cVehicleSlot::Solid(void)
     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()) {
-            sub->setSolidType(SOLID_BBOX);
+            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()
@@ -136,9 +164,19 @@ void cTurretSlot::NotSolid(void)
         }
     }
 
+    prev_num_children = 0;
+
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
-        if (sub && !sub->IsSubclassOfWeapon()) {
+        // 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);
         }
     }
@@ -146,7 +184,7 @@ void cTurretSlot::NotSolid(void)
 
 void cTurretSlot::Solid(void)
 {
-    int i;
+    int i, j;
 
     if (!(flags & FL_SWIM)) {
         return;
@@ -177,10 +215,22 @@ void cTurretSlot::Solid(void)
         }
     }
 
+    //
+    // Fixed in OPM
+    //  Restore children solidity
+    //
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
         if (sub && !sub->IsSubclassOfWeapon()) {
-            sub->setSolidType(SOLID_BBOX);
+            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 48046321..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.
 
@@ -46,12 +46,19 @@ protected:
     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();
 
     virtual void NotSolid(void);
     virtual void Solid(void);
-    void         Archive(Archiver        &arc) override;
+    void         Archive(Archiver& arc) override;
 };
 
 inline void cVehicleSlot::Archive(Archiver& arc)
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 a215a628..bcc17fba 100644
--- a/code/fgame/VehicleTank.cpp
+++ b/code/fgame/VehicleTank.cpp
@@ -334,7 +334,10 @@ void VehicleTank::Postthink()
             //  the tank was non-solid with a player driver,
             //  instead of the driver being non-solid.
             //setSolidType(SOLID_NOT);
-            driver.ent->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);
@@ -503,7 +506,7 @@ void VehicleTank::UpdateSound()
 //  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 overriden instead
+//  So the other native method is overridden instead
 /*
 void VehicleTank::AttachDriverSlot(Event *ev)
 {
diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 6a5ca672..5045e93e 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -261,6 +261,8 @@ Event EV_Actor_AnimScript_Noclip
     "Play the noclip animation script",
     EV_NORMAL
 );
+// Added in 2.0
+//====
 Event EV_Actor_AnimScript_Attached
 (
     "animscript_attached",
@@ -270,6 +272,7 @@ Event EV_Actor_AnimScript_Attached
     "Play a noclip animation even when attached",
     EV_NORMAL
 );
+//====
 Event EV_Actor_Reload_mg42
 (
     "reload_mg42",
@@ -429,7 +432,7 @@ Event EV_Actor_SetAnimFinal
     EV_DEFAULT,
     NULL,
     NULL,
-    "Whether the animation was succesfully finished",
+    "Whether the animation was successfully finished",
     EV_SETTER
 );
 Event EV_Actor_GetWeaponType
@@ -555,7 +558,7 @@ Event EV_Actor_DamagePuff
     EV_DEFAULT,
     "vv",
     "position direction",
-    "Spawns a puff of 'blood' smoke at the speficied location in the specified direction.",
+    "Spawns a puff of 'blood' smoke at the specified location in the specified direction.",
     EV_NORMAL
 );
 Event EV_Actor_SetAngleYawSpeed
@@ -918,6 +921,8 @@ Event EV_Actor_GetAlarmNode
     "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",
@@ -936,6 +941,7 @@ Event EV_Actor_SetPreAlarmThread2
     "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",
@@ -2181,6 +2187,9 @@ Event EV_Actor_GetBalconyHeight
     "minimum height a balcony guy must fall to do special balcony death",
     EV_GETTER
 );
+//
+// Added in 2.0
+//====
 Event EV_Actor_SetVisibilityThreshold
 (
     "nonvislevel",
@@ -2325,6 +2334,10 @@ Event EV_Actor_GetRunAnimRate
     "Get the rate at which the run animation plays back",
     EV_GETTER
 );
+//====
+//
+// Added in 2.30
+//====
 Event EV_Actor_SetNationality
 (
     "nationality",
@@ -2379,6 +2392,7 @@ Event EV_Actor_CuriousOn
     "Turn on an actor's curious state",
     EV_NORMAL
 );
+//====
 
 CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Entity_Start,                        &Actor::EventStart                        },
@@ -2399,7 +2413,10 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&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                         },
@@ -2510,8 +2527,11 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&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               },
@@ -2538,6 +2558,8 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&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       },
@@ -2545,6 +2567,7 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&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              },
@@ -2598,12 +2621,14 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_GetMumble,                     &Actor::EventGetMumble                    },
     {&EV_Actor_SetMumble,                     &Actor::EventSetMumble                    },
     {&EV_Actor_SetMumble2,                    &Actor::EventSetMumble                    },
- // FIXME: removed since 2.0?
-  //{&EV_Actor_GetBreathSteam,                &Actor::EventGetBreathSteam                     },
-  //{&EV_Actor_SetBreathSteam,                &Actor::EventSetBreathSteam                     },
-  //{&EV_Actor_SetBreathSteam2,               &Actor::EventSetBreathSteam                     },
+    // 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::EventCalcGrenadeToss              },
+    {&EV_Actor_CalcGrenadeToss2,              &Actor::EventCalcGrenadeToss2             },
     {&EV_Actor_GetNoSurprise,                 &Actor::EventGetNoSurprise                },
     {&EV_Actor_SetNoSurprise,                 &Actor::EventSetNoSurprise                },
     {&EV_Actor_SetNoSurprise2,                &Actor::EventSetNoSurprise                },
@@ -2630,6 +2655,12 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&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            },
@@ -2639,6 +2670,9 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&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                    },
@@ -2646,6 +2680,7 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_WriteStats,                    &Actor::EventWriteStats                   },
     {&EV_Actor_CuriousOff,                    &Actor::EventCuriousOff                   },
     {&EV_Actor_CuriousOn,                     &Actor::EventCuriousOn                    },
+    //====
     {NULL,                                    NULL                                      }
 };
 
@@ -2685,7 +2720,12 @@ const_str            Actor::m_csThinkNames[NUM_THINKS] = {
     STRING_BALCONY_KILLED,
     STRING_WEAPONLESS,
     STRING_NOCLIP,
-    STRING_DEAD};
+    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,
@@ -2695,7 +2735,9 @@ const_str Actor::m_csThinkStateNames[NUM_THINKSTATES] = {
     STRING_CURIOUS,
     STRING_DISGUISE,
     STRING_GRENADE,
-    STRING_NOCLIP};
+    STRING_BADPLACE, // Added in 2.0
+    STRING_NOCLIP
+};
 
 SafePtr<Actor> Actor::mBodyQueue[MAX_BODYQUEUE];
 int            Actor::mCurBody;
@@ -2790,9 +2832,9 @@ Actor::Actor()
     m_fMinDistance        = 128;
     m_fMinDistanceSquared = Square(m_fMinDistance);
     m_fMaxDistance        = 1024;
-    m_fMaxDistanceSquared = Square(m_fMaxDistanceSquared);
+    m_fMaxDistanceSquared = Square(m_fMaxDistance);
     m_fLeash              = 512;
-    m_fLeashSquared       = Square(m_fLeashSquared);
+    m_fLeashSquared       = Square(m_fLeash);
 
     m_iEyeUpdateTime = level.inttime;
     if (m_iEyeUpdateTime < 1000) {
@@ -2848,7 +2890,7 @@ Actor::Actor()
 
     m_iNextDisguiseTime       = 1;
     m_iDisguisePeriod         = 30000;
-    m_fMaxDisguiseDistSquared = 256 * 256;
+    m_fMaxDisguiseDistSquared = Square(256);
     m_iDisguiseLevel          = 1;
 
     m_patrolCurrentNode   = NULL;
@@ -2945,6 +2987,13 @@ Actor::Actor()
     }
 
     mVoiceType = -1;
+
+    //
+    // Added in OPM
+    //  The variable isn't set in original
+    //
+    m_bSilent = false;
+    m_bMumble = true;
 }
 
 /*
@@ -2969,7 +3018,6 @@ Actor::~Actor()
 /*
 ===============
 Actor::setContentsSolid
-
 ===============
 */
 void Actor::setContentsSolid(void)
@@ -2977,6 +3025,11 @@ void Actor::setContentsSolid(void)
     setContents(CONTENTS_NOBOTCLIP);
 }
 
+/*
+===============
+Actor::EndStates
+===============
+*/
 void Actor::EndStates(void)
 {
     for (int i = 0; i < NUM_THINKLEVELS; i++) {
@@ -2984,6 +3037,11 @@ void Actor::EndStates(void)
     }
 }
 
+/*
+===============
+Actor::ClearStates
+===============
+*/
 void Actor::ClearStates(void)
 {
     for (int i = 0; i < NUM_THINKSTATES; i++) {
@@ -2991,6 +3049,11 @@ void Actor::ClearStates(void)
     }
 }
 
+/*
+===============
+Actor::ResolveVoiceType
+===============
+*/
 void Actor::ResolveVoiceType(void)
 {
     char validVoice[128];
@@ -3063,6 +3126,11 @@ void Actor::EventStart(Event *ev)
     }
 }
 
+/*
+===============
+Actor::ClearEnemies
+===============
+*/
 void Actor::ClearEnemies(void)
 {
     m_PotentialEnemies.RemoveAll();
@@ -3145,7 +3213,7 @@ void Actor::GetMoveInfo(mmove_t *mm)
                 m_Dest - Vector(0, 0, 16384),
                 (Entity *)NULL,
                 MASK_MOVEINFO,
-                qfalse,
+                false,
                 "Actor::GetMoveInfo"
             );
 
@@ -3213,7 +3281,7 @@ void Actor::GetMoveInfo(mmove_t *mm)
 
                 DoFailSafeMove(node->point);
             }
-        } else if (DotProduct(mm->velocity, velocity) < -0.7f && level.inttime >= m_Path.Time() + 1000) {
+        } else if (DotProduct2D(mm->velocity, velocity) < -0.7f && level.inttime >= m_Path.Time() + 1000) {
             m_Path.ReFindPath(origin, this);
         }
         break;
@@ -3561,6 +3629,11 @@ void Actor::UpdateBoneControllers(void)
     SetControllerAngles(ARMS_TAG, new_angles);
 }
 
+/*
+===============
+Actor::setOriginEvent
+===============
+*/
 void Actor::setOriginEvent(Vector org)
 {
     float dist;
@@ -3618,7 +3691,10 @@ void Actor::SafeSetOrigin(vec3_t newOrigin)
     if (!m_bNoPlayerCollision) {
         Player *p = (Player *)G_GetEntity(0);
 
-        if (p && IsTouching(p)) {
+        // 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);
@@ -3667,13 +3743,15 @@ void Actor::DoMove(void)
         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, qtrue, "Actor"
+            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;
@@ -3879,6 +3957,8 @@ bool Actor::CanShoot(Entity *ent)
     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);
@@ -3895,7 +3975,7 @@ bool Actor::CanShoot(Entity *ent)
                     this,
                     sen,
                     MASK_CANSEE,
-                    qfalse,
+                    false,
                     "Actor::CanShoot centroid"
                 )) {
                 bCanShoot = true;
@@ -3907,7 +3987,7 @@ bool Actor::CanShoot(Entity *ent)
                            this,
                            sen,
                            MASK_CANSEE,
-                           qfalse,
+                           false,
                            "Actor::CanShoot eyes"
                        )) {
                 bCanShoot = true;
@@ -3948,7 +4028,7 @@ bool Actor::CanSeeFrom(vec3_t pos, Entity *ent)
         return false;
     }
 
-    return G_SightTrace(pos, vec_zero, vec_zero, ent->centroid, this, ent, MASK_CANSEE, qfalse, "Actor::CanSeeFrom");
+    return G_SightTrace(pos, vec_zero, vec_zero, ent->centroid, this, ent, MASK_CANSEE, false, "Actor::CanSeeFrom");
 }
 
 /*
@@ -4003,11 +4083,20 @@ bool Actor::CanShootEnemy(int iMaxDirtyTime)
     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);
 
@@ -4021,7 +4110,7 @@ bool Actor::FriendlyInLineOfFire(Entity *other)
             Vector org;
 
             org = squadDot * inverseDot * delta - squadDelta;
-            if (org * org >= 4096) {
+            if (org * org >= Square(64)) {
                 return true;
             }
         }
@@ -4030,6 +4119,11 @@ bool Actor::FriendlyInLineOfFire(Entity *other)
     return false;
 }
 
+/*
+===============
+Actor::VirtualEyePosition
+===============
+*/
 Vector Actor::VirtualEyePosition()
 {
     if (m_pTurret && CurrentThink() == THINK_MACHINEGUNNER) {
@@ -4075,7 +4169,7 @@ void Actor::ShowInfo(void)
 {
     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("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);
@@ -4207,22 +4301,32 @@ void Actor::ShowInfo(float fDot, float fDist)
 
         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(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, qtrue);
+        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, qtrue);
+        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, qtrue);
-        G_DebugCircle(centroid, m_fSight, 0.0, 0.0, 1.0, 1.0, qtrue);
+        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]);
@@ -4954,7 +5058,7 @@ void Actor::HandlePain(Event *ev)
         //FIXME: macro
         SetCuriousAnimHint(7);
 
-        // m_bIsCurious check: Added in 2.30
+        // 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";
@@ -5291,7 +5395,8 @@ void Actor::MovePath(float fMoveSpeed)
         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) {
+            } 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;
             }
@@ -5339,7 +5444,7 @@ void Actor::MovePath(float fMoveSpeed)
         VectorCopy(m_groundPlaneNormal, mm.groundPlaneNormal);
         VectorCopy2D(mm.obstacle_normal, m_PrevObstacleNormal);
 
-        if (m_WallDir == -1) {
+        if (m_WallDir == (char)-1) {
             mm.desired_dir[0] = -mm.obstacle_normal[1];
             mm.desired_dir[1] = mm.obstacle_normal[0];
         } else {
@@ -5400,8 +5505,6 @@ void Actor::MovePath(float fMoveSpeed)
             } else {
                 m_iWallDodgeTimeout = level.inttime + 1000;
             }
-
-            GetMoveInfo(&mm);
         } else {
             if (m_WallDir >= 0) {
                 mm.desired_dir[0] = mm.obstacle_normal[1];
@@ -5418,6 +5521,8 @@ void Actor::MovePath(float fMoveSpeed)
                 m_iWallDodgeTimeout = 0;
             }
         }
+
+        GetMoveInfo(&mm);
     }
 }
 
@@ -5458,7 +5563,7 @@ void Actor::MovePathGoal(float fMoveSpeed)
                 m_eAnimMode = ANIM_MODE_NORMAL;
             }
         }
-    } else if (fDeltaSquareLen < Square(fMoveSpeed * 0.5f)) {
+    } else if (fDeltaSquareLen < Square(fMoveSpeed * 0.5 * 0.5)) {
         fTimeToGo       = 0.5f;
         m_fPathGoalTime = level.time + fTimeToGo;
         if (m_csPathGoalEndAnimScript == STRING_EMPTY) {
@@ -5543,13 +5648,20 @@ void Actor::EventSetMood(Event *ev)
 ===============
 Actor::EventDamagePuff
 
-Spawns a puff of 'blood' smoke at the speficied location in the specified direction.
+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);
 
@@ -5559,7 +5671,7 @@ void Actor::EventDamagePuff(Event *ev)
     gi.MSG_WriteCoord(pos.z);
 
     gi.MSG_WriteDir(dir);
-    gi.MSG_WriteBits(0, 1);
+    gi.MSG_WriteBits(0, bulletbits);
     gi.MSG_EndCGM();
 }
 
@@ -5946,7 +6058,7 @@ bool Actor::MoveOnPathWithSquad(void)
         }
 
         if (DotProduct2D(pvMyDir, pvHisDir) >= 0
-            && (entnum == pActorSquadMate->entnum || DotProduct2D(pvHisDir, vDelta) >= 0)) {
+            && (entnum >= pActorSquadMate->entnum || DotProduct2D(pvHisDir, vDelta) >= 0)) {
             m_iSquadStandTime = level.inttime;
             return false;
         }
@@ -6103,7 +6215,7 @@ bool Actor::MoveToPatrolCurrentNode(void)
             IdleLook();
             Anim_Idle();
             // tell scripts the move has failed
-            parm.movefail = qtrue;
+            parm.movefail = true;
             return false;
         }
 
@@ -6165,6 +6277,11 @@ void Actor::EventGetAccuracy(Event *ev)
     ev->AddFloat(mAccuracy * 100.f);
 }
 
+/*
+===============
+Actor::EventSetMinDistance
+===============
+*/
 void Actor::EventSetMinDistance(Event *ev)
 {
     m_fMinDistance = ev->GetFloat(1);
@@ -6182,11 +6299,21 @@ void Actor::EventSetMinDistance(Event *ev)
     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);
@@ -6205,32 +6332,62 @@ void Actor::EventSetMaxDistance(Event *ev)
     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) {
@@ -6304,7 +6461,9 @@ void Actor::Init(void)
     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);
@@ -6392,7 +6551,7 @@ void Actor::UpdateEnemyInternal(void)
 
     m_PotentialEnemies.CheckEnemies(this);
 
-    if (m_Enemy != m_PotentialEnemies.GetCurrentEnemy() && (m_bEnemySwitch || m_Enemy)) {
+    if (m_Enemy != m_PotentialEnemies.GetCurrentEnemy() && (m_bEnemySwitch || !m_Enemy)) {
         SetEnemy(m_PotentialEnemies.GetCurrentEnemy(), false);
     }
 
@@ -6446,15 +6605,7 @@ void Actor::DetectSmokeGrenades(void)
 
     if (fDistSquared > Square(256) || InFOV(sprite->origin)) {
         if (G_SightTrace(
-                eyePos,
-                vec_zero,
-                vec_zero,
-                sprite->origin,
-                this,
-                NULL,
-                MASK_CANSEE,
-                qfalse,
-                "Actor::DetectSmokeGrenades"
+                eyePos, vec_zero, vec_zero, sprite->origin, this, NULL, MASK_CANSEE, false, "Actor::DetectSmokeGrenades"
             )) {
             m_PotentialEnemies.ConfirmEnemy(this, sprite->owner);
         }
@@ -6546,12 +6697,12 @@ void Actor::EventSetAnim(Event *ev)
     int       slot   = 0;
     int       anim;
     const_str flagVal;
-    qboolean  flagged = qfalse;
+    qboolean  flagged = false;
 
     switch (ev->NumArgs()) {
     case 4:
         flagVal = ev->GetConstString(4);
-        flagged = qtrue;
+        flagged = true;
         if (flagVal != STRING_FLAGGED) {
             ScriptError("unknown keyword '%s', expected 'flagged'", Director.GetString(flagVal).c_str());
         }
@@ -6582,11 +6733,11 @@ void Actor::EventSetAnim(Event *ev)
     }
 
     if (!slot) {
-        flagged = qtrue;
+        flagged = true;
     }
 
     if (flagged) {
-        parm.motionfail = qtrue;
+        parm.motionfail = true;
     }
 
     if (!m_bLevelMotionAnim) {
@@ -6600,7 +6751,7 @@ void Actor::EventSetAnim(Event *ev)
         StartMotionAnimSlot(slot, anim, weight);
         if (flagged) {
             m_iMotionSlot   = GetMotionSlot(slot);
-            parm.motionfail = qfalse;
+            parm.motionfail = false;
         }
     }
 }
@@ -6614,10 +6765,10 @@ End action animation.
 */
 void Actor::EventEndActionAnim(Event *ev)
 {
-    parm.upperfail = qtrue;
+    parm.upperfail = true;
     if (!m_bLevelActionAnim) {
         ChangeActionAnim();
-        parm.upperfail = qfalse;
+        parm.upperfail = false;
     }
 }
 
@@ -6644,7 +6795,7 @@ void Actor::EventSetMotionAnim(Event *ev)
         UnknownAnim(Director.GetString(name), edict->tiki);
     }
 
-    parm.motionfail = qtrue;
+    parm.motionfail = true;
 
     if (!m_bLevelMotionAnim) {
         ChangeMotionAnim();
@@ -6655,7 +6806,7 @@ void Actor::EventSetMotionAnim(Event *ev)
         // set the slot
         m_iMotionSlot = GetMotionSlot(0);
 
-        parm.motionfail = qfalse;
+        parm.motionfail = false;
     }
 }
 
@@ -6693,7 +6844,7 @@ void Actor::EventSetAimMotionAnim(Event *ev)
         UnknownAnim(Director.GetString(name), edict->tiki);
     }
 
-    parm.motionfail = qtrue;
+    parm.motionfail = true;
 
     if (!m_bLevelMotionAnim) {
         ChangeMotionAnim();
@@ -6706,7 +6857,7 @@ void Actor::EventSetAimMotionAnim(Event *ev)
         StartAimMotionAnimSlot(2, anim_high);
 
         m_iMotionSlot   = GetMotionSlot(1);
-        parm.motionfail = qfalse;
+        parm.motionfail = false;
     }
 }
 
@@ -6757,7 +6908,7 @@ void Actor::EventSetActionAnim(Event *ev)
         UnknownAnim(derivedName, edict->tiki);
     }
 
-    parm.upperfail = qtrue;
+    parm.upperfail = true;
     if (!m_bLevelActionAnim) {
         ChangeActionAnim();
         m_bAimAnimSet    = true;
@@ -6768,7 +6919,7 @@ void Actor::EventSetActionAnim(Event *ev)
         StartAimAnimSlot(1, anim_forward);
         StartAimAnimSlot(2, anim_down);
         m_iActionSlot  = GetActionSlot(0);
-        parm.upperfail = qfalse;
+        parm.upperfail = false;
     }
 }
 
@@ -6823,13 +6974,16 @@ void Actor::EventSetUpperAnim(Event *ev)
         UnknownAnim(Director.GetString(name), edict->tiki);
     }
 
-    parm.upperfail = qtrue;
+    parm.upperfail = true;
+
     if (!m_bLevelActionAnim) {
         ChangeActionAnim();
         m_bActionAnimSet = true;
+
         StartActionAnimSlot(anim);
-        m_iActionSlot  = SimpleActor::GetActionSlot(0);
-        parm.upperfail = qfalse;
+        m_iActionSlot = GetActionSlot(0);
+
+        parm.upperfail = false;
     }
 }
 
@@ -6857,7 +7011,7 @@ bool Actor::SoundSayAnim(const_str name, byte bLevelSayAnim)
         edict->tiki->a->name
     );
 
-    Sound(Director.GetString(name), 0, 0, 0, NULL, 0, 1, 1, -1);
+    Sound(Director.GetString(name), CHAN_AUTO, 0, 0, NULL, 0, 0, 1, 1, -1);
 
     return true;
 }
@@ -6941,7 +7095,7 @@ void Actor::EventSetSayAnim(Event *ev)
     }
 
     name         = ev->GetConstString(1);
-    parm.sayfail = qtrue;
+    parm.sayfail = true;
     anim         = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
 
     if (anim == -1) {
@@ -6997,7 +7151,7 @@ void Actor::EventSetSayAnim(Event *ev)
         m_iSaySlot = GetSaySlot();
     }
 
-    parm.sayfail = qfalse;
+    parm.sayfail = false;
 }
 
 /*
@@ -7163,6 +7317,8 @@ void Actor::UpdateUpperAnim(void)
         if (!m_bActionAnimSet) {
             Unregister(STRING_UPPERANIMDONE);
         }
+
+        return;
     }
 
     gi.Anim_FlagsSkel(edict->tiki, anim);
@@ -7346,6 +7502,16 @@ void Actor::Think(void)
     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;
@@ -7539,10 +7705,7 @@ void Actor::SetThinkState(eThinkState state, eThinkLevel level)
         m_csIdleMood = STRING_NERVOUS;
         map          = m_ThinkMap[THINKSTATE_ATTACK];
 
-        if (map != THINK_ALARM
-            && map != THINK_WEAPONLESS
-            && map != THINK_DOG_ATTACK
-            && !GetWeapon(WEAPON_MAIN)) {
+        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",
@@ -7588,6 +7751,11 @@ void Actor::ClearThinkStates(void)
     }
 }
 
+/*
+===============
+Actor::EventSetAlarmNode
+===============
+*/
 void Actor::EventSetAlarmNode(Event *ev)
 {
     Listener *l = ev->GetListener(1);
@@ -7598,11 +7766,21 @@ void Actor::EventSetAlarmNode(Event *ev)
     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()) {
@@ -7612,6 +7790,11 @@ void Actor::EventSetPreAlarmThread(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventSetAlarmThread
+===============
+*/
 void Actor::EventSetAlarmThread(Event *ev)
 {
     if (ev->IsFromScript()) {
@@ -7621,31 +7804,61 @@ void Actor::EventSetAlarmThread(Event *ev)
     }
 }
 
+/*
+===============
+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);
@@ -7662,11 +7875,21 @@ void Actor::EventSetTypeIdle(Event *ev)
     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);
@@ -7683,11 +7906,21 @@ void Actor::EventSetTypeAttack(Event *ev)
     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);
@@ -7704,6 +7937,11 @@ void Actor::EventSetTypeDisguise(Event *ev)
     SetThink(THINKSTATE_DISGUISE, think);
 }
 
+/*
+===============
+Actor::EventSetDisguiseAcceptThread
+===============
+*/
 void Actor::EventSetDisguiseAcceptThread(Event *ev)
 {
     if (ev->IsFromScript()) {
@@ -7713,16 +7951,31 @@ void Actor::EventSetDisguiseAcceptThread(Event *ev)
     }
 }
 
+/*
+===============
+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);
@@ -7733,11 +7986,21 @@ void Actor::EventSetDisguiseLevel(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetDisguiseLevel
+===============
+*/
 void Actor::EventGetDisguiseLevel(Event *ev)
 {
     ev->AddInteger(m_iDisguiseLevel);
 }
 
+/*
+===============
+Actor::EventSetTypeGrenade
+===============
+*/
 void Actor::EventSetTypeGrenade(Event *ev)
 {
     bool (*AllowedState)(int state);
@@ -7754,6 +8017,11 @@ void Actor::EventSetTypeGrenade(Event *ev)
     SetThink(THINKSTATE_GRENADE, think);
 }
 
+/*
+===============
+Actor::EventGetTypeGrenade
+===============
+*/
 void Actor::EventGetTypeGrenade(Event *ev)
 {
     ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_GRENADE]]);
@@ -7870,8 +8138,8 @@ void Actor::EndState(int level)
 {
     GlobalFuncs_t *think;
 
-    think                 = &GlobalFuncs[m_Think[level]];
-    m_Think[level]        = THINK_VOID;
+    think          = &GlobalFuncs[m_Think[level]];
+    m_Think[level] = THINK_VOID;
 
     if (think->EndState) {
         (this->*think->EndState)();
@@ -7999,8 +8267,8 @@ void Actor::FixAIParameters(void)
     if (m_pTetherEnt) {
         fMinLeash = 64;
         if (m_pTetherEnt->IsSubclassOfEntity()) {
-            fMinLeash =
-                m_pTetherEnt->angles.y - m_pTetherEnt->origin.y + m_pTetherEnt->angles.z + m_pTetherEnt->origin.z;
+            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) {
@@ -8122,7 +8390,7 @@ bool Actor::AttackEntryAnimation(void)
                 m_bNewEnemy   = true;
                 return true;
             }
-        } else if (fDistSquared > Square(1024)) {
+        } else if (fDistSquared > Square(1024) && (rand() % 4) == 0) {
             Sentient *pSquadMate;
 
             for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
@@ -8332,7 +8600,7 @@ bool Actor::PassesTransitionConditions_Disguise(void)
         this,
         player,
         MASK_TRANSITION,
-        qfalse,
+        false,
         "Actor::PassesTransitionConditions_Disguise"
     );
 }
@@ -8389,11 +8657,21 @@ bool Actor::PassesTransitionConditions_Idle(void)
     return false;
 }
 
+/*
+===============
+Actor::EventGetRunAnim
+===============
+*/
 void Actor::EventGetRunAnim(Event *ev)
 {
     ev->AddConstString(GetRunAnim());
 }
 
+/*
+===============
+Actor::EventGetWalkAnim
+===============
+*/
 void Actor::EventGetWalkAnim(Event *ev)
 {
     ev->AddConstString(GetWalkAnim());
@@ -8424,7 +8702,7 @@ void Actor::FaceEnemyOrMotion(int iTimeIntoMove)
 {
     vec2_t vDelta;
 
-    VectorCopy2D(origin, vDelta);
+    VectorSub2D(origin, m_vLastEnemyPos, vDelta);
 
     if (iTimeIntoMove <= 999) {
         m_bFaceEnemy = true;
@@ -8447,11 +8725,14 @@ void Actor::FaceEnemyOrMotion(int iTimeIntoMove)
         return;
     }
 
-    if (vDelta[0] >= 15 || vDelta[0] <= -15 || vDelta[1] >= 15 || vDelta[1] <= -15) {
-        vDelta[0] = -vDelta[0];
-        vDelta[1] = -vDelta[1];
-        FaceDirectionDuringMotion(vDelta);
+    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);
 }
 
 /*
@@ -8499,32 +8780,62 @@ void Actor::FaceDirectionDuringMotion(vec3_t vLook)
     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);
@@ -8546,10 +8857,12 @@ void Actor::FaceMotion(void)
         VectorCopy2D(velocity, dir);
         VectorSub2D(origin, m_vOriginHistory[m_iCurrentHistory], vDelta);
 
-        if (VectorLength2DSquared(vDelta) >= 1 && DotProduct2D(velocity, vDelta) > 0) {
+        if (VectorLength2DSquared(vDelta) >= 1 && DotProduct2D(vDelta, dir) > 0) {
             VectorCopy2D(vDelta, dir);
         }
 
+        dir[2] = 0;
+
         if (m_ThinkState == THINKSTATE_IDLE) {
             IdleLook(dir);
         } else {
@@ -8564,12 +8877,22 @@ void Actor::FaceMotion(void)
     }
 }
 
+/*
+===============
+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)) {
@@ -8831,7 +9154,7 @@ void Actor::CuriousSound(int iType, vec3_t sound_origin, float fDistSquared, flo
         }
     }
 
-    if ((fRangeFactor * m_fSoundAwareness) < (rand() / 21474836.0)) {
+    if ((fRangeFactor * m_fSoundAwareness) < random()) {
         return;
     }
 
@@ -8911,15 +9234,14 @@ void Actor::WeaponSound(int iType, vec3_t sound_origin, float fDistSquared, floa
         pEnemy = pOwner->m_Enemy;
     }
 
-    if (pOwner->m_Team == m_Team && !pEnemy && pOwner->IsSubclassOfActor()
-        && originator->IsSubclassOfWeapon()) {
+    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) {
+                if (pTarget->m_Team == m_Team) {
                     pEnemy = pTarget;
                 }
             } else if (!m_Team) {
@@ -9135,7 +9457,7 @@ void Actor::NotifySquadmateKilled(Sentient *pSquadMate, Sentient *pAttacker)
             this,
             pSquadMate,
             MASK_AI_CANSEE,
-            qfalse,
+            false,
             "Actor::NotifySquadmateKilled"
         );
     }
@@ -9318,7 +9640,7 @@ bool Actor::ValidGrenadePath(const Vector& vFrom, const Vector& vTo, Vector& vVe
         G_DebugLine(vFrom, vPoint1, 1.0, 0.5, 0.5, 1.0);
     }
 
-    if (!G_SightTrace(vFrom, mins, maxs, vPoint1, this, NULL, MASK_GRENADEPATH, qfalse, "Actor::ValidGrenadePath 1")) {
+    if (!G_SightTrace(vFrom, mins, maxs, vPoint1, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 1")) {
         return false;
     }
 
@@ -9331,9 +9653,7 @@ bool Actor::ValidGrenadePath(const Vector& vFrom, const Vector& vTo, Vector& vVe
         G_DebugLine(vPoint1, vPoint2, 1.0, 0.5, 0.5, 1.0);
     }
 
-    if (!G_SightTrace(
-            vPoint1, mins, maxs, vPoint2, this, NULL, MASK_GRENADEPATH, qfalse, "Actor::ValidGrenadePath 2"
-        )) {
+    if (!G_SightTrace(vPoint1, mins, maxs, vPoint2, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 2")) {
         return false;
     }
 
@@ -9353,16 +9673,14 @@ bool Actor::ValidGrenadePath(const Vector& vFrom, const Vector& vTo, Vector& vVe
     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, qfalse, "Actor::ValidGrenadePath 3"
-        )) {
+    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, qfalse, "Actor::ValidGrenadePath 4");
+    trace = G_Trace(vPoint3, mins, maxs, vTo, this, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 4");
     if (!trace.allsolid) {
         if (!trace.ent) {
             return true;
@@ -9395,7 +9713,7 @@ Vector Actor::CalcThrowVelocity(const Vector& vFrom, const Vector& vTo)
 
     vDelta           = vTo - vFrom;
     fHorzDistSquared = vDelta.lengthXYSquared();
-    fDistance        = sqrt(fHorzDistSquared + vDelta.z * vDelta.z);
+    fDistance        = sqrt(fHorzDistSquared + Square(vDelta.z));
 
     // original irl equation: v10 = sqrt(fGravity * 0.5 * fHorzDistSquared / (fDistance * trigMult ))
     // trigMult = (cos(th)/ tan(al) - sin(th)/tanSquared(al))
@@ -9823,7 +10141,7 @@ void Actor::GenericGrenadeTossThink(void)
     eGrenadeTossMode eGrenadeMode;
 
     if (m_Enemy && level.inttime >= m_iStateTime + 200) {
-        if (CanGetGrenadeFromAToB(origin, m_Enemy->velocity - m_Enemy->origin, false, &vGrenadeVel, &eGrenadeMode)) {
+        if (CanGetGrenadeFromAToB(origin, m_Enemy->origin + m_Enemy->velocity, false, &vGrenadeVel, &eGrenadeMode)) {
             m_vGrenadeVel  = vGrenadeVel;
             m_eGrenadeMode = eGrenadeMode;
         }
@@ -9900,6 +10218,11 @@ void Actor::Grenade_EventFire(Event *ev)
     UseAmmo("grenade", 1);
 }
 
+/*
+===============
+Actor::EventSetTurret
+===============
+*/
 void Actor::EventSetTurret(Event *ev)
 {
     Listener *l = ev->GetListener(1);
@@ -9908,26 +10231,51 @@ void Actor::EventSetTurret(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetTurret
+===============
+*/
 void Actor::EventGetTurret(Event *ev)
 {
     ev->AddListener(m_pTurret);
 }
 
+/*
+===============
+Actor::EventGetAmmoGrenade
+===============
+*/
 void Actor::EventGetAmmoGrenade(Event *ev)
 {
     ev->AddInteger(AmmoCount("grenade"));
 }
 
+/*
+===============
+Actor::EventSetAmmoGrenade
+===============
+*/
 void Actor::EventSetAmmoGrenade(Event *ev)
 {
     GiveAmmo("grenade", ev->GetInteger(1));
 }
 
+/*
+===============
+Actor::EventEnableEnemy
+===============
+*/
 void Actor::EventEnableEnemy(Event *ev)
 {
     m_bDesiredEnableEnemy = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventEnablePain
+===============
+*/
 void Actor::EventEnablePain(Event *ev)
 {
     m_bEnablePain = ev->GetBoolean(1);
@@ -9936,12 +10284,22 @@ void Actor::EventEnablePain(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventActivate
+===============
+*/
 void Actor::EventActivate(Event *ev)
 {
     m_bPatrolWaitTrigger = false;
     Unregister(STRING_TRIGGER);
 }
 
+/*
+===============
+Actor::EventInterruptPoint
+===============
+*/
 void Actor::EventInterruptPoint(Event *ev)
 {
     GlobalFuncs_t *interrupt = &GlobalFuncs[m_Think[m_ThinkLevel]];
@@ -9951,11 +10309,21 @@ void Actor::EventInterruptPoint(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetVisibilityThreshold
+===============
+*/
 void Actor::EventGetVisibilityThreshold(Event *ev)
 {
     ev->AddFloat(m_fVisibilityThreshold);
 }
 
+/*
+===============
+Actor::EventSetVisibilityThreshold
+===============
+*/
 void Actor::EventSetVisibilityThreshold(Event *ev)
 {
     float threshold;
@@ -9970,6 +10338,11 @@ void Actor::EventSetVisibilityThreshold(Event *ev)
     m_fVisibilityThreshold    = threshold;
 }
 
+/*
+===============
+Actor::EventSetDefaultVisibilityThreshold
+===============
+*/
 void Actor::EventSetDefaultVisibilityThreshold(Event *ev)
 {
     float threshold;
@@ -9985,11 +10358,21 @@ void Actor::EventSetDefaultVisibilityThreshold(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetSuppressChance
+===============
+*/
 void Actor::EventGetSuppressChance(Event *ev)
 {
     ev->AddInteger(m_iSuppressChance);
 }
 
+/*
+===============
+Actor::EventSetSuppressChance
+===============
+*/
 void Actor::EventSetSuppressChance(Event *ev)
 {
     m_iSuppressChance = ev->GetInteger(1);
@@ -10018,6 +10401,11 @@ void Actor::EventSetSuppressChance(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventAnimScript
+===============
+*/
 void Actor::EventAnimScript(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10027,6 +10415,11 @@ void Actor::EventAnimScript(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventAnimScript_Scripted
+===============
+*/
 void Actor::EventAnimScript_Scripted(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10036,6 +10429,11 @@ void Actor::EventAnimScript_Scripted(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventAnimScript_Noclip
+===============
+*/
 void Actor::EventAnimScript_Noclip(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10045,6 +10443,11 @@ void Actor::EventAnimScript_Noclip(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventAnimScript_Attached
+===============
+*/
 void Actor::EventAnimScript_Attached(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10054,6 +10457,11 @@ void Actor::EventAnimScript_Attached(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventReload_mg42
+===============
+*/
 void Actor::EventReload_mg42(Event *ev)
 {
     if (m_State != ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
@@ -10066,6 +10474,11 @@ void Actor::EventReload_mg42(Event *ev)
     }
 }
 
+/*
+===============
+Actor::CanMovePathWithLeash
+===============
+*/
 bool Actor::CanMovePathWithLeash(void) const
 {
     vec2_t delta;
@@ -10075,17 +10488,18 @@ bool Actor::CanMovePathWithLeash(void) const
     }
 
     VectorSub2D(origin, m_vHome, delta);
-    if (VectorLength2DSquared(delta) >= m_fLeashSquared) {
-        return true;
-    }
-
-    if (DotProduct2D(m_Path.CurrentDelta(), delta) >= 0) {
+    if (VectorLength2DSquared(delta) >= m_fLeashSquared && DotProduct2D(m_Path.CurrentDelta(), delta) >= 0) {
         return false;
     }
 
     return true;
 }
 
+/*
+===============
+Actor::MovePathWithLeash
+===============
+*/
 bool Actor::MovePathWithLeash(void)
 {
     if (!CanMovePathWithLeash()) {
@@ -10099,6 +10513,11 @@ bool Actor::MovePathWithLeash(void)
     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);
@@ -10108,11 +10527,11 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     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 = qtrue;
+    static qboolean doInit = true;
     float           fAccuracy, fCoverFactor;
     Vector          aimDir;
 
-    fCoverFactor = mAccuracy * (1.0 - m_fVisibilityAlpha) * aiMinAccuracy->value + m_fVisibilityAlpha;
+    fCoverFactor = mAccuracy * ((1.0 - m_fVisibilityAlpha) * aiMinAccuracy->value + m_fVisibilityAlpha);
 
     if (doInit) {
         aiRanges[0] = gi.Cvar_Get("g_aishortrange", "500", 0);
@@ -10143,12 +10562,14 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     Vector dir = mTargetPos - EyePosition();
     dir.normalize();
 
-    if (DotProduct2D(forward, dir) < aiMaxDeviation->value) {
-        Vector vOut;
+    if (g_target_game > target_game_e::TG_MOH) {
+        if (DotProduct(forward, dir) < aiMaxDeviation->value) {
+            Vector vOut;
 
-        VectorMA(position, 2048, forward, vOut);
+            VectorMA(position, 2048, forward, vOut);
 
-        return vOut;
+            return vOut;
+        }
     }
 
     if (mTargetPos == vec_zero) {
@@ -10190,7 +10611,7 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
             vPos   = player->centroid;
 
             if (!G_SightTrace(
-                    GunPosition(), vec_zero, vec_zero, vPos, m_Enemy, this, MASK_CANSEE, qfalse, "Actor::GunTarget 1"
+                    GunPosition(), vec_zero, vec_zero, vPos, m_Enemy, this, MASK_CANSEE, false, "Actor::GunTarget 1"
                 )) {
                 fCoverFactor *= aifCoverFactor->value;
                 vPos = m_Enemy->EyePosition();
@@ -10228,6 +10649,11 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     return vPos + error;
 }
 
+/*
+===============
+Actor::setModel
+===============
+*/
 qboolean Actor::setModel(void)
 {
     str      name;
@@ -10263,28 +10689,53 @@ qboolean Actor::setModel(void)
     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;
@@ -10306,6 +10757,11 @@ void Actor::SetPathWithLeash(Vector vDestPos, const char *description, int iMaxD
     SetPath(vDestPos, description, iMaxDirtyTime, m_vHome, m_fLeashSquared);
 }
 
+/*
+===============
+Actor::SetPathWithLeash
+===============
+*/
 void Actor::SetPathWithLeash(SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime)
 {
     if (!pDestNode) {
@@ -10327,12 +10783,22 @@ void Actor::SetPathWithLeash(SimpleEntity *pDestNode, const char *description, i
     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;
@@ -10398,6 +10864,11 @@ Vector Actor::GetAntiBunchPoint(void)
     }
 }
 
+/*
+===============
+Actor::AutoArchiveModel
+===============
+*/
 bool Actor::AutoArchiveModel(void)
 {
     return false;
@@ -10442,21 +10913,41 @@ void Actor::ResetBodyQueue(void)
     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;
@@ -10470,21 +10961,41 @@ void Actor::EventSetMaxNoticeTimeScale(Event *ev)
     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]) {
@@ -10492,6 +11003,11 @@ void Actor::Holster(void)
     }
 }
 
+/*
+===============
+Actor::HolsterOffHand
+===============
+*/
 void Actor::HolsterOffHand(void)
 {
     if (activeWeaponList[WEAPON_OFFHAND]) {
@@ -10499,6 +11015,11 @@ void Actor::HolsterOffHand(void)
     }
 }
 
+/*
+===============
+Actor::Unholster
+===============
+*/
 void Actor::Unholster(void)
 {
     Weapon *weap;
@@ -10512,6 +11033,11 @@ void Actor::Unholster(void)
     }
 }
 
+/*
+===============
+Actor::UnholsterOffHand
+===============
+*/
 void Actor::UnholsterOffHand(void)
 {
     Weapon *weap;
@@ -10525,6 +11051,11 @@ void Actor::UnholsterOffHand(void)
     }
 }
 
+/*
+===============
+Actor::EventHolster
+===============
+*/
 void Actor::EventHolster(Event *ev)
 {
     if (ev->NumArgs() > 0 && ev->GetInteger(1) > 0) {
@@ -10534,6 +11065,11 @@ void Actor::EventHolster(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventUnholster
+===============
+*/
 void Actor::EventUnholster(Event *ev)
 {
     if (ev->NumArgs() > 0 && ev->GetInteger(1) > 0) {
@@ -10543,28 +11079,48 @@ void Actor::EventUnholster(Event *ev)
     }
 }
 
+/*
+===============
+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(1);
+    sfxName    = ev->GetString(2);
 
     if (gi.S_IsSoundPlaying(channelNum, sfxName)) {
         Event event(EV_SoundDone);
@@ -10581,15 +11137,25 @@ void Actor::EventSoundDone(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventSound
+===============
+*/
 void Actor::EventSound(Event *ev)
 {
     if (g_gametype->integer == GT_SINGLE_PLAYER || m_Team == TEAM_AMERICAN) {
-        ProcessSoundEvent(ev, qtrue);
+        ProcessSoundEvent(ev, true);
     } else {
-        ProcessSoundEvent(ev, qfalse);
+        ProcessSoundEvent(ev, false);
     }
 }
 
+/*
+===============
+Actor::EventSetFallHeight
+===============
+*/
 void Actor::EventSetFallHeight(Event *ev)
 {
     float fHeight = ev->GetFloat(1);
@@ -10604,11 +11170,21 @@ void Actor::EventSetFallHeight(Event *ev)
     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;
@@ -10681,6 +11257,11 @@ void Actor::EventCanMoveTo(Event *ev)
     ev->AddInteger(true);
 }
 
+/*
+===============
+Actor::EventMoveDir
+===============
+*/
 void Actor::EventMoveDir(Event *ev)
 {
     vec3_t vDir;
@@ -10704,6 +11285,11 @@ void Actor::EventMoveDir(Event *ev)
     ev->AddVector(vDir);
 }
 
+/*
+===============
+Actor::EventIntervalDir
+===============
+*/
 void Actor::EventIntervalDir(Event *ev)
 {
     if (level.inttime >= m_iIntervalDirTime + 250) {
@@ -10721,17 +11307,32 @@ void Actor::EventIntervalDir(Event *ev)
     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;
@@ -10761,6 +11362,11 @@ bool Actor::ShortenPathToAttack(float fMinDist)
     return false;
 }
 
+/*
+===============
+Actor::StrafeToAttack
+===============
+*/
 void Actor::StrafeToAttack(float fDist, vec3_t vDir)
 {
     static const vec3_t mins = {-16, -16, 16};
@@ -10778,7 +11384,7 @@ void Actor::StrafeToAttack(float fDist, vec3_t vDir)
         return;
     }
 
-    if (!G_SightTrace(origin, mins, maxs, vSpot, this, NULL, MASK_TARGETPATH, qtrue, "Actor::StrafeToAttack 1")) {
+    if (!G_SightTrace(origin, mins, maxs, vSpot, this, NULL, MASK_TARGETPATH, true, "Actor::StrafeToAttack 1")) {
         ClearPath();
         return;
     }
@@ -10794,7 +11400,7 @@ void Actor::StrafeToAttack(float fDist, vec3_t vDir)
             this,
             m_Enemy,
             MASK_CANSEE,
-            qfalse,
+            false,
             "Actor::StrafeToAttack 1"
         )) {
         ClearPath();
@@ -10804,28 +11410,53 @@ void Actor::StrafeToAttack(float fDist, vec3_t vDir)
     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.
@@ -10838,6 +11469,11 @@ void Actor::SetVoiceType(Event *ev)
     }
 }
 
+/*
+===============
+Actor::FindSniperNodeAndSetPath
+===============
+*/
 PathNode *Actor::FindSniperNodeAndSetPath(bool *pbTryAgain)
 {
     PathNode *pSniperNode;
@@ -10867,6 +11503,11 @@ PathNode *Actor::FindSniperNodeAndSetPath(bool *pbTryAgain)
     return pSniperNode;
 }
 
+/*
+===============
+Actor::Remove
+===============
+*/
 void Actor::Remove(Event *ev)
 {
     EndStates();
@@ -10880,21 +11521,41 @@ void Actor::Remove(Event *ev)
     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;
@@ -10924,15 +11585,9 @@ void Actor::DontFaceWall(void)
 
     VectorSub2D(m_vDfwPos, origin, vDelta);
 
-    if (Square(fErrorLerp * -14.0 + 16.0) > VectorLength2DSquared(vDelta)) {
-        if (AvoidingFacingWall()) {
-            SetDesiredYaw(m_fDfwDerivedYaw);
-        }
-        return;
-    }
-
-    if (fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0
-        && fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0) {
+    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);
         }
@@ -10952,12 +11607,12 @@ void Actor::DontFaceWall(void)
     start.y -= origin.y;
     fEyeRadius = VectorLength2D(start);
     start.x    = origin.x + fEyeRadius * fCosAngle;
-    start.y    = origin.x + fEyeRadius * fSinAngle;
+    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, qfalse, "Actor::DontFaceWall");
+    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;
@@ -10965,7 +11620,7 @@ void Actor::DontFaceWall(void)
         return;
     }
 
-    if (trace.entityNum != ENTITYNUM_WORLD && trace.ent->entity->AIDontFace()) {
+    if (trace.entityNum != ENTITYNUM_WORLD && !trace.ent->entity->AIDontFace()) {
         m_eDontFaceWallMode = 4;
         m_fDfwDerivedYaw    = m_fDfwRequestedYaw;
         return;
@@ -11001,51 +11656,101 @@ void Actor::DontFaceWall(void)
     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;
@@ -11063,6 +11768,11 @@ void Actor::InitVoid(GlobalFuncs_t *func)
     func->IsState = &Actor::IsVoidState;
 }
 
+/*
+===============
+Actor::BecomeCorpse
+===============
+*/
 void Actor::BecomeCorpse(void)
 {
     AddToBodyQue();
@@ -11085,16 +11795,31 @@ void Actor::BecomeCorpse(void)
     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) {
@@ -11104,26 +11829,51 @@ void Actor::EventFindEnemy(Event *ev)
     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;
@@ -11136,6 +11886,11 @@ void Actor::EventSetNextBreathTime(Event *ev)
     thread->Execute(&var, 1);
 }
 
+/*
+===============
+Actor::EventCalcGrenadeToss2
+===============
+*/
 void Actor::EventCalcGrenadeToss2(Event *ev)
 {
     Vector vTargetPos;
@@ -11158,8 +11913,10 @@ void Actor::EventCalcGrenadeToss2(Event *ev)
     }
 
     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;
@@ -11172,6 +11929,7 @@ void Actor::EventCalcGrenadeToss2(Event *ev)
     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;
@@ -11188,12 +11946,19 @@ void Actor::EventCalcGrenadeToss2(Event *ev)
     vVel = vTargetPos - vPoint;
     vVel.normalize();
     vVel *= speed;
-    m_vGrenadeVel = vVel;
+
+    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;
@@ -11228,36 +11993,71 @@ void Actor::EventCalcGrenadeToss(Event *ev)
     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;
@@ -11274,6 +12074,11 @@ void Actor::PathnodeClaimRevoked(PathNode *node)
     m_pCoverNode = NULL;
 }
 
+/*
+===============
+Actor::SetPathToNotBlockSentient
+===============
+*/
 void Actor::SetPathToNotBlockSentient(Sentient *pOther)
 {
     Vector vAway;
@@ -11318,9 +12123,7 @@ void Actor::SetPathToNotBlockSentient(Sentient *pOther)
 
     vDest = origin + vPerp * 48;
 
-    if (G_SightTrace(
-            vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, qfalse, "Actor::SetPathToNotBlockSentient 1"
-        )) {
+    if (G_SightTrace(vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, false, "Actor::SetPathToNotBlockSentient 1")) {
         SetPathWithinDistance(vDest, NULL, 96, 0);
     }
 
@@ -11330,9 +12133,7 @@ void Actor::SetPathToNotBlockSentient(Sentient *pOther)
 
     vDest = origin - vPerp * 48;
 
-    if (G_SightTrace(
-            vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, qfalse, "Actor::SetPathToNotBlockSentient 2"
-        )) {
+    if (G_SightTrace(vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, false, "Actor::SetPathToNotBlockSentient 2")) {
         SetPathWithinDistance(vDest, NULL, 96, 0);
     }
 
@@ -11369,7 +12170,7 @@ void Actor::LookAround(float fFovAdd)
 
         VectorMA(vEyePos, 1024, vDest, vDest);
 
-        trace = G_Trace(EyePosition(), vec_zero, vec_zero, vDest, this, MASK_LOOK, qfalse, "Actor::LookAround");
+        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);
@@ -11387,6 +12188,11 @@ void Actor::LookAround(float fFovAdd)
     }
 }
 
+/*
+===============
+Actor::EventGetLookAroundAngle
+===============
+*/
 void Actor::EventGetLookAroundAngle(Event *ev)
 {
     // Fixed in OPM
@@ -11396,6 +12202,11 @@ void Actor::EventGetLookAroundAngle(Event *ev)
     ev->AddFloat(m_fLookAroundFov);
 }
 
+/*
+===============
+Actor::EventSetLookAroundAngle
+===============
+*/
 void Actor::EventSetLookAroundAngle(Event *ev)
 {
     float fLookAroundFov;
@@ -11408,6 +12219,11 @@ void Actor::EventSetLookAroundAngle(Event *ev)
     m_fLookAroundFov = fLookAroundFov;
 }
 
+/*
+===============
+Actor::DumpAnimInfo
+===============
+*/
 void Actor::DumpAnimInfo(void)
 {
     vec3_t LocalLookAngles;
@@ -11464,8 +12280,9 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
         vPlayer = p->origin;
     }
 
-    i1 = sprintf(
+    i1 = Com_sprintf(
         szTemp,
+        sizeof(szTemp),
         "map = %s\n"
         "time = %i (%i:%02i)\n"
         "entnum = %i, targetname = '%s'\n"
@@ -11500,7 +12317,7 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
     if (pszFmt) {
         va_list args2;
         va_copy(args2, args);
-        i2 = i1 + vsprintf(&szTemp[i1], pszFmt, args);
+        i2 = i1 + Q_vsnprintf(szTemp + i1, sizeof(szTemp) - i1, pszFmt, args);
     }
 
     va_end(args);
@@ -11511,8 +12328,9 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
 
     t   = time(0);
     ptm = localtime(&t);
-    sprintf(
+    Com_sprintf(
         szFile,
+        sizeof(szFile),
         "main\\ai_trace_%s_%i_%i_%02i%02i.log",
         sv_mapname->string,
         ptm->tm_mon + 1,
@@ -11543,12 +12361,22 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
     );
 }
 
+/*
+===============
+Actor::EventSetMoveDoneRadius
+===============
+*/
 void Actor::EventSetMoveDoneRadius(Event *ev)
 {
     float radius             = ev->GetFloat(1);
     m_fMoveDoneRadiusSquared = Square(radius);
 }
 
+/*
+===============
+Actor::EventGetMoveDoneRadius
+===============
+*/
 void Actor::EventGetMoveDoneRadius(Event *ev)
 {
     ev->AddFloat(sqrtf(m_fMoveDoneRadiusSquared));
@@ -11574,11 +12402,21 @@ void Actor::StoppedWaitFor(const_str name, bool bDeleting)
     g_iInThinks--;
 }
 
+/*
+===============
+Actor::EventHasCompleteLookahead
+===============
+*/
 void Actor::EventHasCompleteLookahead(Event *ev)
 {
     ev->AddInteger(PathExists() && PathHasCompleteLookahead());
 }
 
+/*
+===============
+Actor::EventPathDist
+===============
+*/
 void Actor::EventPathDist(Event *ev)
 {
     if (!PathExists() || PathComplete()) {
@@ -11589,6 +12427,11 @@ void Actor::EventPathDist(Event *ev)
     ev->AddFloat(PathDist());
 }
 
+/*
+===============
+Actor::EventCanShootEnemyFrom
+===============
+*/
 void Actor::EventCanShootEnemyFrom(Event *ev)
 {
     if (!m_Enemy) {
@@ -11599,26 +12442,51 @@ void Actor::EventCanShootEnemyFrom(Event *ev)
     ev->AddInteger(CanSeeFrom(ev->GetVector(1), m_Enemy));
 }
 
+/*
+===============
+Actor::EventSetInReload
+===============
+*/
 void Actor::EventSetInReload(Event *ev)
 {
     m_bInReload = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventGetInReload
+===============
+*/
 void Actor::EventGetInReload(Event *ev)
 {
     ev->AddInteger(m_bInReload);
 }
 
+/*
+===============
+Actor::EventSetReloadCover
+===============
+*/
 void Actor::EventSetReloadCover(Event *ev)
 {
     m_bNeedReload = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventBreakSpecial
+===============
+*/
 void Actor::EventBreakSpecial(Event *ev)
 {
     mbBreakSpecialAttack = true;
 }
 
+/*
+===============
+Actor::EventCanShoot
+===============
+*/
 void Actor::EventCanShoot(Event *ev)
 {
     Entity *ent;
@@ -11632,11 +12500,21 @@ void Actor::EventCanShoot(Event *ev)
     ev->AddInteger(CanShoot(ent));
 }
 
+/*
+===============
+Actor::EventSetBalconyHeight
+===============
+*/
 void Actor::EventSetBalconyHeight(Event *ev)
 {
     m_fBalconyHeight = ev->GetFloat(1);
 }
 
+/*
+===============
+Actor::EventSetIgnoreBadPlace
+===============
+*/
 void Actor::EventSetIgnoreBadPlace(Event *ev)
 {
     if (m_bIgnoreBadPlace == ev->GetBoolean(1)) {
@@ -11650,16 +12528,31 @@ void Actor::EventSetIgnoreBadPlace(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetIgnoreBadPlace
+===============
+*/
 void Actor::EventGetIgnoreBadPlace(Event *ev)
 {
     ev->AddInteger(m_bIgnoreBadPlace);
 }
 
+/*
+===============
+Actor::EventGetBalconyHeight
+===============
+*/
 void Actor::EventGetBalconyHeight(Event *ev)
 {
     ev->AddFloat(m_fBalconyHeight);
 }
 
+/*
+===============
+Actor::BecomeTurretGuy
+===============
+*/
 void Actor::BecomeTurretGuy(void)
 {
     SetThinkIdle(THINK_IDLE);
@@ -11741,6 +12634,11 @@ void Actor::Landed(Event *ev)
     setMoveType(MOVETYPE_NONE);
 }
 
+/*
+===============
+Actor::IsOnFloor
+===============
+*/
 bool Actor::IsOnFloor(void)
 {
     str name = AnimName(0);
@@ -11861,10 +12759,25 @@ void Actor::EventCuriousOn(Event *ev)
     m_bIsCurious = true;
 }
 
+/*
+===============
+Actor::EventSetDestIdle
+===============
+*/
 void Actor::EventSetDestIdle(Event *ev) {}
 
+/*
+===============
+Actor::EventSetDestIdle2
+===============
+*/
 void Actor::EventSetDestIdle2(Event *ev) {}
 
+/*
+===============
+Actor::IsDisabled
+===============
+*/
 bool Actor::IsDisabled() const
 {
     return !m_bDoAI;
diff --git a/code/fgame/actor.h b/code/fgame/actor.h
index a31d4fd6..7274f8ce 100644
--- a/code/fgame/actor.h
+++ b/code/fgame/actor.h
@@ -1714,7 +1714,7 @@ inline bool Actor::CanSeeFOV(Entity *ent)
 
     bCanSee = false;
 
-    if (InFOV(ent->centroid) && gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum)) {
+    if (InFOV(ent) && AreasConnected(ent)) {
         bCanSee = CanSee(ent, 0, 0, false);
     }
 
diff --git a/code/fgame/actor_alarm.cpp b/code/fgame/actor_alarm.cpp
index f485839d..57514a9e 100644
--- a/code/fgame/actor_alarm.cpp
+++ b/code/fgame/actor_alarm.cpp
@@ -120,6 +120,8 @@ void Actor::Think_Alarm(void)
         Com_Printf("Actor::Think_Alarm: invalid think state %i\n", m_State);
         break;
     }
+
+    PostThink(true);
 }
 
 void Actor::FinishedAnimation_Alarm(void)
diff --git a/code/fgame/actor_balcony.cpp b/code/fgame/actor_balcony.cpp
index 538e6563..ab181089 100644
--- a/code/fgame/actor_balcony.cpp
+++ b/code/fgame/actor_balcony.cpp
@@ -264,7 +264,7 @@ bool Actor::CalcFallPath(void)
     loop = currentPos;
 
     mm.desired_speed = 0;
-    mm.groundPlane = NULL;
+    mm.groundPlane = qfalse;
     mm.walking = false;
     VectorSet(mm.velocity, 0, 0, -171);
 
diff --git a/code/fgame/actor_cover.cpp b/code/fgame/actor_cover.cpp
index 97701778..8350849b 100644
--- a/code/fgame/actor_cover.cpp
+++ b/code/fgame/actor_cover.cpp
@@ -79,7 +79,7 @@ bool Actor::Cover_SetPath(PathNode *node)
     fPathDist       = PathDist();
     fMinDistSquared = Square(fPathDist);
 
-    if ((node->origin - origin).lengthSquared() <= fMinDistSquared * 4.0f && fPathDist > 128.0f) {
+    if ((node->origin - origin).lengthSquared() * 4 <= fMinDistSquared && fPathDist > 128.0f) {
         return false;
     }
 
@@ -343,7 +343,7 @@ void Actor::State_Cover_Hide(void)
     bool      bCanShoot, bCanSee;
 
     if (m_Enemy) {
-        SetEnemyPos(origin);
+        SetEnemyPos(m_Enemy->origin);
     }
 
     if (!m_pCoverNode) {
@@ -380,7 +380,7 @@ void Actor::State_Cover_Hide(void)
         return;
     }
 
-    if (bCanShoot || bCanShoot) {
+    if (bCanSee || bCanShoot) {
         m_pCoverNode->Relinquish();
         m_pCoverNode->MarkTemporarilyBad();
         m_pCoverNode = NULL;
diff --git a/code/fgame/actor_curious.cpp b/code/fgame/actor_curious.cpp
index ba1720ea..19e51e5d 100644
--- a/code/fgame/actor_curious.cpp
+++ b/code/fgame/actor_curious.cpp
@@ -31,7 +31,7 @@ void Actor::InitCurious(GlobalFuncs_t *func)
     func->EndState                   = &Actor::End_Curious;
     func->ResumeState                = &Actor::Resume_Curious;
     func->SuspendState               = &Actor::Suspend_Curious;
-    func->FinishedAnimation          = &Actor::FinishedAnimation_Cover;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Curious;
     func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Curious;
     func->IsState                    = &Actor::IsCuriousState;
 }
@@ -246,8 +246,8 @@ void Actor::LookAtCuriosity(void)
 
     iSeed = 0x19660D * (m_iCuriousTime - 0x2EB71B09 * ((level.inttime - m_iCuriousTime) & 0xFFFFFF00)) + 0x3C6EF35F;
 
-    vAngles[0] = m_DesiredLookAngles[0] + (float)iSeed / 0x4444444 * fLookScale;
-    vAngles[1] = m_DesiredLookAngles[1] + (float)iSeed / 0x2222222 * fLookScale;
+    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);
diff --git a/code/fgame/actor_disguise_officer.cpp b/code/fgame/actor_disguise_officer.cpp
index cb735391..8293312f 100644
--- a/code/fgame/actor_disguise_officer.cpp
+++ b/code/fgame/actor_disguise_officer.cpp
@@ -120,7 +120,7 @@ void Actor::Think_DisguiseOfficer(void)
         {
             Com_Printf("Actor::Think_DisguiseOfficer: invalid think state %i\n", m_State);
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
             assert(!assertStr);
         }
diff --git a/code/fgame/actor_disguise_rover.cpp b/code/fgame/actor_disguise_rover.cpp
index 14172252..d8773f24 100644
--- a/code/fgame/actor_disguise_rover.cpp
+++ b/code/fgame/actor_disguise_rover.cpp
@@ -124,7 +124,7 @@ void Actor::Think_DisguiseRover(void)
         {
             Com_Printf("Actor::Think_DisguiseOfficer: invalid think state %i\n", m_State);
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
             assert(!assertStr);
         }
diff --git a/code/fgame/actor_disguise_salute.cpp b/code/fgame/actor_disguise_salute.cpp
index d55235ba..75aa6041 100644
--- a/code/fgame/actor_disguise_salute.cpp
+++ b/code/fgame/actor_disguise_salute.cpp
@@ -31,6 +31,7 @@ void Actor::InitDisguiseSalute(GlobalFuncs_t *func)
     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;
 }
@@ -51,7 +52,7 @@ void Actor::Begin_DisguiseSalute(void)
         SetDesiredYawDest(m_Enemy->origin);
         SetDesiredLookDir(m_Enemy->origin - origin);
 
-        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_PAPERS_SCR);
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_SALUTE_SCR);
     } else {
         SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
     }
@@ -85,7 +86,12 @@ void Actor::Think_DisguiseSalute(void)
         return;
     }
 
-    if ((!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET)) || level.m_bAlarm != qtrue) {
+    if (!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET)) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        return;
+    }
+
+    if (level.m_bAlarm == qtrue) {
         SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
         return;
     }
diff --git a/code/fgame/actor_grenade.cpp b/code/fgame/actor_grenade.cpp
index fe4162b1..6a6d355b 100644
--- a/code/fgame/actor_grenade.cpp
+++ b/code/fgame/actor_grenade.cpp
@@ -474,7 +474,7 @@ void Actor::FinishedAnimation_Grenade(void)
         break;
     default:
         char assertStr[16317] = {0};
-        strcpy(assertStr, "\"invalid grenade state in FinishedAnimation()\"\n\tMessage: ");
+        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;
diff --git a/code/fgame/actor_machinegunner.cpp b/code/fgame/actor_machinegunner.cpp
index 07ddaf0e..f79690f3 100644
--- a/code/fgame/actor_machinegunner.cpp
+++ b/code/fgame/actor_machinegunner.cpp
@@ -89,8 +89,11 @@ void Actor::End_MachineGunner(void)
     }
 
     Unholster();
-    if (m_pTurret && m_pTurret->GetOwner() == this) {
-        m_pTurret->TurretEndUsed();
+    if (m_pTurret) {
+        m_pTurret->m_bHadOwner = true;
+        if (m_pTurret->GetOwner() == this) {
+            m_pTurret->TurretEndUsed();
+        }
     }
 }
 
@@ -142,31 +145,31 @@ void Actor::ThinkHoldGun_TurretGun(void)
         if (m_State == ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
             m_fCrouchWeight = 0;
 
-            temp = (origin[2] + 71.6f - m_pTurret->origin[2]) / 39.f;
+            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.0) {
-                m_fCrouchWeight = -1.0;
+            if (m_fCrouchWeight < -1.0f) {
+                m_fCrouchWeight = -1.0f;
             }
         }
 
-        VectorScale2D(orientation[0], m_fCrouchWeight * -9.3f + 23.4f, offset);
+        VectorScale2D(orientation[0], -(23.4 - m_fCrouchWeight * 9.3), offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
-        VectorScale2D(orientation[1], m_fCrouchWeight * 2.6f + 10.3f, offset);
+        VectorScale2D(orientation[1], 10.3 + m_fCrouchWeight * 2.6, offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
     } else {
-        m_fCrouchWeight = machine_gunner_hands_up_stand / (heightDiff - 38.7f);
+        m_fCrouchWeight = machine_gunner_hands_up_stand / (heightDiff - 38.7);
         if (m_fCrouchWeight > 1.0) {
             m_fCrouchWeight = 1.0;
         }
 
-        VectorScale2D(orientation[0], m_fCrouchWeight * -3.f + 23.4f, offset);
+        VectorScale2D(orientation[0], -(23.4 - m_fCrouchWeight * 3.0), offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
-        VectorScale2D(orientation[1], m_fCrouchWeight * -1.6f + 10.3f, offset);
+        VectorScale2D(orientation[1], 10.3 - m_fCrouchWeight * 1.6, offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
     }
 
@@ -179,9 +182,11 @@ void Actor::ThinkHoldGun_TurretGun(void)
     UpdateAimMotion();
     UpdateAnim();
 
+    newOrigin[2] = origin[2] + 18.0;
+
     end[0] = newOrigin[0];
     end[1] = newOrigin[1];
-    end[2] = newOrigin[2] - 94;
+    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) {
@@ -207,6 +212,12 @@ void Actor::Think_MachineGunner_TurretGun(void)
 
     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;
diff --git a/code/fgame/actor_patrol.cpp b/code/fgame/actor_patrol.cpp
index 233a6d56..bcf9f4ac 100644
--- a/code/fgame/actor_patrol.cpp
+++ b/code/fgame/actor_patrol.cpp
@@ -81,6 +81,11 @@ void Actor::Think_Patrol(void)
     } 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);
diff --git a/code/fgame/actor_runandshoot.cpp b/code/fgame/actor_runandshoot.cpp
index e8a82958..1939dbb2 100644
--- a/code/fgame/actor_runandshoot.cpp
+++ b/code/fgame/actor_runandshoot.cpp
@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // actor_runandshoot.cpp
+//
+// Added in 2.30
+//
 
 #include "actor.h"
 
@@ -37,9 +40,10 @@ void Actor::InitRunAndShoot(GlobalFuncs_t *func)
 
 void Actor::Begin_RunAndShoot(void)
 {
-    m_State = ACTOR_STATE_RUN_AND_SHOOT_RUN;
     if (m_patrolCurrentNode) {
         m_State = ACTOR_STATE_RUN_AND_SHOOT_RUNNING;
+    } else {
+        m_State = ACTOR_STATE_RUN_AND_SHOOT_RUN;
     }
 }
 
@@ -125,7 +129,7 @@ bool Actor::RunAndShoot_MoveToPatrolCurrentNode(void)
 {
     UpdatePatrolCurrentNode();
 
-    if (!m_patrolCurrentNode && m_bPatrolWaitTrigger) {
+    if (!m_patrolCurrentNode || m_bPatrolWaitTrigger) {
         IdleLook();
         Anim_Idle();
         return false;
@@ -143,62 +147,29 @@ bool Actor::RunAndShoot_MoveToPatrolCurrentNode(void)
 
     if (MoveOnPathWithSquad()) {
         if (m_Enemy) {
-            m_eNextAnimMode    = ANIM_MODE_PATH;
-            m_csNextAnimString = STRING_ANIM_RUNTO_INOPEN_SCR;
-            m_bNextForceStart  = false;
-
-            Vector delta;
-            Vector lookDir;
-
-            delta   = mTargetPos - EyePosition();
-            lookDir = delta;
-            lookDir[2] += 16;
-            SetDesiredLookDir(lookDir);
-
-            m_DesiredGunDir[0] = 360 - delta.toPitch();
-            m_DesiredGunDir[1] = delta.toYaw();
-            m_DesiredGunDir[2] = 0;
-            SetDesiredYaw(m_DesiredGunDir[1]);
+            DesiredAnimation(ANIM_MODE_PATH, STRING_ANIM_RUNTO_INOPEN_SCR);
+            AimAtTargetPos();
         } else {
-            m_eNextAnimMode    = ANIM_MODE_PATH;
-            m_csNextAnimString = STRING_ANIM_CROUCH_RUN_SCR;
-            m_bNextForceStart  = false;
+            DesiredAnimation(ANIM_MODE_PATH, STRING_ANIM_CROUCH_RUN_SCR);
             FaceMotion();
         }
     } else if (m_Enemy) {
-        Vector delta;
-        Vector lookDir;
-
-        delta   = mTargetPos - EyePosition();
-        lookDir = delta;
-        lookDir[2] += 16;
-        SetDesiredLookDir(lookDir);
-
-        m_DesiredGunDir[0] = 360 - delta.toPitch();
-        m_DesiredGunDir[1] = delta.toYaw();
-        m_DesiredGunDir[2] = 0;
-        SetDesiredYaw(m_DesiredGunDir[1]);
+        AimAtTargetPos();
         Anim_Attack();
     } else {
         Anim_Stand();
         IdleLook();
     }
 
-    if (!m_fMoveDoneRadiusSquared) {
-        return false;
+    if (m_fMoveDoneRadiusSquared) {
+        if (PathComplete()) {
+            return true;
+        }
+
+        if (m_Path.HasCompleteLookahead() && !m_patrolCurrentNode->Next()) {
+            return VectorLength2DSquared(PathDelta()) <= m_fMoveDoneRadiusSquared;
+        }
     }
 
-    if (PathComplete()) {
-        return true;
-    }
-
-    if (!m_Path.HasCompleteLookahead() || m_patrolCurrentNode->Next()) {
-        return false;
-    }
-
-    if (VectorLength2DSquared(PathDelta()) > m_fMoveDoneRadiusSquared) {
-        return false;
-    }
-
-    return true;
+    return false;
 }
diff --git a/code/fgame/actor_runner.cpp b/code/fgame/actor_runner.cpp
index 9b98b1c2..d0c906b9 100644
--- a/code/fgame/actor_runner.cpp
+++ b/code/fgame/actor_runner.cpp
@@ -76,6 +76,11 @@ void Actor::Think_Runner(void)
     } 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);
diff --git a/code/fgame/actor_turret.cpp b/code/fgame/actor_turret.cpp
index c4e48fff..8db46a58 100644
--- a/code/fgame/actor_turret.cpp
+++ b/code/fgame/actor_turret.cpp
@@ -233,7 +233,13 @@ void Actor::Turret_BeginRetarget(void)
     SetEnemyPos(m_Enemy->origin);
     AimAtEnemyBehavior();
 
-    TransitionState(ACTOR_STATE_TURRET_RETARGET_SUPPRESS, 0);
+    // 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)
@@ -287,28 +293,31 @@ void Actor::Turret_SideStep(int iStepSize, vec3_t vDir)
     AimAtEnemyBehavior();
     StrafeToAttack(iStepSize, vDir);
 
-    if (!PathExists() || PathComplete() || !PathAvoidsSquadMates()) {
-        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);
-    } else {
-        Turret_NextRetarget();
+        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;
     }
 
-    AimAtTargetPos();
-    Anim_Suppress();
-
     if (level.inttime >= m_iStateTime + 15000) {
         Turret_SelectState();
         if (m_State == ACTOR_STATE_TURRET_SHOOT) {
@@ -321,6 +330,8 @@ 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();
diff --git a/code/fgame/actor_weaponless.cpp b/code/fgame/actor_weaponless.cpp
index 1fc276ee..ebc03f8e 100644
--- a/code/fgame/actor_weaponless.cpp
+++ b/code/fgame/actor_weaponless.cpp
@@ -121,7 +121,7 @@ void Actor::Think_Weaponless(void)
         } else {
             Com_Printf("Think_Weaponless: invalid think state %i\n", m_State);
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
             assert(!assertStr);
         }
diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index f339e680..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.
 
@@ -142,7 +142,8 @@ int ActorEnemy::UpdateThreat(Actor *pSelf)
         Square(305),
         Square(254),
         Square(200),
-        Square(137)};
+        Square(137)
+    };
     static int iWeaponThreat[7][5] = {
         {5,  3,  1,  1, 1},
         {8,  6,  4,  2, 1},
@@ -165,7 +166,7 @@ int ActorEnemy::UpdateThreat(Actor *pSelf)
     }
 
     m_iThreat = 10000;
-    if (m_bVisible == true) {
+    if (m_bVisible) {
         m_iThreat = 10500;
     }
 
@@ -321,7 +322,7 @@ void ActorEnemySet::FlagBadEnemy(Sentient *pEnemy)
 
     // Added in 2.0.
     //  Set the reaction time
-    pActorEnemy->m_iNextEnemyTime       = level.inttime + 5000;
+    pActorEnemy->m_iNextEnemyTime = level.inttime + 5000;
 
     pActorEnemy->m_fLastLookTime        = level.time;
     pActorEnemy->m_fVisibility          = 0.0;
@@ -353,7 +354,7 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
         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()->m_iThreatBias == THREATBIAS_IGNOREME || pActorEnemy->GetEnemy()->IsDisabled()) {
             m_Enemies.RemoveObjectAt(i);
         } else {
             i++;
@@ -420,15 +421,14 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
     m_iCurrentThreat = 0;
     fRangeSquared    = 1e37f;
 
-    if (m_fCurrentVisibility >= 1) {
-        iThreat = 0;
-
+    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 >= pActorEnemy->GetThreat()) {
-                if (m_iCheckCount != pActorEnemy->GetThreat()) {
+            if (m_iCurrentThreat >= iThreat) {
+                if (m_iCheckCount != iThreat) {
                     continue;
                 }
 
@@ -437,12 +437,10 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
                 }
             }
 
-            iThreat         = pActorEnemy->GetThreat();
-            m_pCurrentEnemy = pActorEnemy->GetEnemy();
-            fRangeSquared   = pActorEnemy->m_fCurrentRangeSquared;
+            m_iCurrentThreat = pActorEnemy->GetThreat();
+            m_pCurrentEnemy  = pActorEnemy->GetEnemy();
+            fRangeSquared    = pActorEnemy->m_fCurrentRangeSquared;
         }
-
-        m_iCurrentThreat = iThreat;
     }
 
     if ((!m_pCurrentEnemy || !m_pCurrentEnemy->m_bIsDisguised) && m_iCurrentThreat <= 0) {
diff --git a/code/fgame/actorpath.cpp b/code/fgame/actorpath.cpp
index 1be838e8..0c90e846 100644
--- a/code/fgame/actorpath.cpp
+++ b/code/fgame/actorpath.cpp
@@ -399,6 +399,7 @@ void ActorPath::UpdatePos(float *origin, float fNodeRadius)
         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 {
@@ -457,6 +458,7 @@ void ActorPath::Shorten(float fDistRemove)
     //  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::StartNode(void) const
diff --git a/code/fgame/actorpath.h b/code/fgame/actorpath.h
index 0ecb0019..ced7fcc6 100644
--- a/code/fgame/actorpath.h
+++ b/code/fgame/actorpath.h
@@ -105,8 +105,8 @@ public:
 
 inline void ActorPath::Archive(Archiver& arc)
 {
-    int pos;
-    int startpathpos;
+    int index;
+    int i;
 
     arc.ArchiveInteger(&m_pathlen);
 
@@ -115,42 +115,40 @@ inline void ActorPath::Archive(Archiver& arc)
             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) {
+            arc.ArchiveInteger(&index);
+            if (index == -1) {
                 m_pathpos = NULL;
             } else {
-                m_pathpos = &m_path[pos];
+                m_pathpos = &m_path[index];
             }
 
-            arc.ArchiveInteger(&startpathpos);
-            if (startpathpos == -1) {
+            arc.ArchiveInteger(&index);
+            if (index == -1) {
                 m_startpathpos = NULL;
             } else {
-                m_startpathpos = &m_path[pos];
+                m_startpathpos = &m_path[index];
             }
         } else {
             if (m_pathpos) {
-                pos = m_pathpos - m_path;
+                index = m_pathpos - m_path;
             } else {
-                pos = -1;
+                index = -1;
             }
 
-            arc.ArchiveInteger(&pos);
+            arc.ArchiveInteger(&index);
 
             if (m_startpathpos) {
-                pos = m_startpathpos - m_path;
+                index = m_startpathpos - m_path;
             } else {
-                pos = -1;
+                index = -1;
             }
 
-            arc.ArchiveInteger(&pos);
+            arc.ArchiveInteger(&index);
         }
     } else if (arc.Loading()) {
         m_pathpos = 0;
diff --git a/code/fgame/ammo.cpp b/code/fgame/ammo.cpp
index 8a51a007..de9b8c53 100644
--- a/code/fgame/ammo.cpp
+++ b/code/fgame/ammo.cpp
@@ -30,13 +30,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ammo.h"
 #include "player.h"
+#include "g_phys.h"
+
+Event EV_AmmoEntity_PostSpawn
+(
+    "ammoentity_postspawn",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Ammo Entity Post Spawn"
+);
 
 CLASS_DECLARATION(Item, AmmoEntity, NULL) {
-    {NULL, NULL}
+    {&EV_AmmoEntity_PostSpawn, &AmmoEntity::EventPostSpawn},
+    {NULL,                     NULL                       }
 };
 
 AmmoEntity::AmmoEntity()
-
 {
     if (LoadingSavegame) {
         // all data will be setup by the archive function
@@ -44,13 +54,14 @@ AmmoEntity::AmmoEntity()
     }
     setName("UnknownAmmo");
     amount = 0;
+
+    PostEvent(EV_AmmoEntity_PostSpawn, EV_POSTSPAWN);
 }
 
 Item *AmmoEntity::ItemPickup(Entity *other, qboolean add_to_inventory)
-
 {
     Sentient *player;
-    Weapon* pWeap;
+    Weapon   *pWeap;
 
     if (!other->IsSubclassOfPlayer()) {
         return NULL;
@@ -86,7 +97,11 @@ Item *AmmoEntity::ItemPickup(Entity *other, qboolean add_to_inventory)
     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())));
+    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);
@@ -100,6 +115,21 @@ Item *AmmoEntity::ItemPickup(Entity *other, qboolean add_to_inventory)
     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.
 
@@ -108,7 +138,9 @@ CLASS_DECLARATION(Class, Ammo, NULL) {
 };
 
 Ammo::Ammo()
-
+    : amount(0)
+    , maxamount(0)
+    , name_index(0)
 {
     if (LoadingSavegame) {
         // all data will be setup by the archive function
@@ -120,7 +152,6 @@ Ammo::Ammo()
 }
 
 void Ammo::setAmount(int a)
-
 {
     amount = a;
 
@@ -130,38 +161,32 @@ void Ammo::setAmount(int a)
 }
 
 int Ammo::getAmount(void)
-
 {
     return amount;
 }
 
 void Ammo::setMaxAmount(int a)
-
 {
     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;
 }
diff --git a/code/fgame/ammo.h b/code/fgame/ammo.h
index eb1a5ad7..24cb172c 100644
--- a/code/fgame/ammo.h
+++ b/code/fgame/ammo.h
@@ -22,8 +22,7 @@ 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"
@@ -35,6 +34,7 @@ public:
 
     AmmoEntity();
     Item *ItemPickup(Entity *other, qboolean add_to_inventory) override;
+    void  EventPostSpawn(Event *ev);
 };
 
 class Ammo : public Class
@@ -61,13 +61,13 @@ public:
 };
 
 inline void Ammo::Archive(Archiver& arc)
-
 {
     Class::Archive(arc);
 
     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
     //
@@ -75,5 +75,3 @@ inline void Ammo::Archive(Archiver& arc)
         setName(name);
     }
 }
-
-#endif /* ammo.h */
diff --git a/code/fgame/animate.cpp b/code/fgame/animate.cpp
index 56eef6c7..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.
 
@@ -315,8 +315,8 @@ void Animate::NewAnim(int animnum, int slot, float weight)
                     const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
                     int                     eventNum;
 
-                    strcpy(cmdName, "_client_");
-                    strcpy(cmdName + 8, single_cmd.args[0]);
+                    Q_strncpyz(cmdName, "_client_", longest + 8 + 1);
+                    Q_strncpyz(cmdName + 8, single_cmd.args[0], longest + 1);
 
                     eventNum = Event::FindEventNum(cmdName);
 
@@ -386,8 +386,8 @@ void Animate::NewAnim(int animnum, int slot, float weight)
                     const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
                     int                     eventNum;
 
-                    strcpy(cmdName, "_client_");
-                    strcpy(cmdName + 8, single_cmd.args[0]);
+                    Q_strncpyz(cmdName, "_client_", longestAllFrames + 8 + 1);
+                    Q_strncpyz(cmdName + 8, single_cmd.args[0], longestAllFrames + 1);
 
                     eventNum = Event::FindEventNum(cmdName);
 
@@ -508,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);
@@ -555,8 +554,8 @@ void Animate::DoExitCommands(int slot)
                 const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
                 int                     eventNum;
 
-                strcpy(cmdName, "_client_");
-                strcpy(cmdName + 8, single_cmd.args[0]);
+                Q_strncpyz(cmdName, "_client_", longest + 8 + 1);
+                Q_strncpyz(cmdName + 8, single_cmd.args[0], longest + 1);
 
                 eventNum = Event::FindEventNum(cmdName);
 
@@ -597,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)
diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index 99bc9b53..a151ee7e 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -66,7 +66,7 @@ static const char *typenames[] = {
     "object", "objectpointer", "safepointer",    "eventpointer", "quaternion", "entity",   "bool",     "position",
     "size"};
 
-#define ArchiveHeader  (*(int *)"MHAA")
+#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!
 
@@ -109,6 +109,11 @@ const char *ArchiveFile::Filename(void)
 
 qboolean ArchiveFile::Compress()
 {
+#ifdef Q3_BIG_ENDIAN
+    // FIXME: Decompressing crashes on big-endian architectures
+    return false;
+#endif
+
     byte  *tempbuf;
     size_t out_len;
     size_t tempbuf_len;
@@ -208,6 +213,7 @@ qboolean ArchiveFile::OpenRead(const char *name)
 
         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) {
@@ -309,7 +315,7 @@ void Archiver::FileError(const char *fmt, ...)
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     fileerror = true;
@@ -487,11 +493,43 @@ File Archive functions
 
 //#define ARCHIVE_USE_TYPES 1
 
-#define ARCHIVE(func, type)                       \
-    void Archiver::Archive##func(type *v)         \
-                                                  \
-    {                                             \
-        ArchiveData(ARC_##func, v, sizeof(type)); \
+template<typename v>
+void ArchiveSwapValue(v* value) {
+    LittleSwap(value, sizeof(v));
+}
+
+template<typename v>
+void ArchiveSwapValue(v* value, size_t size) {
+    for (size_t i = 0; i < size; i++) {
+        LittleSwap(&value[i], sizeof(value[i]));
+    }
+}
+
+template<>
+void ArchiveSwapValue<Vector>(Vector* value) {
+    for (int i = 0; i < 3; i++) {
+        (*value)[i] = LittleFloat((*value)[i]);
+    }
+}
+
+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);
@@ -525,17 +563,38 @@ void Archiver::ArchiveSvsTime(int *time)
 
 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)
 {
-    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)
 {
-    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(LightClass **ptr)
@@ -544,7 +603,9 @@ void Archiver::ArchiveObjectPointer(LightClass **ptr)
 
     if (archivemode == ARCHIVE_READ) {
         pointer_fixup_t *fixup;
+
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+        index = LittleLong(index);
 
         //
         // see if the variable was NULL
@@ -567,6 +628,8 @@ void Archiver::ArchiveObjectPointer(LightClass **ptr)
         } else {
             index = ARCHIVE_NULL_POINTER;
         }
+
+        index = LittleLong(index);
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
     }
 }
@@ -577,7 +640,9 @@ void Archiver::ArchiveObjectPointer(Class **ptr)
 
     if (archivemode == ARCHIVE_READ) {
         pointer_fixup_t *fixup;
+
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+        index = LittleLong(index);
 
         //
         // see if the variable was NULL
@@ -600,6 +665,8 @@ void Archiver::ArchiveObjectPointer(Class **ptr)
         } else {
             index = ARCHIVE_NULL_POINTER;
         }
+
+        index = LittleLong(index);
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
     }
 }
@@ -612,6 +679,7 @@ void Archiver::ArchiveSafePointer(SafePtrBase *ptr)
         pointer_fixup_t *fixup;
 
         ArchiveData(ARC_SafePointer, &index, sizeof(index));
+        index = LittleLong(index);
 
         //
         // see if the variable was NULL
@@ -638,6 +706,7 @@ void Archiver::ArchiveSafePointer(SafePtrBase *ptr)
         } else {
             index = ARCHIVE_NULL_POINTER;
         }
+        index = LittleLong(index);
         ArchiveData(ARC_SafePointer, &index, sizeof(index));
     }
 }
@@ -646,12 +715,13 @@ void Archiver::ArchiveEventPointer(Event **ev)
 {
     int index;
 
+#ifdef ARCHIVE_USE_TYPES
+    CheckType(ARC_EventPointer);
+#endif
+
     if (archivemode == ARCHIVE_READ) {
 #ifndef NDEBUG
         CheckRead();
-#endif
-#ifdef ARCHIVE_USE_TYPES
-        CheckType(ARC_EventPointer);
 #endif
         ArchiveInteger(&index);
 
@@ -673,10 +743,6 @@ void Archiver::ArchiveEventPointer(Event **ev)
             index = ARCHIVE_NULL_POINTER;
         }
 
-#ifdef ARCHIVE_USE_TYPES
-        WriteType(ARC_EventPointer);
-#endif
-
         ArchiveInteger(&index);
         if (*ev) {
             (*ev)->Archive(*this);
@@ -691,6 +757,10 @@ void Archiver::ArchiveRaw(void *data, size_t size)
 
 void Archiver::ArchiveString(str *string)
 {
+#ifdef ARCHIVE_USE_TYPES
+    CheckType(ARC_String);
+#endif
+
     if (archivemode == ARCHIVE_READ) {
         fileSize_t s;
         char      *data;
@@ -698,10 +768,6 @@ void Archiver::ArchiveString(str *string)
 #ifndef NDEBUG
         CheckRead();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-        CheckType(ARC_String);
-#endif
-
         if (!fileerror) {
             s = ReadSize();
             if (!fileerror) {
@@ -722,10 +788,7 @@ void Archiver::ArchiveString(str *string)
 #ifndef NDEBUG
         CheckWrite();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-        WriteType(ARC_String);
-#endif
-        WriteSize((fileSize_t)string->length());
+        WriteSize(string->length());
         archivefile.Write(string->c_str(), string->length());
     }
 }
@@ -938,6 +1001,11 @@ void Archiver::ArchiveObject(Class *obj)
     }
 }
 
+void Archiver::ArchiveObject(SafePtrBase* obj)
+{
+    ArchiveSafePointer(obj);
+}
+
 void Archiver::ArchiveObjectPosition(LightClass *obj)
 {
     int index = 0;
@@ -1014,6 +1082,7 @@ fileSize_t Archiver::ReadSize(void)
     s = 0;
     if (!fileerror) {
         archivefile.Read(&s, sizeof(s));
+        LittleSwap(&s, sizeof(s));
     }
 
     return s;
@@ -1034,6 +1103,7 @@ void Archiver::CheckSize(int type, fileSize_t size)
 
 void Archiver::WriteSize(fileSize_t size)
 {
+    LittleSwap(&size, sizeof(size));
     archivefile.Write(&size, sizeof(fileSize_t));
 }
 
@@ -1043,6 +1113,7 @@ int Archiver::ReadType(void)
 
     if (!fileerror) {
         archivefile.Read(&t, sizeof(t));
+        t = LittleLong(t);
 
         return t;
     }
@@ -1052,7 +1123,8 @@ int Archiver::ReadType(void)
 
 void Archiver::WriteType(int type)
 {
-    archivefile.Write(&type, sizeof(type));
+    int nt = LittleLong(type);
+    archivefile.Write(&nt, sizeof(nt));
 }
 
 void Archiver::CheckType(int type)
@@ -1061,29 +1133,34 @@ void Archiver::CheckType(int type)
 
     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);
+    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
-#ifdef ARCHIVE_USE_TYPES
-        CheckType(type);
-#endif
-
         if (!fileerror && size) {
             m_iNumBytesIO += size;
             archivefile.Read(data, size);
@@ -1092,9 +1169,6 @@ void Archiver::ArchiveData(int type, void *data, size_t size)
 #ifndef NDEBUG
         CheckWrite();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-        WriteType(type);
-#endif
 
         if (!fileerror && size) {
             m_iNumBytesIO += size;
diff --git a/code/fgame/archive.h b/code/fgame/archive.h
index c2c7b120..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,8 +22,7 @@ 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"
@@ -154,6 +153,7 @@ public:
 
     void ArchiveRaw(void *data, size_t size);
     void ArchiveObject(Class *obj);
+    void ArchiveObject(SafePtrBase *obj); // Added in OPM
 
     qboolean ObjectPositionExists(void *obj);
 
@@ -167,23 +167,29 @@ public:
 template<class Type>
 inline void Container<Type>::Archive(Archiver& arc, void (*ArchiveFunc)(Archiver& arc, Type *obj))
 {
-    int num;
-    int i;
+    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++) {
+            obj = new (objlist + i) Type();
+            ArchiveFunc(arc, obj);
+        }
+    } else {
+        num = numobjects;
+        arc.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+            ArchiveFunc(arc, &objlist[i]);
+        }
     }
 }
 
@@ -287,7 +293,7 @@ void con_set<key, value>::Archive(Archiver& arc)
 
     if (arc.Loading()) {
         if (tableLength != 1) {
-            table = new Entry *[tableLength]();
+            table = new (NewTable(tableLength)) Entry *[tableLength]();
             memset(table, 0, tableLength * sizeof(Entry *));
         }
 
@@ -303,7 +309,7 @@ void con_set<key, value>::Archive(Archiver& arc)
 
         defaultEntry = e;
     } else {
-#ifndef NDEBUG
+#    ifndef NDEBUG
         int total;
 
         total = 0;
@@ -316,13 +322,13 @@ void con_set<key, value>::Archive(Archiver& arc)
         }
         // it must match the number of elements
         assert(total == count);
-#else
+#    else
         for (i = 0; i < tableLength; i++) {
             for (e = table[i]; e != NULL; e = e->next) {
                 e->Archive(arc);
             }
         }
-#endif
+#    endif
     }
 }
 
@@ -342,5 +348,3 @@ void con_map<key, value>::Archive(Archiver& arc)
         arc.ArchiveInteger(&tempInt); \
         (thing) = (type)tempInt;      \
     }
-
-#endif // __ARCHIVE_H__
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 65717b76..6163ce32 100644
--- a/code/fgame/beam.cpp
+++ b/code/fgame/beam.cpp
@@ -104,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
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 7db944cc..93ed4584 100644
--- a/code/fgame/bg_local.h
+++ b/code/fgame/bg_local.h
@@ -22,70 +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	const vec3_t MINS;
-extern	const vec3_t MAXS;
+extern const vec3_t MINS;
+extern const vec3_t MAXS;
 
-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 );
+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 65018c92..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,31 +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;
 
-const vec3_t MINS = { -15, -15, 0 };
-const vec3_t MAXS = { 15, 15, 94 };
+const vec3_t MINS = {-15, -15, 0};
+const vec3_t MAXS = {15, 15, 94};
 
-int		c_pmove = 0;
+int c_pmove = 0;
 
 /*
 ===============
@@ -59,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++;
 }
 
 /*
@@ -96,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) {}
 
 /*
 ==================
@@ -123,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
@@ -172,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
@@ -249,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
@@ -279,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;
 }
 
 //============================================================================
@@ -313,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;
+    }
 }
 
 /*
@@ -399,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;
 }
 
 /*
@@ -419,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);
+    }
 }
 
 /*
@@ -605,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);
 }
 
 /*
@@ -696,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;
+        }
+    }
 }
 
 //============================================================================
@@ -801,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;
+        }
+    }
 }
 
 /*
@@ -892,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;
 }
 
 /*
@@ -936,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;
+            }
+        }
+    }
 }
 
 /*
@@ -1085,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
+        }
+    }
 }
 
 /*
@@ -1247,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) {}
 
 /*
 ==============
@@ -1310,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
@@ -1329,9 +1214,7 @@ PM_Weapon
 Generates weapon events and modifes the weapon counter
 ==============
 */
-static void PM_Weapon( void ) {
-	
-}
+static void PM_Weapon(void) {}
 
 /*
 ================
@@ -1339,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;
 }
 
 /*
@@ -1362,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
@@ -1410,242 +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(fLeanAngle >= fAngle) {
-				fLeanAngle = fAngle;
-			}
+            if (fLeanAngle >= fAngle) {
+                fLeanAngle = fAngle;
+            }
 
-			pm->ps->fLeanAngle -= fLeanAngle;
-			if (pm->ps->fLeanAngle > 0) {
-				pm->ps->fLeanAngle = 0;
-			}
-		}
-		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(fLeanAngle <= fAngle) {
-				fLeanAngle = fAngle;
-			}
+            if (fLeanAngle <= fAngle) {
+                fLeanAngle = fAngle;
+            }
 
             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();
 }
 
 /*
@@ -1655,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]);
@@ -1875,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;
@@ -1885,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 079c74b7..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.
 
@@ -29,15 +30,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define GAME_VERSION "mohaa-base-1"
 
-static const unsigned int MINS_X = -15;
-static const unsigned int MINS_Y = -15;
-static const unsigned int MINS_Z = 0; // IneQuation: bounding box and viewheights to match MoHAA
-static const unsigned int MAXS_X = 15;
-static const unsigned int MAXS_Y = 15;
-static const unsigned int MAXS_Z = 96;
+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;
 
-static const unsigned int DEAD_MINS_Z           = 32;
-static const unsigned int CROUCH_MAXS_Z         = 49;
 static const unsigned int DEFAULT_VIEWHEIGHT    = 82;
 static const unsigned int CROUCH_RUN_VIEWHEIGHT = 64;
 static const unsigned int JUMP_START_VIEWHEIGHT = 52;
@@ -257,7 +258,7 @@ 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
@@ -559,7 +560,8 @@ movement on the server game.
         TEAM_SPECTATOR,
         TEAM_FREEFORALL,
         TEAM_ALLIES,
-        TEAM_AXIS
+        TEAM_AXIS,
+        TEAM_MAX
     } teamtype_t;
 
     typedef enum {
@@ -604,32 +606,39 @@ movement on the server game.
 
 #define DM_FLAG(flag)             (g_gametype->integer != GT_SINGLE_PLAYER && ((int)dmflags->integer & (flag)))
 
-// content masks
+    //
+    // 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_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)
-#define MASK_WATER        (CONTENTS_WATER | CONTENTS_LAVA | CONTENTS_SLIME)
-#define MASK_OPAQUE       (CONTENTS_SOLID | CONTENTS_SLIME | CONTENTS_LAVA)
+#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)
@@ -643,7 +652,7 @@ movement on the server game.
 #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)
@@ -652,13 +661,19 @@ movement on the server game.
      | 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_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
+    (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_ITEM          (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
-#define MASK_TRANSITION \
-    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_NOTTEAM1 | 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)
@@ -699,6 +714,17 @@ movement on the server game.
      | 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)
+
+//
+// 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);
 
@@ -744,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 {
@@ -786,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,
     };
 
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 0edff416..8c9e20bb 100644
--- a/code/fgame/bg_voteoptions.cpp
+++ b/code/fgame/bg_voteoptions.cpp
@@ -114,7 +114,7 @@ void VoteOptions::SetupVoteOptions(const char *configFileName, int length, const
     if (length >= MAX_VOTEOPTIONS_BUFFER_LENGTH) {
         Com_Error(
             ERR_DROP,
-            "VoteOptions: Options file '%s' is too big. Max size is %i bytes\n",
+            "VoteOptions: Options file '%s' is too big. Max size is %lu bytes\n",
             configFileName,
             MAX_VOTEOPTIONS_BUFFER_LENGTH
         );
@@ -254,7 +254,7 @@ void VoteOptions::ParseVoteOptions()
                 } else {
                     newOption->m_pListItem = newListItem;
                 }
-                listItem = newListItem;
+                listItem                 = newListItem;
                 newListItem->m_sItemName = token;
 
                 if (!script.TokenAvailable(false)) {
@@ -568,7 +568,7 @@ void CG_PushCallVoteSubClient_f(void)
         VO_ExecuteCommand(
             va("globalwidgetcommand voteclientlist additem \"%i: %s\" \"callvote %i %i;popmenu 0\"\n",
                i,
-               cg.clientinfo[i],
+               cg.clientinfo[i].name,
                index,
                i)
         );
diff --git a/code/fgame/bg_voteoptions.h b/code/fgame/bg_voteoptions.h
index 0d73ebeb..8c69377e 100644
--- a/code/fgame/bg_voteoptions.h
+++ b/code/fgame/bg_voteoptions.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #pragma once
 
 #ifdef __cplusplus
-#  include "listener.h"
+#    include "listener.h"
 #endif
 
 #include "g_public.h"
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 91713ab4..11e41355 100644
--- a/code/fgame/bspline.cpp
+++ b/code/fgame/bspline.cpp
@@ -576,6 +576,8 @@ SplinePath::~SplinePath()
 
     assert(owner == this);
     assert(next == NULL);
+
+    entflags &= ~ECF_SPLINEPATH;
 }
 
 void SplinePath::SetLoop(Event *ev)
@@ -602,9 +604,18 @@ void SplinePath::CreatePath(Event *ev)
     target = Target();
     if (target[0]) {
         ent = (Entity *)G_FindTarget(NULL, target);
-        if (ent) {
-            next        = (SplinePath *)ent;
+        if (ent && ent->IsSubclassOfSplinePath()) {
+            next = (SplinePath *)ent;
+
+            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);
+            }
+
             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);
         }
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 1f118927..83ac8b20 100644
--- a/code/fgame/camera.cpp
+++ b/code/fgame/camera.cpp
@@ -725,6 +725,7 @@ Camera::Camera()
     fadeTime       = 2.0f;
     fovFadeTime    = 1.0f;
     followFadeTime = 1.0f;
+    watchFadeTime  = 1.0f;
     m_bShowquakes  = false;
 
     setSolidType(SOLID_NOT);
@@ -1410,11 +1411,11 @@ void Camera::SetAutoStateEvent(Event *ev)
         char  com_token[MAX_QPATH];
         char  com_buffer[MAX_STRING_CHARS];
 
-        strcpy(com_buffer, ev->GetString(i));
+        Q_strncpyz(com_buffer, ev->GetString(i), sizeof(com_buffer));
         buffer = com_buffer;
         // 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;
             }
diff --git a/code/fgame/camera.h b/code/fgame/camera.h
index c0f077ff..fafde254 100644
--- a/code/fgame/camera.h
+++ b/code/fgame/camera.h
@@ -241,7 +241,7 @@ protected:
     Vector       CalculatePosition(void);
     Vector       CalculateOrientation(void);
     float        CalculateFov(void);
-    virtual void bind(Entity *master, qboolean use_my_angles = false);
+    virtual void bind(Entity *master, qboolean use_my_angles = false) override;
     void         unbind(void) override;
 
 public:
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 b7393f1a..2b161b2e 100644
--- a/code/fgame/crateobject.cpp
+++ b/code/fgame/crateobject.cpp
@@ -132,29 +132,25 @@ void CrateObject::TellNeighborsToFall(void)
     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;
-
-    vMaxs[0] = maxs[0] + origin[0] - 6.0f;
-    vMaxs[1] = maxs[1] + origin[1] - 6.0f;
-    vMaxs[2] = maxs[2] + origin[2] + 12.0f;
+    vMins = origin + mins + Vector(6, 6, 6);
+    vMaxs = origin + maxs + Vector(-6, -6, 12);
 
     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;
+        }
 
-            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);
         }
     }
 }
@@ -166,13 +162,8 @@ void CrateObject::TellNeighborsToJitter(Vector vJitterAdd)
     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;
-
-    vMaxs[0] = maxs[0] + origin[0] - 6.0f;
-    vMaxs[1] = maxs[1] + origin[1] - 6.0f;
-    vMaxs[2] = maxs[2] + origin[2] + 12.0f;
+    vMins = origin + mins + Vector(6, 6, 6);
+    vMaxs = origin + maxs + Vector(-6, -6, 12);
 
     for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
         CrateObject *crate = (CrateObject *)pEnt;
@@ -182,17 +173,16 @@ void CrateObject::TellNeighborsToJitter(Vector vJitterAdd)
         if (pEnt == this) {
             continue;
         }
-
         if (!pEnt->IsSubclassOfCrateObject()) {
             continue;
         }
 
-        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 (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;
         }
 
-        crate->m_vJitterAngles[0] = m_vJitterAngles[0] + vJitterAdd[0];
+        crate->m_vJitterAngles[0] += vJitterAdd[0];
 
         if (crate->m_vJitterAngles[0] > m_fJitterScale * 1.25f
             || -(m_fJitterScale * 1.25f) <= crate->m_vJitterAngles[0]) {
@@ -244,12 +234,8 @@ void CrateObject::CrateSetup(Event *ev)
             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]) {
+        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,
@@ -276,9 +262,11 @@ void CrateObject::CrateDebrisType(Event *ev)
 
 void CrateObject::StartFalling(Event *ev)
 {
-    setMoveType(MOVETYPE_FLY);
     m_fMoveTime = 0;
 
+    setMoveType(MOVETYPE_TOSS);
+    setSolidType(SOLID_BBOX);
+
     PostEvent(EV_Crate_Think, level.frametime);
 
     if (!(spawnflags & CRATE_NOTSTACKEDON)) {
@@ -292,12 +280,13 @@ void CrateObject::CrateFalling(Event *ev)
         m_fMoveTime = level.time + 2.0f;
     }
 
-    if (level.time <= m_fMoveTime) {
+    if (m_fMoveTime >= level.time) {
         PostEvent(EV_Crate_Think, level.frametime);
-    } else {
-        setMoveType(MOVETYPE_PUSH);
-        setSolidType(SOLID_BSP);
+        return;
     }
+
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_BSP);
 }
 
 void CrateObject::CrateDamaged(Event *ev)
@@ -419,40 +408,42 @@ void CrateObject::CrateThink(Event *ev)
     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;
+            if (m_vJitterAngles[0] < 0) {
+                m_vJitterAngles[0] = 0;
             }
-        } else if (m_vJitterAngles[0] < 0.0f) {
-            m_vJitterAngles[0] += 1 / 3 * m_fJitterScale;
+        } 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];
 
-        if (m_vJitterAngles[2] > 0.0f) {
+        if (m_vJitterAngles[2] > 0) {
             m_vJitterAngles[2] -= 1 / 3 * m_fJitterScale;
 
-            if (m_vJitterAngles[2] > 0.0f) {
-                m_vJitterAngles[2] = 0.0f;
+            if (m_vJitterAngles[2] < 0) {
+                m_vJitterAngles[2] = 0;
             }
-        } else if (m_vJitterAngles[2] < 0.0f) {
-            m_vJitterAngles[2] += 1 / 3 * m_fJitterScale;
+        } 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];
-
-        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/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 2603edb5..029ace6c 100644
--- a/code/fgame/damagemodel.cpp
+++ b/code/fgame/damagemodel.cpp
@@ -286,7 +286,7 @@ void DamageModel::SpawnOrientedBoundingBox(Event *ev)
     yawoffset = ev->GetFloat(3);
 
     boundingBoxEnt = new Entity();
-    boundingBoxEnt->edict->r.svFlags |= SVF_PORTAL;
+    boundingBoxEnt->edict->r.svFlags |= SVF_SENDPVS;
     boundingBoxEnt->edict->s.eFlags |= EF_LINKANGLES;
     boundingBoxEnt->edict->r.contents = CONTENTS_SOLID;
     boundingBoxEnt->setSolidType(SOLID_BBOX);
diff --git a/code/fgame/damagemodel.h b/code/fgame/damagemodel.h
index eba9bf65..2190568d 100644
--- a/code/fgame/damagemodel.h
+++ b/code/fgame/damagemodel.h
@@ -39,7 +39,7 @@ public:
 
     void Setup(Event *ev);
     void Damaged(Event *ev);
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void KillTrace(Event *ev);
     void SpawnOrientedBoundingBox(Event *ev);
     void EventSetKillThread(Event *ev);
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 65b50e78..dcd87a6d 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -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) {
@@ -271,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;
@@ -285,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;
     }
 
@@ -457,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;
@@ -475,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;
         }
     }
 
@@ -495,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;
@@ -532,7 +530,7 @@ bool DM_Team::IsDead(void) const
         return false;
     }
 
-    if (g_gametype->integer == GT_TOW) {
+    if (g_gametype->integer == GT_TOW || g_gametype->integer == GT_LIBERATION) {
         if (dmManager.AllowTeamRespawn(m_teamnumber)) {
             return false;
         }
@@ -626,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) {
@@ -667,10 +669,11 @@ DM_Manager::DM_Manager()
     m_csTeamBombPlantSide  = STRING_DRAW;
     m_iNumTargetsToDestroy = 1;
     m_iNumTargetsDestroyed = 0;
-    m_iNumBombsPlanted     = 0; 
+    m_iNumBombsPlanted     = 0;
     m_bAllowAxisRespawn    = true;
     m_bAllowAlliedRespawn  = true;
     m_bRoundActive         = false;
+    m_iTotalMapTime        = 0;
 }
 
 DM_Manager::~DM_Manager() {}
@@ -1048,11 +1051,11 @@ void DM_Manager::InitGame(void)
     }
 
     for (i = 1; i <= level.m_SimpleArchivedEntities.NumObjects(); i++) {
-        SimpleArchivedEntity* const ent = level.m_SimpleArchivedEntities.ObjectAt(i);
-        const char* const classname = ent->getClassID();
+        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);
+            PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
             m_team_spectator.m_spawnpoints.AddObject(spawnpoint);
             m_team_freeforall.m_spawnpoints.AddObject(spawnpoint);
 
@@ -1062,16 +1065,16 @@ void DM_Manager::InitGame(void)
             }
         } else if (!Q_stricmp(classname, "info_player_allied")) {
             if (g_gametype->integer >= GT_TEAM) {
-                PlayerStart* const spawnpoint = static_cast<PlayerStart*>(ent);
+                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);
+                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);
+            PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
             m_team_freeforall.m_spawnpoints.AddObject(spawnpoint);
         }
     }
@@ -1100,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;
             }
 
@@ -1213,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 {
@@ -1237,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) {
@@ -1246,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;
                 }
@@ -1320,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 {
@@ -1404,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();
@@ -1534,7 +1539,7 @@ void DM_Manager::StartRound(void)
     }
 
     m_fRoundEndTime = 0.0f;
-    m_bRoundActive = true;
+    m_bRoundActive  = true;
 
     // respawn all players
     for (i = 0, ent = g_entities; i < game.maxclients; i++, ent++) {
@@ -1620,7 +1625,8 @@ float DM_Manager::GetMatchStartTime(void)
         return m_fRoundTime;
     }
 
-    if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE || g_gametype->integer == GT_LIBERATION) {
+    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;
@@ -1711,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;
     }
 }
 
@@ -1789,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)
@@ -1837,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;
         }
 
@@ -1864,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);
@@ -1882,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;
         }
 
@@ -1894,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;
     }
 
@@ -1916,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);
@@ -1956,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(
@@ -1967,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)
             );
         }
 
@@ -1977,7 +1983,8 @@ 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()
diff --git a/code/fgame/dm_manager.h b/code/fgame/dm_manager.h
index 55a72e28..087ea5b0 100644
--- a/code/fgame/dm_manager.h
+++ b/code/fgame/dm_manager.h
@@ -179,8 +179,8 @@ private:
     int m_iNumBombsPlanted;
     int m_iTotalMapTime;
 
-    bool m_bAllowAxisRespawn;
     bool m_bAllowAlliedRespawn;
+    bool m_bAllowAxisRespawn;
     bool m_bRoundActive;
 
     // scoreboard data
diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 86296580..fe95e0a5 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -177,9 +177,9 @@ Event EV_Door_OpenEnd
     "Called when the door finishes opening.",
     EV_NORMAL
 );
-Event EV_Door_IsOpen
+Event EV_Door_IsOpen // Added in 2.30
 (
-    "isopen",
+    "isOpen",
     EV_DEFAULT,
     NULL,
     NULL,
@@ -301,6 +301,7 @@ CLASS_DECLARATION(ScriptSlave, Door, "NormalDoor") {
     {&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           },
@@ -343,9 +344,6 @@ Door::Door()
 
     SetDoorType("wood");
 
-    traveltime = 1.0f;
-    speed      = 1.0f / traveltime;
-
     wait = (spawnflags & DOOR_TOGGLE) ? 0 : 3;
     dmg  = 0;
 
@@ -393,6 +391,14 @@ void Door::SetDoorType(str s)
     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::EventDoorType(Event *ev)
@@ -563,7 +569,7 @@ qboolean Door::isCompletelyClosed(void)
 
 void Door::GetIsOpen(Event *ev)
 {
-    ev->AddInteger(isOpen());
+    ev->AddInteger(!isCompletelyClosed());
 }
 
 void Door::OpenEnd(Event *ev)
@@ -578,6 +584,10 @@ void Door::OpenEnd(Event *ev)
     } else {
         StopSound(CHAN_VOICE);
     }
+    
+    // Added in 2.30
+    //  Notify scripts that the door has finished opening
+    Unregister(STRING_DONE);
 
     previous_state = state;
     SetState(STATE_OPEN);
@@ -593,6 +603,12 @@ void Door::OpenEnd(Event *ev)
 
 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);
@@ -600,15 +616,15 @@ void Door::CloseEnd(Event *ev)
         StopSound(CHAN_VOICE);
     }
 
-    if (master == this) {
-        gi.AdjustAreaPortalState(this->edict, false);
-    }
-
     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)
@@ -734,7 +750,7 @@ void Door::DoorUse(Event *ev)
     if (health || (spawnflags & (DOOR_AUTO_OPEN | DOOR_TARGETED)) || other->IsSubclassOfActor()) {
         if (other->IsSubclassOfSentient() && (state == STATE_CLOSED)) {
             if (health) {
-                gi.SendServerCommand(0, "print \"This door is jammed.\"");
+                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);
             }
@@ -831,7 +847,20 @@ void Door::DoorBlocked(Event *ev)
 
         if (state == STATE_OPENING || state == STATE_OPEN) {
             spawnflags &= ~DOOR_START_OPEN;
+
+            const bool bIsMoving = EventPending(EV_MoveDone);
             ProcessEvent(EV_Door_Close);
+
+            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);
@@ -843,6 +872,8 @@ void Door::DoorBlocked(Event *ev)
 void Door::FieldTouched(Event *ev)
 {
     Entity *other;
+    Actor* otherActor;
+    float dist;
 
     other = ev->GetEntity(1);
 
@@ -850,41 +881,45 @@ void Door::FieldTouched(Event *ev)
         return;
     }
 
-    if (other->IsSubclassOfActor()) {
-        Actor* otherActor = static_cast<Actor*>(other);
-        float dist;
-
-        otherActor->m_Path.ForceShortLookahead();
-
-        if (state == STATE_OPENING) {
-            otherActor->m_maxspeed = speed * 64;
-        }
-
-        if ((state != STATE_OPEN) && !(spawnflags & DOOR_AUTO_OPEN) && !other->isSubclassOf(Actor)) {
+    if (!other->IsSubclassOfActor()) {
+        if ((spawnflags & DOOR_TOGGLE) || (state != STATE_OPEN && !(spawnflags & DOOR_AUTO_OPEN))) {
             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;
-        }
+        TryOpen(ev);
+        return;
+    }
 
-        if (other->absmax[0] < absmin[0] - dist) {
-            return;
-        }
-        if (other->absmax[1] < absmin[1] - dist) {
-            return;
-        }
-        if (other->absmax[2] < absmin[2]) {
-            return;
-        }
-    } else if ((state != STATE_OPEN) && !(spawnflags & DOOR_AUTO_OPEN) && !other->isSubclassOf(Actor)) {
+    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;
     }
 
@@ -1095,10 +1130,7 @@ void Door::LinkDoors(Event *ev)
         return;
     }
 
-    // Don't spawn trigger field when set to toggle
-    if (!(spawnflags & DOOR_TOGGLE)) {
-        SpawnTriggerField(cmins, cmaxs);
-    }
+    SpawnTriggerField(cmins, cmaxs);
 }
 
 void Door::SetTime(Event *ev)
@@ -1207,13 +1239,13 @@ void Door::ShowInfo(float fDot, float fDist)
         return;
     }
 
-    i = sprintf(szText, "%i:%i", entnum, radnum);
+    i = Com_sprintf(szText, sizeof(szText), "%i:%i", entnum, radnum);
     if (TargetName().c_str() && TargetName()[0]) {
-        i = sprintf(szText + i, ":%s", TargetName().c_str());
+        i = Com_sprintf(szText + i, sizeof(szText) - i, ":%s", TargetName().c_str());
     }
 
     if (health != 0) {
-        i = sprintf(szText + i, ":%.1f", health);
+        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);
@@ -1311,8 +1343,6 @@ void RotatingDoor::DoOpen(Event *ev)
         } else {
             diropened = 0 - init_door_direction;
         }
-    } else {
-        diropened = -init_door_direction;
     }
 
     if (diropened < 0.0f) {
@@ -1321,7 +1351,16 @@ void RotatingDoor::DoOpen(Event *ev)
         ang = startangle - Vector(0.0f, angle, 0.0f);
     }
 
+    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)
diff --git a/code/fgame/doors.h b/code/fgame/doors.h
index 6203e4ce..588028d5 100644
--- a/code/fgame/doors.h
+++ b/code/fgame/doors.h
@@ -118,7 +118,7 @@ public:
     Door();
     qboolean isOpen(void);
     qboolean isCompletelyClosed(void);
-    void     GetIsOpen(Event *ev);
+    void     GetIsOpen(Event *ev); // Added in 2.30
     qboolean CanBeOpenedBy(Entity *ent);
     void     Archive(Archiver    &arc) override;
 };
@@ -150,8 +150,9 @@ inline void Door::Archive(Archiver& arc)
     arc.ArchiveInteger(&trigger);
     arc.ArchiveInteger(&nextdoor);
     arc.ArchiveSafePointer(&master);
-    arc.ArchiveBoolean(&locked);
     arc.ArchiveFloat(&next_locked_time);
+    arc.ArchiveBoolean(&locked);
+    arc.ArchiveBool(&m_bAlwaysAway);
 }
 
 class RotatingDoor : public Door
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 fe8f1d47..6dfecf6b 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -677,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
 (
@@ -686,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
 (
@@ -768,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
 );
 
@@ -778,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
@@ -805,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
@@ -814,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
@@ -823,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
@@ -832,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
 );
 
@@ -1217,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",
@@ -1226,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",
@@ -1471,6 +1474,7 @@ Event EV_Entity_SetDHack
     "Enable or disable depth hack.",
     EV_NORMAL
 );
+/*
 Event EV_Entity_GetZone
 (
     "getzone",
@@ -1498,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",
@@ -1526,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              },
@@ -1624,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              },
@@ -1645,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        },
@@ -1667,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                              }
 };
 
@@ -1779,7 +1791,9 @@ Entity::Entity()
     m_iNumBlockedPaths   = 0;
     m_BlockedPaths       = NULL;
 
+#ifdef OPM_FEATURES
     m_bHintRequiresLookAt = true;
+#endif
 }
 
 Entity::~Entity()
@@ -1843,8 +1857,8 @@ Entity::~Entity()
     }
 
     if (m_BlockedPaths) {
-        delete m_BlockedPaths;
-        m_BlockedPaths = 0;
+        delete[] m_BlockedPaths;
+        m_BlockedPaths = NULL;
     }
 
     level.FreeEdict(edict);
@@ -1853,13 +1867,11 @@ Entity::~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);
@@ -2123,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);
     }
 }
 
@@ -2689,7 +2673,7 @@ void Entity::DamageEvent(Event *ev)
     Vector  momentum;
     Vector  position, direction, normal;
     int     knockback, damageflags, meansofdeath, location;
-    Event  *event;
+    Event   event;
     float   m;
     EntityPtr This;
 
@@ -2775,67 +2759,79 @@ void Entity::DamageEvent(Event *ev)
 
     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);
+            }
         }
 
         if (!This) {
             return;
         }
 
-        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);
+        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;
@@ -2866,20 +2862,20 @@ 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);
     }
 }
 
@@ -3016,7 +3012,6 @@ void Entity::FadeIn(Event *ev)
 
     if (ev->NumArgs() > 0) {
         rate = ev->GetFloat(1);
-        assert(rate);
         if (rate > 0) {
             rate = FRAMETIME / rate;
         }
@@ -3052,7 +3047,6 @@ void Entity::Fade(Event *ev)
 
     if (ev->NumArgs() > 0) {
         rate = ev->GetFloat(1);
-        assert(rate);
         if (rate > 0) {
             rate = FRAMETIME / rate;
         }
@@ -3217,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);
@@ -3267,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;
@@ -3297,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;
 
@@ -3317,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);
     }
 }
 
@@ -3350,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);
@@ -3602,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;
     }
@@ -3623,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 {
-                        volume = G_Random() * ret->volumeMod + volume;
-                    }
-
-                    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 (g_gametype->integer == GT_SINGLE_PLAYER && (!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",
@@ -4096,7 +4123,7 @@ void Entity::BroadcastAIEvent(int iType, float rad)
         return;
     }
 
-    G_BroadcastAIEvent(this, origin, iType, rad);
+    G_BroadcastAIEvent(this, centroid, iType, rad);
 }
 
 void Entity::BroadcastAIEvent(Event *ev)
@@ -4380,11 +4407,17 @@ 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.c_str());
+        obj->NewAnim("idle");
     }
 }
 
@@ -5057,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
@@ -5069,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);
 
@@ -5268,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)
@@ -5317,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);
@@ -5461,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);
@@ -5579,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);
@@ -5624,7 +5654,7 @@ void Entity::ConnectPaths(void)
 
     m_iNumBlockedPaths = 0;
     if (m_BlockedPaths) {
-        delete m_BlockedPaths;
+        delete[] m_BlockedPaths;
         m_BlockedPaths = NULL;
     }
 }
@@ -5703,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;
@@ -5773,7 +5811,7 @@ void Entity::Archive(Archiver& arc)
             // set the brush model
             edict->s.modelindex = atoi(model.c_str() + 1);
         } else {
-            setModel(model);
+            setModel();
         }
     }
 
@@ -5927,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:
@@ -5937,25 +5975,161 @@ 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);
+            }
+        }
     }
 }
 
@@ -6078,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));
@@ -6091,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));
@@ -6104,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));
@@ -6116,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));
@@ -6129,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));
@@ -6193,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
@@ -6209,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
@@ -6246,6 +6428,7 @@ void Entity::SetDepthHack(Event *ev)
     }
 }
 
+#ifdef OPM_FEATURES
 void Entity::ProcessHint(gentity_t *client, bool bShow)
 {
     Player *player = (Player *)client->entity;
@@ -6284,35 +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) {
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].index = gi.soundindex(name.c_str(), ret->streamed);
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].volume = G_Random() * ret->volumeMod + ret->volume * volume;
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].minDist = ret->dist;
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].maxDist = ret->maxDist;
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].pitch = G_Random() * ret->pitchMod + ret->pitch;
+        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 cd9b1f12..3291a791 100644
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
@@ -51,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
@@ -81,7 +82,8 @@ enum eAIEvent {
     AI_EVENT_MISC_LOUD,
     AI_EVENT_FOOTSTEP,
     AI_EVENT_GRENADE,
-    AI_EVENT_BADPLACE // Added in 2.0
+    AI_EVENT_BADPLACE, // Added in 2.0
+    AI_EVENT_MAX
 };
 
 //deadflag
@@ -285,6 +287,7 @@ public:
     // immune list
     Container<int> immunities;
 
+#ifdef OPM_FEATURES
     //
     // Added in OPM
     //====
@@ -292,6 +295,13 @@ public:
     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();
@@ -502,7 +512,7 @@ public:
     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);
@@ -640,9 +650,11 @@ 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);
 };
 
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/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 7218e4db..ccb0e3f7 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.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.
 
@@ -63,12 +63,12 @@ gentity_t free_edicts;
 int sv_numtraces   = 0;
 int sv_numpmtraces = 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;
+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;
@@ -83,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...
@@ -212,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);
@@ -240,7 +259,7 @@ 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);
@@ -251,18 +270,17 @@ void G_InitGame(int levelTime, int randomSeed)
 
     // set some level globals
     level.svsStartTime = levelTime;
-    level.specialgame  = sv_specialgame->integer ? true : false;
 
     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();
     }
@@ -277,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();
+    }
 }
 
 /*
@@ -288,8 +312,6 @@ G_SpawnEntities
 void G_SpawnEntities(char *entities, int svsTime)
 {
     level.SpawnEntities(entities, svsTime);
-
-    G_SpawnBots();
 }
 
 /*
@@ -321,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);
@@ -333,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);
@@ -360,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());
+    }
 }
 
 /*
@@ -426,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;
 
@@ -456,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;
                 }
@@ -497,7 +517,7 @@ void G_RunFrame(int levelTime, int frameTime)
             assert(edict->inuse);
             assert(edict->entity);
 
-            Actor *actor = static_cast<Actor*>(edict->entity);
+            Actor *actor = static_cast<Actor *>(edict->entity);
             if (actor->IsSubclassOfActor()) {
                 actor->m_bUpdateAnimDoneFlags = false;
                 if (actor->m_bAnimating) {
@@ -546,11 +566,7 @@ 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) {
             for (num = edict->s.parent; num != ENTITYNUM_NONE; num = g_entities[num].s.parent) {
@@ -688,11 +704,13 @@ void G_RunFrame(int levelTime, int frameTime)
             }
         }
 
-        //
-        // Added in OPM
-        //
-        // Add or delete bots that were added using addbot/removebot
-        G_SpawnBots();
+        if (level.Spawned()) {
+            //
+            // Added in OPM
+            //
+            // Add or delete bots that were added using addbot/removebot
+            G_SpawnBots();
+        }
     }
 
     catch (const char *error) {
@@ -712,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;
     }
 
@@ -733,27 +751,89 @@ 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)
 {
-    // FIXME: unimplemented
+    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)
@@ -781,35 +861,55 @@ 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)
@@ -818,6 +918,9 @@ void G_Restart(void)
 
     // Added in 2.0
     G_ResetSmokeSprites();
+
+    // Added in OPM
+    G_RestartBots();
 }
 
 void G_SetFrameNumber(int framenum)
@@ -893,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;
@@ -904,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);
@@ -940,6 +1047,9 @@ 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;
 }
 
@@ -1024,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;
         }
@@ -1211,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;
@@ -1255,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);
 
@@ -1318,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++;
             }
         }
 
@@ -1334,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
@@ -1357,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);
 
-        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"));
-        }
-
         if (arc.Loading()) {
             // Make sure all code that needs to setup the player after they have been loaded is run
 
@@ -1387,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;
     }
 
@@ -1402,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;
 }
 
@@ -1424,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;
@@ -1535,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;
@@ -1589,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;
@@ -1604,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;
     }
 
@@ -1643,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";
@@ -1663,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;
@@ -1679,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
@@ -1702,7 +1920,7 @@ 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
@@ -1714,10 +1932,10 @@ void G_ExitLevel(void)
             gi.SendConsoleCommand(command);
         } 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);
         }
@@ -1744,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) {
@@ -1761,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())) {
@@ -1773,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 {
@@ -1784,6 +2022,11 @@ void G_CheckExitRules(void)
     }
 }
 
+/*
+===============
+G_DisplayScoresToAllClients
+===============
+*/
 void G_DisplayScoresToAllClients(void)
 {
     gentity_t *ent;
@@ -1798,6 +2041,11 @@ void G_DisplayScoresToAllClients(void)
     }
 }
 
+/*
+===============
+G_HideScoresToAllClients
+===============
+*/
 void G_HideScoresToAllClients(void)
 {
     gentity_t *ent;
diff --git a/code/fgame/g_main.h b/code/fgame/g_main.h
index 1c31728d..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"
@@ -55,5 +54,3 @@ void G_AllocGameData(void);
 void G_DeAllocGameData(void);
 void G_ClientDrawBoundingBoxes(void);
 void G_ClientDrawTags(void);
-
-#endif /* g_main.h */
diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp
index 9bdcdb90..785324c4 100644
--- a/code/fgame/g_mmove.cpp
+++ b/code/fgame/g_mmove.cpp
@@ -49,8 +49,8 @@ void MM_ClipVelocity(float *in, float *normal, float *out, float overbounce)
             return;
         }
 
-        normal2[0] = in[0] + DotProduct2D(in, normal);
-        normal2[1] = in[1] + DotProduct2D(in, normal);
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
         normal2[2] = normal[2] * DotProduct2D(in, in);
 
         VectorNormalize(normal2);
@@ -211,6 +211,8 @@ qboolean MM_SlideMove(qboolean gravity)
             //
             // 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++) {
@@ -227,10 +229,14 @@ qboolean MM_SlideMove(qboolean gravity)
                         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) {
+                    // slide along the plane
+                    MM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
+
+                    if (DotProduct(clipVelocity, planes[i]) >= 0) {
                         continue; // move doesn't interact with the plane
                     }
 
@@ -246,7 +252,7 @@ qboolean MM_SlideMove(qboolean gravity)
                             continue;
                         }
 
-                        if (DotProduct(clipVelocity, planes[k]) >= 0.1f) {
+                        if (DotProduct(clipVelocity, planes[k]) >= 0.1) {
                             continue; // move doesn't interact with the plane
                         }
 
@@ -359,6 +365,7 @@ void MM_StepSlideMove(void)
     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);
@@ -398,12 +405,17 @@ void MM_StepSlideMove(void)
         bWasOnGoodGround = qfalse;
     }
 
-    start_o[2] += 18;
+    VectorCopy(start_o, up);
+    up[2] += 18;
+
     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;
 
-    VectorCopy(start_o, mm->origin);
+    VectorCopy(up, mm->origin);
     VectorCopy(start_v, mm->velocity);
 
     first_hit_wall = mm->hit_obstacle;
@@ -419,11 +431,15 @@ void MM_StepSlideMove(void)
     down[2] -= STEPSIZE * 2;
 
     // test the player position if they were a stepheight higher
-    gi.trace(&trace, start_o, mm->mins, mm->maxs, down, mm->entityNum, mm->tracemask, qtrue, qfalse);
+    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;
+
         mm->hit_obstacle = first_hit_wall;
         VectorCopy(first_hit_origin, mm->hit_origin);
         VectorCopy(first_wall_normal, mm->obstacle_normal);
@@ -481,8 +497,8 @@ void MM_ClipVelocity2D(float *in, float *normal, float *out, float overbounce)
             return;
         }
 
-        normal2[0] = in[0] + DotProduct2D(in, normal);
-        normal2[1] = in[1] + DotProduct2D(in, normal);
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
         normal2[2] = normal[2] * DotProduct2D(in, in);
 
         VectorNormalize(normal2);
diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index af01704d..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->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 (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 31a7b373..e4f235d3 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -36,29 +36,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 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_BROADCAST  0x00000004 // send to all connected clients
-#define SVF_SENDPVS    0x00000008
-#define SVF_PORTAL     0x00000010 // merge a second pvs at origin2
-#define SVF_NOTSINGLECLIENT                                                   \
-    0x00000040                      // send entity to everyone but one client \
-                                    // (entityShared_t->singleClient)
-#define SVF_MONSTER      0x00000080 // set if the entity is a bot into snapshots
-#define SVF_SINGLECLIENT 0x00000100 // only send to a single client (entityShared_t->singleClient)
-#define SVF_USEBBOX      0x00000200
-#define SVF_NOFARPLANE   0x00000400
-#define SVF_NOSERVERINFO                                           \
-    0x00000800 // don't send CS_SERVERINFO updates to this client  \
-               // so that it can be updated for ping tools without \
-               // lagging clients
-#define SVF_SENDONCE 0x00004000
-
-#define SVF_SENT     0x00008000
+#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
 
 typedef struct gclient_s   gclient_t;
 typedef struct dtiki_s     dtiki_t;
@@ -239,13 +238,18 @@ typedef struct gameImport_s {
     void (*Error)(int level, const char *format, ...);
     int (*Milliseconds)();
     const char *(*LV_ConvertString)(const char *string);
+
+    // Added in 2.0
     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);
+    void (*Cvar_CheckRange)(cvar_t* var, float min, float max, qboolean integral);
+
     int (*Argc)();
     char *(*Argv)(int arg);
     char *(*Args)();
@@ -255,12 +259,13 @@ typedef struct gameImport_s {
     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, fsOrigin_t origin);
+    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);
@@ -268,7 +273,10 @@ typedef struct gameImport_s {
     void (*FS_FreeFileList)(char **list);
     const char *(*GetArchiveFileName)(const char *fileName, const char *extension);
     void (*SendConsoleCommand)(const char *text);
+
+    // Added in 2.0
     void (*ExecuteConsoleCommand)(int exec_when, const char *text);
+
     void (*DebugGraph)(float value);
     void (*SendServerCommand)(int client, const char *format, ...);
     void (*DropClient)(int client, const char *reason);
@@ -326,7 +334,10 @@ typedef struct gameImport_s {
         qboolean     cylinder,
         qboolean     traceDeep
     );
+
+    // Added in 2.0
     float (*CM_VisualObfuscation)(const vec3_t start, const vec3_t end);
+
     baseshader_t *(*GetShader)(int shaderNum);
     int (*pointcontents)(const vec3_t p, int passEntityNum);
     int (*PointBrushnum)(const vec3_t p, clipHandle_t model);
@@ -346,7 +357,10 @@ typedef struct gameImport_s {
         int          entityNum,
         int          contentMask
     );
+
+    // 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);
@@ -370,9 +384,16 @@ typedef struct gameImport_s {
     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);
@@ -452,7 +473,7 @@ typedef struct gameImport_s {
     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 (*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);
@@ -460,7 +481,13 @@ typedef struct gameImport_s {
     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);
+    qboolean (*SanitizeName)(const char *oldName, char *newName, size_t bufferSize);
+
+    //
+    // Added in OPM
+    //
+
+    int (*pvssoundindex)(const char* name, int streamed);
 
     cvar_t *fsDebug;
 
@@ -490,7 +517,7 @@ typedef struct gameExport_s {
 
     // 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);
+    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);
@@ -520,8 +547,8 @@ typedef struct gameExport_s {
     // 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);
+    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);
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 4ec7a182..6875eb29 100644
--- a/code/fgame/g_spawn.cpp
+++ b/code/fgame/g_spawn.cpp
@@ -316,12 +316,20 @@ Returns pointer to Entity
 
 Listener *SpawnArgs::Spawn(void)
 {
-    Listener *ent = (Listener *)SpawnInternal();
+    SafePtr<Listener> ent = (Listener *)SpawnInternal();
+	if (!ent) {
+		return NULL;
+	}
 
-    if (ent) {
-        ent->ProcessPendingEvents();
-        ent->ProcessEvent(EV_Entity_Start);
-    }
+	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;
+	}
+
+	ent->ProcessEvent(EV_Entity_Start);
 
     return ent;
 }
@@ -543,7 +551,7 @@ Listener *SpawnArgs::SpawnInternal(void)
     }
 
     t2 = gi.Milliseconds();
-    if (t2 - t2 >= 100) {
+    if (t2 - t1 >= 100) {
         //
         // above 100 ms send a message to console
         //
@@ -853,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;
 	}
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 7eb27bf1..c7ed568e 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -96,7 +96,6 @@ G_TouchTriggers
 ============
 */
 void G_TouchTriggers(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -142,7 +141,6 @@ to force all entities it covers to immediately touch it
 ============
 */
 void G_TouchSolids(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -171,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;
@@ -237,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;
@@ -378,7 +374,6 @@ trace_t G_Trace(
     const char      *reason,
     qboolean         tracedeep
 )
-
 {
     int     entnum;
     trace_t trace;
@@ -420,7 +415,6 @@ trace_t G_Trace(
     const char   *reason,
     qboolean      tracedeep
 )
-
 {
     gentity_t *ent;
     int        entnum;
@@ -466,7 +460,6 @@ void G_TraceEntities(
     int                  contentmask,
     qboolean             bIncludeTriggers
 )
-
 {
     trace_t    trace;
     vec3_t     boxmins;
@@ -544,7 +537,6 @@ Returns the distance to the nearest player from the given spot
 ================
 */
 float PlayersRangeFromSpot(Entity *spot)
-
 {
     Entity *player;
     float   bestplayerdistance;
@@ -583,7 +575,6 @@ to other players
 ================
 */
 Entity *SelectRandomDeathmatchSpawnPoint(void)
-
 {
     Entity *spot, *spot1, *spot2;
     int     count = 0;
@@ -642,7 +633,6 @@ SelectFarthestDeathmatchSpawnPoint
 ================
 */
 Entity *SelectFarthestDeathmatchSpawnPoint(void)
-
 {
     Entity *bestspot;
     float   bestdistance;
@@ -672,7 +662,6 @@ Entity *SelectFarthestDeathmatchSpawnPoint(void)
 }
 
 Entity *SelectDeathmatchSpawnPoint(void)
-
 {
     if (DM_FLAG(DF_SPAWN_FARTHEST)) {
         return SelectFarthestDeathmatchSpawnPoint();
@@ -693,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;
@@ -766,7 +754,6 @@ realcheck:
 }
 
 Entity *G_FindClass(Entity *ent, const char *classname)
-
 {
     int        entnum;
     gentity_t *from;
@@ -790,7 +777,6 @@ Entity *G_FindClass(Entity *ent, const char *classname)
 }
 
 Entity *G_FindTarget(Entity *ent, const char *name)
-
 {
     SimpleEntity *next;
 
@@ -845,7 +831,6 @@ Entity *G_FindRandomTarget(const char *name)
 }
 
 Entity *G_NextEntity(Entity *ent)
-
 {
     gentity_t *from;
 
@@ -879,7 +864,6 @@ Entity *G_NextEntity(Entity *ent)
 // just constant angles.
 //
 Vector G_GetMovedir(float angle)
-
 {
     if (angle == -1) {
         return Vector(0, 0, 1);
@@ -918,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
@@ -927,7 +939,6 @@ of ent.  Ent should be unlinked before calling this!
 =================
 */
 qboolean KillBox(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -979,9 +990,8 @@ qboolean KillBox(Entity *ent)
 }
 
 qboolean IsNumeric(const char *str)
-
 {
-    int      len;
+    size_t   len;
     int      i;
     qboolean dot;
 
@@ -1014,7 +1024,6 @@ findradius (org, radius)
 =================
 */
 Entity *findradius(Entity *startent, Vector org, float rad)
-
 {
     Vector     eorg;
     gentity_t *from;
@@ -1069,7 +1078,6 @@ findclientinradius (org, radius)
 =================
 */
 Entity *findclientsinradius(Entity *startent, Vector org, float rad)
-
 {
     Vector     eorg;
     gentity_t *ed;
@@ -1104,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;
@@ -1122,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;
@@ -1137,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;
@@ -1155,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);
@@ -1197,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;
         }
@@ -1331,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);
@@ -1347,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;
 
@@ -1402,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);
@@ -1443,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);
 
@@ -1549,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());
     }
 }
@@ -1643,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)
@@ -1692,15 +1834,13 @@ void G_BroadcastAIEvent(Entity *originator, Vector origin, int iType, float radi
             continue;
         }
 
-        if (!ent->IsSubclassOfActor() && !ent->IsSubclassOfBot()) {
+        if (!ent->IsSubclassOfActor()) {
             continue;
         }
 
-        if (ent->IsSubclassOfActor()) {
-            act = static_cast<Actor *>(ent);
-            if (act->IgnoreSound(iType)) {
-                continue;
-            }
+        act = static_cast<Actor*>(ent);
+        if (act->IgnoreSound(iType)) {
+            continue;
         }
 
         delta = origin - ent->centroid;
@@ -1722,15 +1862,10 @@ void G_BroadcastAIEvent(Entity *originator, Vector origin, int iType, float radi
             continue;
         }
 
-        if (ent->IsSubclassOfActor()) {
-            act->ReceiveAIEvent(origin, iType, originator, dist2, r2);
-        } else if (ent->IsSubclassOfBot()) {
-            PlayerBot *bot = static_cast<PlayerBot *>(ent);
-
-            bot->NoticeEvent(origin, iType, originator, dist2, r2);
-        }
+        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
@@ -1776,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");
@@ -1793,7 +1927,6 @@ weaponhand_t WeaponHandNameToNum(str side)
 }
 
 const char *WeaponHandNumToName(weaponhand_t hand)
-
 {
     switch (hand) {
     case WEAPON_MAIN:
@@ -1806,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");
@@ -1898,7 +2030,6 @@ str G_WeaponClassNumToName(int num)
 }
 
 void G_DebugTargets(Entity *e, str from)
-
 {
     gi.DPrintf("DEBUGTARGETS:%s ", from.c_str());
 
@@ -1916,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",
@@ -1939,7 +2069,6 @@ void G_FadeOut(float delaytime)
 }
 
 void G_AutoFadeIn(void)
-
 {
     level.m_fade_time_start = 1;
     level.m_fade_time       = 1;
@@ -1952,7 +2081,6 @@ void G_AutoFadeIn(void)
 }
 
 void G_ClearFade(void)
-
 {
     level.m_fade_time = -1;
     level.m_fade_type = fadein;
@@ -1971,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;
     }
@@ -2001,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) {
@@ -2015,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) {
@@ -2055,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);
         }
     }
 }
@@ -2116,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') {
@@ -2131,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);
         }
@@ -2207,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);
     }
 }
 
@@ -2240,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);
@@ -2329,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 caaf1174..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);
@@ -124,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);
 
@@ -143,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);
@@ -324,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 ec762b88..1cdbb4a8 100644
--- a/code/fgame/g_vmove.cpp
+++ b/code/fgame/g_vmove.cpp
@@ -179,18 +179,16 @@ qboolean VM_SlideMove(qboolean gravity)
             break;
         }
 
-        if (trace.plane.normal[2] >= 0.7f) {
+        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) {
-            if (vm->vs->groundPlane) {
-                if (!vm->vs->hit_obstacle) {
-                    vm->vs->hit_obstacle = qtrue;
-                    VectorCopy(vm->vs->origin, vm->vs->hit_origin);
-                }
-
-                VectorAdd(vm->vs->obstacle_normal, trace.plane.normal, vm->vs->obstacle_normal);
+        } 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);
             }
+
+            VectorAdd(vm->vs->obstacle_normal, trace.plane.normal, vm->vs->obstacle_normal);
         }
 
         // save entity for contact
@@ -239,8 +237,8 @@ qboolean VM_SlideMove(qboolean gravity)
                     }
 
                     // slide along the plane
-                    VM_ClipVelocity(vm->vs->velocity, planes[j], clipVelocity, OVERCLIP);
-                    VM_ClipVelocity(endVelocity, planes[j], endClipVelocity, OVERCLIP);
+                    VM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
+                    VM_ClipVelocity(endClipVelocity, planes[j], endClipVelocity, OVERCLIP);
 
                     if (DotProduct(clipVelocity, planes[j]) >= 0.0f) {
                         continue; // move doesn't interact with the plane
@@ -439,11 +437,14 @@ void VM_StepSlideMove(void)
         bWasOnGoodGround = qfalse;
     }
 
+    VectorCopy(start_o, up);
+    up[2] += STEPSIZE;
+
     VectorCopy(vm->vs->origin, nostep_o);
     VectorCopy(vm->vs->velocity, nostep_v);
     memcpy(&nostep_groundTrace, &vm->vs->groundTrace, sizeof(trace_t));
 
-    VectorCopy(start_o, vm->vs->origin);
+    VectorCopy(up, vm->vs->origin);
     VectorCopy(start_v, vm->vs->velocity);
 
     first_hit_wall = vm->vs->hit_obstacle;
@@ -453,7 +454,7 @@ void VM_StepSlideMove(void)
     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);
+    VM_SlideMove(vm->vs->useGravity);
 
     VectorCopy(vm->vs->origin, down);
     down[2] -= STEPSIZE * 2;
diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp
index 00030a35..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.
 
@@ -31,18 +31,109 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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 1f931aa8..69f94876 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -42,6 +42,11 @@ typedef struct {
     qboolean allclients;
 } consolecmd_t;
 
+typedef struct {
+    const char* prefix;
+    SafePtr<Listener> master;
+} commandmaster_t;
+
 consolecmd_t G_ConsoleCmds[] = {
   //   command name       function             available in multiplayer?
     {"say",             G_SayCmd,             qtrue },
@@ -60,16 +65,22 @@ consolecmd_t G_ConsoleCmds[] = {
     {"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},
 #endif
+    //====
     {NULL,              NULL,                 qfalse}
 };
 
+Container<commandmaster_t> commandMasters;
+
 void G_InitConsoleCommands(void)
 {
     consolecmd_t *cmds;
@@ -127,7 +138,11 @@ qboolean G_ConsoleCommand(void)
             }
         }
 
-        result = G_ProcessClientCommand(ent);
+        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);
     }
@@ -155,14 +170,18 @@ qboolean G_ProcessClientCommand(gentity_t *ent)
     consolecmd_t *cmds;
     int           i;
     int           n;
-    ConsoleEvent *ev;
     Player       *player;
+    qboolean      allowDev;
 
     if (!ent || !ent->client || !ent->entity) {
         // not fully in game yet
         return qfalse;
     }
 
+    // Added in 2.1
+    //  Prevent players from messing with the server with developer commands
+    allowDev = g_gametype->integer == GT_SINGLE_PLAYER;
+
     cmd = gi.Argv(0);
 
     player                = (Player *)ent->entity;
@@ -180,20 +199,36 @@ qboolean G_ProcessClientCommand(gentity_t *ent)
     }
 
     if (Event::Exists(cmd)) {
-        ev = new ConsoleEvent(cmd);
-        ev->SetConsoleEdict(ent);
+        ConsoleEvent ev(cmd);
+        ev.SetConsoleEdict(ent);
 
         n = gi.Argc();
 
         for (i = 1; i < n; i++) {
-            ev->AddToken(gi.Argv(i));
+            ev.AddToken(gi.Argv(i));
         }
 
         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 if (ent->entity->CheckEventFlags(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);
         }
     }
@@ -201,13 +236,72 @@ qboolean G_ProcessClientCommand(gentity_t *ent)
     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;
+}
+
 /*
 ==================
 Cmd_Say_f
 ==================
 */
 void G_Say(gentity_t *ent, qboolean team, qboolean arg0)
-
 {
     int         j;
     gentity_t  *other;
@@ -271,7 +365,6 @@ void G_Say(gentity_t *ent, qboolean team, qboolean arg0)
 }
 
 qboolean G_CameraCmd(gentity_t *ent)
-
 {
     Event      *ev;
     const char *cmd;
@@ -330,7 +423,6 @@ qboolean G_SoundCmd(gentity_t *ent)
 }
 
 qboolean G_SayCmd(gentity_t *ent)
-
 {
     G_Say(ent, false, false);
 
@@ -338,7 +430,6 @@ qboolean G_SayCmd(gentity_t *ent)
 }
 
 qboolean G_EventListCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -347,13 +438,12 @@ qboolean G_EventListCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::ListCommands( mask );
+    Event::ListCommands( mask );
 
     return qtrue;
 }
 
 qboolean G_PendingEventsCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -362,13 +452,12 @@ qboolean G_PendingEventsCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::PendingEvents( mask );
+    Event::PendingEvents( mask );
 
     return qtrue;
 }
 
 qboolean G_EventHelpCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -377,13 +466,12 @@ qboolean G_EventHelpCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::ListDocumentation( mask, false );
+    Event::ListDocumentation( mask, false );
 
     return qtrue;
 }
 
 qboolean G_DumpEventsCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -392,13 +480,12 @@ qboolean G_DumpEventsCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::ListDocumentation( mask, true );
+    Event::ListDocumentation( mask, true );
 
     return qtrue;
 }
 
 qboolean G_ClassEventsCmd(gentity_t *ent)
-
 {
     const char *className;
 
@@ -408,13 +495,12 @@ qboolean G_ClassEventsCmd(gentity_t *ent)
         className = gi.Argv(1);
     } else {
         className = gi.Argv(1);
-        //ClassEvents( className );
+        ClassEvents( className, qfalse );
     }
     return qtrue;
 }
 
 qboolean G_DumpClassEventsCmd(gentity_t *ent)
-
 {
     const char *className;
 
@@ -424,31 +510,28 @@ qboolean G_DumpClassEventsCmd(gentity_t *ent)
         className = gi.Argv(1);
     } else {
         className = gi.Argv(1);
-        //ClassEvents( className, qtrue );
+        ClassEvents( className, qtrue );
     }
     return qtrue;
 }
 
 qboolean G_DumpAllClassesCmd(gentity_t *ent)
-
 {
     DumpAllClasses();
     return qtrue;
 }
 
 qboolean G_ClassListCmd(gentity_t *ent)
-
 {
-    //listAllClasses();
+    listAllClasses();
 
     return qtrue;
 }
 
 qboolean G_ClassTreeCmd(gentity_t *ent)
-
 {
     if (gi.Argc() > 1) {
-        //listInheritanceOrder( gi.Argv( 1 ) );
+        listInheritanceOrder( gi.Argv( 1 ) );
     } else {
         gi.SendServerCommand(ent - g_entities, "print \"Syntax: classtree [classname].\n\"");
     }
@@ -464,7 +547,6 @@ qboolean G_ShowVarCmd(gentity_t *ent)
 void PrintVariableList(ScriptVariableList *list) {}
 
 qboolean G_LevelVarsCmd(gentity_t *ent)
-
 {
     gi.Printf("Level Variables\n");
     PrintVariableList(level.vars);
@@ -473,7 +555,6 @@ qboolean G_LevelVarsCmd(gentity_t *ent)
 }
 
 qboolean G_GameVarsCmd(gentity_t *ent)
-
 {
     gi.Printf("Game Variables\n");
     PrintVariableList(game.vars);
@@ -489,12 +570,11 @@ qboolean G_ScriptCmd(gentity_t *ent)
     ConsoleEvent *event;
     int           numArgs;
     int           i;
-    bool          recompile;
 
     numArgs = gi.Argc();
 
     if (numArgs <= 1) {
-        gi.Printf("Usage: script [filename] ([recompile])\n");
+        gi.Printf("Usage: script [filename]\n");
         return qtrue;
     }
 
@@ -531,7 +611,8 @@ qboolean G_ScriptCmd(gentity_t *ent)
     return scriptEnt->ProcessEvent(event);
 }
 
-qboolean G_ReloadMap(gentity_t* ent) {
+qboolean G_ReloadMap(gentity_t* ent)
+{
     char name[256];
 
     Com_sprintf(name, sizeof(name), "gamemap \"%s\"\n", level.mapname.c_str());
@@ -563,12 +644,13 @@ qboolean G_AddBotCommand(gentity_t *ent)
     }
 
     numbots = atoi(gi.Argv(1));
-    if (numbots > sv_maxbots->integer) {
-        gi.Printf("addbot must be between 1-%d\n", sv_maxbots->integer);
+
+    if (numbots > game.maxclients) {
+        gi.Printf("addbot must be between 1-%d\n", game.maxclients);
         return qfalse;
     }
 
-    totalnumbots = Q_min(numbots + sv_numbots->integer, sv_maxbots->integer);
+    totalnumbots = Q_min(numbots + sv_numbots->integer, game.maxclients);
 
     gi.cvar_set("sv_numbots", va("%d", totalnumbots));
     return qtrue;
@@ -596,9 +678,9 @@ qboolean G_RemoveBotCommand(gentity_t *ent)
 qboolean G_BotCommand(gentity_t *ent)
 {
     const char *command;
-    PlayerBot  *bot;
+    BotController *bot;
 
-    if (!G_GetFirstBot() || !G_GetFirstBot()->entity) {
+    if (botManager.getControllerManager().getControllers().NumObjects() < 1) {
         gi.Printf("No bot spawned.\n");
         return qfalse;
     }
@@ -608,12 +690,12 @@ qboolean G_BotCommand(gentity_t *ent)
         return qfalse;
     }
 
-    bot = (PlayerBot *)G_GetFirstBot()->entity;
+    bot = botManager.getControllerManager().getControllers().ObjectAt(1);
 
     command = gi.Argv(1);
 
     if (!Q_stricmp(command, "movehere")) {
-        bot->MoveTo(ent->entity->origin);
+        bot->GetMovement().MoveTo(ent->entity->origin);
     } else if (!Q_stricmp(command, "moveherenear")) {
         float rad = 256.0f;
 
@@ -621,7 +703,7 @@ qboolean G_BotCommand(gentity_t *ent)
             rad = atof(gi.Argv(2));
         }
 
-        bot->MoveNear(ent->entity->origin, rad);
+        bot->GetMovement().MoveNear(ent->entity->origin, rad);
     } else if (!Q_stricmp(command, "avoidhere")) {
         float rad = 256.0f;
 
@@ -629,9 +711,9 @@ qboolean G_BotCommand(gentity_t *ent)
             rad = atof(gi.Argv(2));
         }
 
-        bot->AvoidPath(ent->entity->origin, rad);
+        bot->GetMovement().AvoidPath(ent->entity->origin, rad);
     } else if (!Q_stricmp(command, "telehere")) {
-        bot->setOrigin(ent->s.origin);
+        bot->getControlledEntity()->setOrigin(ent->s.origin);
     }
 
     return qtrue;
diff --git a/code/fgame/gamecmds.h b/code/fgame/gamecmds.h
index 97725eb1..a45ebc73 100644
--- a/code/fgame/gamecmds.h
+++ b/code/fgame/gamecmds.h
@@ -30,6 +30,12 @@ void G_InitConsoleCommands(void);
 
 qboolean G_ProcessClientCommand(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);
diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index f0fd97d2..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,20 +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);
 
@@ -310,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);
@@ -332,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);
@@ -348,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);
@@ -359,8 +390,13 @@ 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);
@@ -428,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);
@@ -447,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);
 
@@ -461,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));
@@ -557,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);
 
@@ -591,16 +633,29 @@ 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);
@@ -614,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 8103ae5e..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,16 +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_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 fd3a18eb..fe5999c0 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.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.
 
@@ -45,24 +45,54 @@ const_str AbstractScript::ConstFilename(void)
 
 bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column, int& line)
 {
+    size_t        posLine;
+    size_t        i;
+    size_t        start;
+    char         *p;
+    char          old_token;
+    sourceinfo_t *minCachedInfo = NULL;
+
     if (!m_SourceBuffer || sourcePos >= m_SourceLength) {
         return false;
     }
 
-    line        = 1;
-    column      = 0;
-    int posLine = 0;
+    line    = 1;
+    column  = 0;
+    posLine = 0;
+    start   = 0;
 
-    char *p = m_SourceBuffer;
-    char  old_token;
+    p = m_SourceBuffer;
 
-    for (int i = 0; i < sourcePos; i++, p++) {
+    if (sourcePos > 128) {
+        // Start caching above certain values
+
+        for (i = 0; i < ARRAY_LEN(cachedInfo); i++) {
+            sourceinfo_t *info = &cachedInfo[i];
+
+            if (info->line && sourcePos > info->sourcePos
+                && (!minCachedInfo || info->sourcePos > minCachedInfo->sourcePos)) {
+                minCachedInfo = info;
+            }
+        }
+
+        if (minCachedInfo) {
+            start   = minCachedInfo->sourcePos;
+            line    = minCachedInfo->line;
+            column  = minCachedInfo->column;
+            posLine = minCachedInfo->startLinePos;
+        }
+    }
+
+    for (i = start; i < sourcePos; i++) {
+        p = m_SourceBuffer + i;
         column++;
 
         if (*p == '\n') {
             line++;
-            column  = 0;
-            posLine = i + 1;
+            column = 0;
+            if (i + 1 != sourcePos) {
+                posLine = i + 1;
+            }
         } else if (*p == '\0') {
             break;
         }
@@ -81,6 +111,12 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
 
     *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;
 }
 
@@ -104,7 +140,7 @@ void AbstractScript::PrintSourcePos(sourceinfo_t *sourcePos, bool dev)
     if (GetSourceAt(sourcePos->sourcePos, &sourceLine, column, line)) {
         PrintSourcePos(sourceLine, column, line, dev);
     } else {
-        glbs.DPrintf(
+        gi.DPrintf(
             "file '%s', source pos %d line %d column %d:\n",
             Filename().c_str(),
             sourcePos->sourcePos,
@@ -123,7 +159,7 @@ void AbstractScript::PrintSourcePos(size_t sourcePos, bool dev)
     if (GetSourceAt(sourcePos, &sourceLine, column, line)) {
         PrintSourcePos(sourceLine, column, line, dev);
     } else {
-        glbs.DPrintf("file '%s', source pos %d:\n", Filename().c_str(), sourcePos);
+        gi.DPrintf("file '%s', source pos %d:\n", Filename().c_str(), sourcePos);
     }
 }
 
@@ -153,14 +189,15 @@ void AbstractScript::PrintSourcePos(str sourceLine, int column, int line, bool d
 
     markerLine.append("^");
 
-    glbs.DPrintf("(%s, %d):\n%s\n%s\n", Filename().c_str(), line, sourceLine.c_str(), markerLine.c_str());
+    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()
@@ -493,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;
 
@@ -591,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 );
 		}
 	}
 
@@ -649,10 +686,17 @@ void GameScript::ArchiveCodePos(Archiver& arc, unsigned char **codePos)
 
 void GameScript::Close(void)
 {
+    // Free up catch blocks
     for (int i = m_CatchBlocks.NumObjects(); i > 0; i--) {
         delete m_CatchBlocks.ObjectAt(i);
     }
 
+    // Added in OPM
+    //  Free up allocated state scripts
+    for (int i = m_StateScripts.NumObjects(); i > 0; i--) {
+        delete m_StateScripts.ObjectAt(i);
+    }
+
     m_CatchBlocks.FreeObjectList();
 
     if (m_ProgToSource) {
@@ -661,12 +705,12 @@ void GameScript::Close(void)
     }
 
     if (m_ProgBuffer) {
-        glbs.Free(m_ProgBuffer);
+        gi.Free(m_ProgBuffer);
         m_ProgBuffer = NULL;
     }
 
     if (m_SourceBuffer) {
-        glbs.Free(m_SourceBuffer);
+        gi.Free(m_SourceBuffer);
         m_SourceBuffer = NULL;
     }
 
@@ -680,7 +724,7 @@ void GameScript::Load(const void *sourceBuffer, size_t sourceLength)
     size_t nodeLength;
     char  *m_PreprocessedBuffer;
 
-    m_SourceBuffer = (char *)glbs.Malloc(sourceLength + 2);
+    m_SourceBuffer = (char *)gi.Malloc(sourceLength + 2);
     m_SourceLength = sourceLength;
 
     // Original mohaa doesn't reallocate the input string to append a newline
@@ -694,19 +738,24 @@ void GameScript::Load(const void *sourceBuffer, size_t sourceLength)
     Compiler.Reset();
 
     m_PreprocessedBuffer = Compiler.Preprocess(m_SourceBuffer);
-    nodeLength           = Compiler.Parse(this, m_PreprocessedBuffer, "script");
-    Compiler.Preclean(m_PreprocessedBuffer);
-
-    if (!nodeLength) {
-        glbs.DPrintf2("^~^~^ Script file compile error:  Couldn't parse '%s'\n", Filename().c_str());
+    if (!Compiler.Parse(this, m_PreprocessedBuffer, "script", nodeLength)) {
+        gi.DPrintf2("^~^~^ Script file compile error:  Couldn't parse '%s'\n", Filename().c_str());
         return Close();
     }
 
-    m_ProgBuffer = (unsigned char *)glbs.Malloc(nodeLength);
-    m_ProgLength = Compiler.Compile(this, m_ProgBuffer);
+    if (nodeLength == 0) {
+        // No code, assume success
+        requiredStackSize = 0;
+        successCompile    = true;
+        return;
+    }
 
-    if (!m_ProgLength) {
-        glbs.DPrintf2("^~^~^ Script file compile error:  Couldn't compile '%s'\n", Filename().c_str());
+    Compiler.Preclean(m_PreprocessedBuffer);
+
+    m_ProgBuffer = (unsigned char *)gi.Malloc(nodeLength);
+
+    if (!Compiler.Compile(this, m_ProgBuffer, m_ProgLength)) {
+        gi.DPrintf2("^~^~^ Script file compile error:  Couldn't compile '%s'\n", Filename().c_str());
         return Close();
     }
 
@@ -772,7 +821,11 @@ StateScript *GameScript::CreateCatchStateScript(unsigned char *try_begin_code_po
 
 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)
@@ -824,7 +877,7 @@ ScriptThreadLabel::ScriptThreadLabel()
     m_Label  = STRING_EMPTY;
 }
 
-ScriptThread *ScriptThreadLabel::Create(Listener *listener)
+ScriptThread *ScriptThreadLabel::Create(Listener *listener) const
 {
     ScriptClass  *scriptClass;
     ScriptThread *thread;
@@ -854,7 +907,7 @@ ScriptThread *ScriptThreadLabel::Create(Listener *listener)
     return thread;
 }
 
-void ScriptThreadLabel::Execute(Listener *listener)
+void ScriptThreadLabel::Execute(Listener *listener) const
 {
     if (!m_Script) {
         return;
@@ -867,12 +920,7 @@ void ScriptThreadLabel::Execute(Listener *listener)
     }
 }
 
-void ScriptThreadLabel::Execute(Listener *listener, Event& ev)
-{
-    Execute(listener, &ev);
-}
-
-void ScriptThreadLabel::Execute(Listener *listener, Event *ev)
+void ScriptThreadLabel::Execute(Listener *listener, Event& ev) const
 {
     if (!m_Script) {
         return;
@@ -885,7 +933,13 @@ void ScriptThreadLabel::Execute(Listener *listener, Event *ev)
     }
 }
 
-void ScriptThreadLabel::Execute(Listener* pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
+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;
@@ -924,7 +978,7 @@ void ScriptThreadLabel::Set(const char *label)
         return;
     }
 
-    strcpy(buffer, label);
+    Q_strncpyz(buffer, label, sizeof(buffer));
 
     while (true) {
         if (p[0] == ':' && p[1] == ':') {
@@ -978,28 +1032,46 @@ void ScriptThreadLabel::Set(const_str label)
 
 void ScriptThreadLabel::SetScript(const ScriptVariable& label)
 {
-    if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
+    switch (label.GetType()) {
+    case VARIABLE_STRING:
         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];
+        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;
-
-            ScriptError(
-                "^~^~^ Could not find label '%s' in '%s'",
-                labelname->stringValue().c_str(),
-                script->stringValue().c_str()
-            );
+            m_Label = labelname->constStringValue();
+            break;
         }
-    } else {
+    default:
         ScriptError("ScriptThreadLabel::SetScript: bad label type '%s'", label.GetTypeName());
+        break;
+    }
+
+    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());
     }
 }
 
@@ -1017,7 +1089,7 @@ void ScriptThreadLabel::SetScript(const char *label)
         return;
     }
 
-    strcpy(buffer, label);
+    Q_strncpyz(buffer, label, sizeof(buffer));
 
     script = buffer;
     while (true) {
@@ -1066,30 +1138,43 @@ void ScriptThreadLabel::SetScript(const_str label)
 
 void ScriptThreadLabel::SetThread(const ScriptVariable& label)
 {
-    ScriptThread *thread = NULL;
-
-    if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
+    switch (label.GetType()) {
+    case VARIABLE_STRING:
+    case 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];
+        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;
-
-            ScriptError(
-                "^~^~^ Could not find label '%s' in '%s'",
-                labelname->stringValue().c_str(),
-                script->stringValue().c_str()
-            );
+            m_Label = labelname->constStringValue();
+            break;
         }
-    } else {
-        ScriptError("ScriptThreadLabel::SetThread bad label type '%s'", label.GetTypeName());
+    default:
+        ScriptError("ScriptThreadLabel::SetThread: bad label type '%s'", label.GetTypeName());
+        break;
+    }
+
+    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());
     }
 }
 
@@ -1141,7 +1226,7 @@ bool ScriptThreadLabel::TrySetScript(const_str label)
     return true;
 }
 
-void ScriptThreadLabel::GetScriptValue(ScriptVariable *var)
+void ScriptThreadLabel::GetScriptValue(ScriptVariable *var) const
 {
     if (!m_Script) {
         var->Clear();
@@ -1155,12 +1240,12 @@ void ScriptThreadLabel::GetScriptValue(ScriptVariable *var)
     var->setConstArrayValue(var_array, 2);
 }
 
-bool ScriptThreadLabel::IsSet(void)
+bool ScriptThreadLabel::IsSet(void) const
 {
     return m_Script != NULL;
 }
 
-bool ScriptThreadLabel::IsFile(const_str filename)
+bool ScriptThreadLabel::IsFile(const_str filename) const
 {
     return m_Script && m_Script->ConstFilename() == filename && m_Label == STRING_EMPTY;
 }
diff --git a/code/fgame/gamescript.h b/code/fgame/gamescript.h
index f4fc1f6b..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.
 
@@ -39,11 +39,18 @@ typedef struct {
     bool      isprivate; // new script engine implementation
 } script_label_t;
 
-typedef struct {
+struct sourceinfo_t {
     unsigned int sourcePos;
+    unsigned int startLinePos;
     int          column;
     int          line;
-} sourceinfo_t;
+
+    sourceinfo_t()
+        : sourcePos(0)
+        , column(0)
+        , line(0)
+    {}
+};
 
 class AbstractScript
 {
@@ -56,13 +63,16 @@ public:
     // Developper variable
     con_set<const uchar *, sourceinfo_t> *m_ProgToSource;
 
+    sourceinfo_t cachedInfo[16];
+    size_t       cachedInfoIndex;
+
 public:
     AbstractScript();
 
-    str     & Filename(void);
+    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);
+    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);
@@ -108,7 +118,8 @@ class GameScript : public AbstractScript
 {
 protected:
     // try/throw variable
-    Container<CatchBlock *> m_CatchBlocks;
+    Container<CatchBlock *>  m_CatchBlocks;
+    Container<StateScript *> m_StateScripts;
 
 public:
     // program variables
@@ -128,9 +139,9 @@ public:
     GameScript(const char *filename);
     ~GameScript();
 
-    void        Archive(Archiver       &arc);
+    void        Archive(Archiver& arc);
     static void Archive(Archiver& arc, GameScript *& scr);
-    void        ArchiveCodePos(Archiver       &arc, unsigned char **codePos);
+    void        ArchiveCodePos(Archiver& arc, unsigned char **codePos);
 
     void Close(void);
     void Load(const void *sourceBuffer, size_t sourceLength);
@@ -159,11 +170,11 @@ private:
 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(Listener* pSelf, const SafePtr<Listener>         &listener, const SafePtr<Listener>         &param);
+    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);
@@ -178,10 +189,10 @@ public:
     bool TrySetScript(const_str label);
     bool TrySetScript(const char *label);
 
-    bool IsSet(void);
-    bool IsFile(const_str filename);
+    bool IsSet(void) const;
+    bool IsFile(const_str filename) const;
 
-    void GetScriptValue(ScriptVariable *var);
+    void GetScriptValue(ScriptVariable *var) const;
 
     void Archive(Archiver& arc);
 
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 5af8fd15..a7d19f33 100644
--- a/code/fgame/health.cpp
+++ b/code/fgame/health.cpp
@@ -44,12 +44,22 @@ SafePtr<Health> Health::mHealthQueue[MAX_HEALTH_QUEUE];
 
 Health::Health()
 {
+    if (LoadingSavegame) {
+        return;
+    }
+
     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)
@@ -64,8 +74,19 @@ void Health::PickupHealth(Event *ev)
 
     player = (Player *)other;
 
-    if (player->health >= player->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)) {
@@ -93,7 +114,7 @@ void Health::PickupHealth(Event *ev)
 
     gi.SendServerCommand(
         player->edict - g_entities,
-        "print \"" HUD_MESSAGE_YELLOW "%s \"",
+        "print \"" HUD_MESSAGE_YELLOW "%s\n\"",
         gi.LV_ConvertString(va("Recovered %d Health", amount))
     );
 }
diff --git a/code/fgame/health.h b/code/fgame/health.h
index d32e77fe..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.
 
@@ -23,8 +23,7 @@ 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"
@@ -52,5 +51,3 @@ public:
 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.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 63d1a350..5c4a3bfc 100644
--- a/code/fgame/item.cpp
+++ b/code/fgame/item.cpp
@@ -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                        }
 };
 
@@ -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)
@@ -751,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) {
@@ -806,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));
@@ -814,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));
@@ -897,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;
@@ -922,7 +940,7 @@ void Item::EventViewModelPrefix(Event *ev)
 
 void Item::updatePrefix(Event *ev)
 {
-    if (!level.specialgame) {
+    if (!sv_specialgame->integer) {
         return;
     }
 
@@ -930,8 +948,6 @@ void Item::updatePrefix(Event *ev)
         return;
     }
 
-    // FIXME: delete
-    /*
 	Entity *ent = ev->GetEntity( 1 );
 
 	gi.MSG_SetClient( ent->edict - g_entities );
@@ -940,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 c98d4fa4..05ee31ac 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -120,7 +120,7 @@ Event EV_Level_SetNoDropHealth
 
 Event EV_Level_SetNoDropWeapons
 (
-    "nodropweapon",
+    "nodropweapons",
     EV_DEFAULT,
     "i",
     "alarm_status",
@@ -391,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
 );
 
@@ -401,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
 );
 
@@ -695,8 +695,8 @@ CLASS_DECLARATION(Listener, Level, NULL) {
     {&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_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             },
@@ -834,7 +834,6 @@ void Level::Init(void)
 
     m_pAIStats = NULL;
 
-    m_bSpawnBot    = false;
     m_bScriptSpawn = false;
     m_bRejectSpawn = false;
 }
@@ -970,8 +969,8 @@ 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, "");
@@ -1098,6 +1097,12 @@ void Level::SpawnEntities(char *entities, int svsTime)
     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");
 
     t1 = gi.Milliseconds();
@@ -1164,7 +1169,7 @@ void Level::SpawnEntities(char *entities, int svsTime)
                 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);
             }
         }
@@ -1506,9 +1511,9 @@ void Level::ServerSpawned(void)
 
 void Level::SetMap(const char *themapname)
 {
-    char *spawnpos;
-    int   i;
-    str   text;
+    const char *spawnpos;
+    int         i;
+    str         text;
 
     Init();
 
@@ -1517,8 +1522,8 @@ void Level::SetMap(const char *themapname)
     // set a specific spawnpoint if the map was started with a $
     spawnpos = strchr((char *)themapname, '$');
     if (spawnpos) {
-        mapname    = (const char *)(spawnpos - themapname);
-        spawnpoint = mapname;
+        mapname    = str(themapname, 0, spawnpos - themapname);
+        spawnpoint = spawnpos + 1;
     } else {
         mapname    = themapname;
         spawnpoint = "";
@@ -1583,6 +1588,30 @@ void Level::Precache(void)
 
     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);
+    }
 }
 
 /*
@@ -1725,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);
 
@@ -1911,6 +1944,8 @@ void Level::CheckVote(void)
                 level.m_voteNo++;
             }
         }
+
+        numVoters++;
     }
 
     level.m_numVoters = numVoters;
@@ -1957,7 +1992,7 @@ void Level::SetupMaplist()
         return;
     }
 
-    strcpy(buffer, m_voteString.c_str());
+    Q_strncpyz(buffer, m_voteString.c_str(), sizeof(buffer));
 
     for (p = strtok(buffer, delim); p; p = strtok(NULL, delim)) {
         if (strstr(p, "g_gametype")) {
@@ -2312,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));
 }
 
@@ -2483,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);
         }
     }
diff --git a/code/fgame/level.h b/code/fgame/level.h
index 0f53ef03..5748b1e6 100644
--- a/code/fgame/level.h
+++ b/code/fgame/level.h
@@ -251,11 +251,6 @@ public:
 
     // 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;
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 74be7738..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() )
 	{
diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index c2e95139..14eb47ac 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.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.
 
@@ -91,7 +91,7 @@ Used as a positional target for spotlights, etc.
 
 ******************************************************************************/
 
-CLASS_DECLARATION(Entity, InfoNull, "info_null") {
+CLASS_DECLARATION(Listener, InfoNull, "info_null") {
     {NULL, NULL}
 };
 
@@ -144,14 +144,55 @@ If PROJECTILES is set, the trigger will respond to projectiles (rockets, grenade
 #define ACCUMULATIVE (1 << 6)
 #define TWOSTAGE     (1 << 7)
 
-Event EV_ExplodingWall_StopRotating("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
+Event EV_ExplodingWall_StopRotating
+(
+    "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
+
+);
+Event EV_ExplodingWall_AngleSpeed
+(
+    "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
+);
+Event EV_ExplodingWall_LandAngles
+(
+    "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_AngleSpeed("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);
-Event EV_ExplodingWall_LandAngles("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,
@@ -160,11 +201,31 @@ Event EV_ExplodingWall_RandomVelocity(
     "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);
-Event EV_ExplodingWall_SetExplosions(
-    "explosions", EV_DEFAULT, "i", "explosions", "Set the number of explosions.", EV_NORMAL
+Event EV_ExplodingWall_SetDmg
+(
+    "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
+
+);
+Event EV_ExplodingWall_Setup
+(
+    "setup", EV_CODEONLY,
+    NULL,
+    NULL,
+    "Initializes the exploding wall.",
+    EV_NORMAL
 );
-Event EV_ExplodingWall_Setup("setup", EV_CODEONLY, NULL, NULL, "Initializes the exploding wall.", EV_NORMAL);
 
 CLASS_DECLARATION(Trigger, ExplodingWall, "func_explodingwall") {
     {&EV_ExplodingWall_Setup,          &ExplodingWall::Setup         },
@@ -184,49 +245,41 @@ CLASS_DECLARATION(Trigger, ExplodingWall, "func_explodingwall") {
 };
 
 void ExplodingWall::AngleSpeed(Event *ev)
-
 {
     angle_speed = ev->GetFloat(1);
 }
 
 void ExplodingWall::LandRadius(Event *ev)
-
 {
     land_radius = ev->GetFloat(1);
 }
 
 void ExplodingWall::LandAngles(Event *ev)
-
 {
     land_angles = ev->GetVector(1);
 }
 
 void ExplodingWall::BaseVelocity(Event *ev)
-
 {
     base_velocity = ev->GetVector(1);
 }
 
 void ExplodingWall::RandomVelocity(Event *ev)
-
 {
     random_velocity = ev->GetVector(1);
 }
 
 void ExplodingWall::SetDmg(Event *ev)
-
 {
     dmg = ev->GetInteger(1);
 }
 
 void ExplodingWall::SetExplosions(Event *ev)
-
 {
     explosions = ev->GetInteger(1);
 }
 
 void ExplodingWall::Explode(Event *ev)
-
 {
     Entity *other;
     Vector  pos;
@@ -321,7 +374,6 @@ void ExplodingWall::Explode(Event *ev)
 }
 
 void ExplodingWall::DamageEvent(Event *ev)
-
 {
     Event  *event;
     Entity *inflictor;
@@ -358,7 +410,6 @@ void ExplodingWall::DamageEvent(Event *ev)
 }
 
 void ExplodingWall::GroundDamage(Event *ev)
-
 {
     Entity *inflictor;
     Entity *attacker;
@@ -398,14 +449,12 @@ void ExplodingWall::GroundDamage(Event *ev)
 }
 
 void ExplodingWall::SetupSecondStage(void)
-
 {
     health     = max_health;
     takedamage = DAMAGE_YES;
 }
 
 void ExplodingWall::StopRotating(Event *ev)
-
 {
     avelocity = vec_zero;
     setAngles(land_angles);
@@ -415,7 +464,6 @@ void ExplodingWall::StopRotating(Event *ev)
 }
 
 void ExplodingWall::CheckOnGround(Event *ev)
-
 {
     if ((velocity == vec_zero) && groundentity) {
         Vector delta;
@@ -463,7 +511,6 @@ void ExplodingWall::CheckOnGround(Event *ev)
 }
 
 void ExplodingWall::TouchFunc(Event *ev)
-
 {
     Entity *other;
 
@@ -499,7 +546,6 @@ void ExplodingWall::TouchFunc(Event *ev)
 }
 
 void ExplodingWall::Setup(Event *ev)
-
 {
     if (spawnflags & INVISIBLE) {
         if (Targeted()) {
@@ -564,13 +610,27 @@ If NO_EFFECTS is set, the special effect will not happen and the teleport will b
 
 #define NO_EFFECTS (1 << 5)
 
-Event EV_Teleporter_Teleport("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
+Event EV_Teleporter_Teleport
+(
+    "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
 
-Event EV_Teleporter_SetThread(
+);
+Event EV_Teleporter_SetThread
+(
     "teleportthread",
     EV_CODEONLY,
     "s",
@@ -677,7 +737,6 @@ void Teleporter::StartTeleport(Event *ev)
 }
 
 void Teleporter::Teleport(Event *ev)
-
 {
     Entity  *dest;
     int      i;
@@ -791,7 +850,6 @@ void Teleporter::Teleport(Event *ev)
 }
 
 void Teleporter::StopTeleport(Event *ev)
-
 {
     Entity *other;
 
@@ -884,19 +942,37 @@ 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
-);
+Event EV_UseAnim_Reset
+(
+    "_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
 );
+Event EV_UseAnim_Thread
+(
+    "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
 );
+Event EV_UseAnim_Count
+(
+    "count", EV_DEFAULT,
+    "i",
+    "newCount",
+    "Sets how many times the UseAnim can be triggered.",
+    EV_NORMAL
 
-Event EV_UseAnim_TriggerTarget(
+);
+Event EV_UseAnim_TriggerTarget
+(
     "triggertarget",
     EV_DEFAULT,
     "s",
@@ -904,15 +980,34 @@ Event EV_UseAnim_TriggerTarget(
     "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);
-
-Event EV_UseAnim_SetKey(
-    "key", EV_DEFAULT, "s", "keyName", "set the key needed to make this UseAnim function.", EV_NORMAL
+Event EV_UseAnim_SetAnim
+(
+    "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
 
-Event EV_UseAnim_SetState("state", EV_CHEAT, "s", "stateName", "set the state to use for the player.", 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,
@@ -922,11 +1017,16 @@ Event EV_UseAnim_SetCamera(
     "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
 
-Event EV_UseAnim_SetNumLoops(
-    "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,
@@ -998,7 +1098,6 @@ UseAnim::UseAnim()
 }
 
 void UseAnim::Touched(Event *ev)
-
 {
     Entity *other;
 
@@ -1020,7 +1119,6 @@ void UseAnim::Touched(Event *ev)
 }
 
 bool UseAnim::canBeUsed(Entity *activator)
-
 {
     Entity *dest;
 
@@ -1088,7 +1186,6 @@ bool UseAnim::canBeUsed(Entity *activator)
 bool UseAnim::GetInformation(
     Entity *activator, Vector *org, Vector *angles, str *animation, int *loopcount, str *state, str *camera
 )
-
 {
     Entity             *dest;
     UseAnimDestination *uadest;
@@ -1160,7 +1257,6 @@ bool UseAnim::GetInformation(
 }
 
 void UseAnim::TriggerTargets(Entity *activator)
-
 {
     //
     // fire off our trigger target if appropriate
@@ -1190,7 +1286,6 @@ 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
@@ -1241,25 +1336,21 @@ void UseAnim::Reset(Event *ev)
 }
 
 void UseAnim::SetThread(Event *ev)
-
 {
     thread.SetThread(ev->GetValue(1));
 }
 
 void UseAnim::SetDelay(Event *ev)
-
 {
     delay = ev->GetFloat(1);
 }
 
 void UseAnim::SetTriggerTarget(Event *ev)
-
 {
     triggertarget = ev->GetString(1);
 }
 
 void UseAnim::SetCount(Event *ev)
-
 {
     count = ev->GetInteger(1);
 }
@@ -1379,7 +1470,8 @@ int UseAnimDestination::GetNumLoops(void)
     return num_loops;
 }
 
-Event EV_UseObject_MoveThread(
+Event EV_UseObject_MoveThread
+(
     "move_thread",
     EV_DEFAULT,
     "s",
@@ -1387,38 +1479,87 @@ Event EV_UseObject_MoveThread(
     "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
 
-Event EV_UseObject_StopThread(
-    "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
 
-Event EV_UseObject_ResetThread(
-    "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
 
-Event EV_UseObject_Count(
-    "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
 
-Event EV_UseObject_Cone(
-    "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
 
-Event EV_UseObject_Offset(
-    "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
 
-Event EV_UseObject_YawOffset(
-    "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);
-
-Event EV_UseObject_StateBackwards(
-    "state_backwards", EV_DEFAULT, "s", "newState", "Sets the backward state 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
 );
+Event EV_UseObject_StateBackwards
+(
+    "state_backwards",
+    EV_DEFAULT,
+    "s",
+    "newState",
+    "Sets the backward state to use for this UseObject.",
+    EV_NORMAL
 
-Event EV_UseObject_TriggerTarget(
+);
+Event EV_UseObject_TriggerTarget
+(
     "triggertarget",
     EV_DEFAULT,
     "s",
@@ -1426,8 +1567,8 @@ Event EV_UseObject_TriggerTarget(
     "Sets what should be triggered, when this UseObject is triggered.",
     EV_NORMAL
 );
-
-Event EV_UseObject_ResetTime(
+Event EV_UseObject_ResetTime
+(
     "reset_time",
     EV_DEFAULT,
     "f",
@@ -1435,8 +1576,8 @@ Event EV_UseObject_ResetTime(
     "Sets the time it takes for the UseObject to reset itself.",
     EV_NORMAL
 );
-
-Event EV_UseObject_DamageType(
+Event EV_UseObject_DamageType
+(
     "damage_type",
     EV_DEFAULT,
     "s",
@@ -1444,8 +1585,8 @@ Event EV_UseObject_DamageType(
     "Sets what kind of damage is needed to activate the trigger.",
     EV_NORMAL
 );
-
-Event EV_UseObject_Reset(
+Event EV_UseObject_Reset
+(
     "_useobject_reset",
     EV_DEFAULT,
     NULL,
@@ -1453,12 +1594,18 @@ Event EV_UseObject_Reset(
     "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
 
-Event EV_UseObject_Resetting(
-    "_useobject_resetting", EV_DEFAULT, NULL, NULL, "Intermediate function for useobject reset.", EV_NORMAL
 );
-
-Event EV_UseObject_DamageTriggered(
+Event EV_UseObject_DamageTriggered
+(
     "_useobject_damagetriggered",
     EV_DEFAULT,
     "e",
@@ -1466,18 +1613,43 @@ Event EV_UseObject_DamageTriggered(
     "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);
-
-Event
-    EV_UseObject_Deactivate("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
+Event EV_UseObject_Activate
+(
+    "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
+);
+Event EV_UseObject_UseMaterial
+(
+    "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
 
-Event EV_UseObject_SetActiveState(
-    "_setactivestate", EV_DEFAULT, NULL, NULL, "event that sets up the proper skin for the useobject.", EV_NORMAL
 );
 
 #define MULTI_STATE (1 << 0)
@@ -1628,87 +1800,73 @@ void UseObject::SetActiveState(Event *ev)
 }
 
 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);
 }
@@ -1719,7 +1877,6 @@ void UseObject::Reset(Event *ev)
 }
 
 void UseObject::Resetting(Event *ev)
-
 {
     SetActiveState(NULL);
     NewAnim("start");
@@ -1755,7 +1912,6 @@ void UseObject::Resetting(Event *ev)
 }
 
 bool UseObject::canBeUsed(Vector org, Vector dir)
-
 {
     float  dot;
     Vector forward;
@@ -1799,7 +1955,6 @@ bool UseObject::canBeUsed(Vector org, Vector dir)
 }
 
 void UseObject::DamageFunc(Event *ev)
-
 {
     Event  *e;
     Entity *attacker;
@@ -1836,14 +1991,12 @@ void UseObject::DamageFunc(Event *ev)
 }
 
 void UseObject::DamageTriggered(Event *ev)
-
 {
     // 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;
@@ -1867,7 +2020,6 @@ void UseObject::Setup(Entity *activator, Vector *org, Vector *ang, str *newstate
 }
 
 void UseObject::Start(Event *ev)
-
 {
     //
     // fire off the move_thread
@@ -1886,7 +2038,6 @@ void UseObject::Start(Event *ev)
 }
 
 bool UseObject::Loop(void)
-
 {
     if (!count) {
         return qfalse;
@@ -1896,7 +2047,6 @@ bool UseObject::Loop(void)
 }
 
 void UseObject::Stop(Entity *activator)
-
 {
     if ((spawnflags & MULTI_STATE) && objectState) {
         NewAnim("start");
@@ -1979,7 +2129,14 @@ Like info_waypoints, but with spawnflags for vehicles.
 
 ******************************************************************************/
 
-Event EV_VehiclePoint_SetSpawnFlags("spawnflags", EV_DEFAULT, "i", "spawn_flags", "Sets the spawn flags.");
+Event EV_VehiclePoint_SetSpawnFlags
+(
+    "spawnflags",
+    EV_DEFAULT,
+    "i",
+    "spawn_flags",
+    "Sets the spawn flags."
+);
 
 CLASS_DECLARATION(Waypoint, VehiclePoint, "info_vehiclepoint") {
     {&EV_VehiclePoint_SetSpawnFlags, &VehiclePoint::SetSpawnFlags},
@@ -2022,7 +2179,6 @@ MonkeyBars::MonkeyBars()
 }
 
 void MonkeyBars::SetAngleEvent(Event *ev)
-
 {
     dir = ev->GetFloat(1);
 }
@@ -2052,7 +2208,6 @@ HorizontalPipe::HorizontalPipe()
 }
 
 void HorizontalPipe::SetAngleEvent(Event *ev)
-
 {
     dir = ev->GetFloat(1);
 }
@@ -2061,10 +2216,16 @@ void HorizontalPipe::SetAngleEvent(Event *ev)
 // TossObject
 /*****************************************************************************/
 
-Event EV_TossObject_SetBounceSound(
-    "bouncesound", EV_DEFAULT, "s", "sound", "When bouncing, what sound to play on impact", EV_NORMAL
-);
+Event EV_TossObject_SetBounceSound
+(
+    "bouncesound",
+    EV_DEFAULT,
+    "s",
+    "sound",
+    "When bouncing, what sound to play on impact",
+    EV_NORMAL
 
+);
 Event EV_TossObject_SetBounceSoundChance(
     "bouncesoundchance",
     EV_DEFAULT,
@@ -2104,31 +2265,26 @@ TossObject::TossObject(str model)
 }
 
 void TossObject::SetBounceSound(str bounce)
-
 {
     bouncesound = bounce;
 }
 
 void TossObject::SetBounceSound(Event *ev)
-
 {
     bouncesound = ev->GetString(1);
 }
 
 void TossObject::SetBounceSoundChance(float chance)
-
 {
     bouncesoundchance = chance;
 }
 
 void TossObject::SetBounceSoundChance(Event *ev)
-
 {
     bouncesoundchance = ev->GetFloat(1);
 }
 
 void TossObject::Stop(Event *ev)
-
 {
     setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_NOT);
@@ -2140,7 +2296,6 @@ void TossObject::Stop(Event *ev)
 }
 
 void TossObject::Touch(Event *ev)
-
 {
     Entity *ent;
 
@@ -2163,7 +2318,6 @@ void TossObject::Touch(Event *ev)
 }
 
 void TossObject::SetVelocity(float severity)
-
 {
     setSolidType(SOLID_BBOX);
     velocity[0] = 100.0 * crandom();
@@ -2206,11 +2360,32 @@ Pushable object
 
 ******************************************************************************/
 
-Event EV_PushObject_Start("start", EV_DEFAULT, NULL, NULL, "Sets up the pushobject.", EV_NORMAL);
+Event EV_PushObject_Start
+(
+    "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);
+Event EV_PushObject_SetDamage
+(
+    "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);
+Event EV_PushObject_SetPushSound
+(
+    "pushsound", EV_DEFAULT,
+    "s",
+    "sound",
+    "Set the pushing sound",
+    EV_NORMAL
+);
 
 CLASS_DECLARATION(Entity, PushObject, "func_pushobject") {
     {&EV_PushObject_Start,        &PushObject::Start       },
@@ -2235,13 +2410,11 @@ PushObject::PushObject()
 }
 
 void PushObject::SetPushSound(Event *ev)
-
 {
     pushsound = ev->GetString(1);
 }
 
 void PushObject::Start(Event *ev)
-
 {
     // make sure that this touches triggers
     flags |= FL_TOUCH_TRIGGERS;
@@ -2254,7 +2427,6 @@ void PushObject::Start(Event *ev)
 }
 
 qboolean PushObject::canPush(Vector dir)
-
 {
     trace_t trace;
 
@@ -2265,7 +2437,6 @@ qboolean PushObject::canPush(Vector dir)
 }
 
 qboolean PushObject::Push(Entity *pusher, Vector move)
-
 {
     trace_t trace;
 
@@ -2295,13 +2466,11 @@ qboolean PushObject::Push(Entity *pusher, Vector move)
 }
 
 Entity *PushObject::getOwner(void)
-
 {
     return (Entity *)owner;
 }
 
 void PushObject::BlockFunc(Event *ev)
-
 {
     Entity *other;
 
@@ -2315,7 +2484,6 @@ void PushObject::BlockFunc(Event *ev)
 }
 
 void PushObject::SetDamage(Event *ev)
-
 {
     dmg = ev->GetInteger(1);
 }
@@ -2341,21 +2509,69 @@ REMOVE_ON_GROUND - remove the rocks when done
 
 ******************************************************************************/
 
-Event EV_FallingRock_Bounce("bounce", EV_DEFAULT, NULL, NULL, "sent to entity when touched.", EV_NORMAL);
+Event EV_FallingRock_Bounce
+(
+    "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
+);
+Event EV_FallingRock_SetWait
+(
+    "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
+);
+Event EV_FallingRock_SetDmg
+(
+    "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
+);
+Event EV_FallingRock_SetBounceSound
+(
+    "noise",
+    EV_DEFAULT,
+    "s",
+    "sound",
+    "Set the sound to play when the rock bounces",
+    EV_NORMAL
 
-Event EV_FallingRock_Rotate("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);
-
-Event EV_FallingRock_Start("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);
-
-Event EV_FallingRock_SetSpeed("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
 );
 
 CLASS_DECLARATION(Entity, FallingRock, "func_fallingrock") {
@@ -2390,7 +2606,6 @@ FallingRock::FallingRock()
 }
 
 Entity *FallingRock::SetNextBounceDir(void)
-
 {
     Entity *ent;
 
@@ -2410,7 +2625,6 @@ Entity *FallingRock::SetNextBounceDir(void)
 }
 
 void FallingRock::NextBounce(void)
-
 {
     float  time;
     float  distance;
@@ -2453,7 +2667,6 @@ void FallingRock::NextBounce(void)
 }
 
 void FallingRock::Rotate(Event *ev)
-
 {
     float mat[3][3];
     float ang;
@@ -2471,19 +2684,16 @@ void FallingRock::Rotate(Event *ev)
 }
 
 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);
 }
@@ -2496,13 +2706,11 @@ void FallingRock::SetBounceSound(str sound)
 }
 
 void FallingRock::SetBounceSound(Event *ev)
-
 {
     SetBounceSound(ev->GetString(1));
 }
 
 void FallingRock::Activate(Event *ev)
-
 {
     if (active == 1) {
         return;
@@ -2526,7 +2734,6 @@ void FallingRock::Activate(Event *ev)
 }
 
 void FallingRock::StartFalling(Event *ev)
-
 {
     if (current) {
         return;
@@ -2551,7 +2758,6 @@ void FallingRock::StartFalling(Event *ev)
 }
 
 void FallingRock::Touch(Event *ev)
-
 {
     Entity *other;
 
@@ -2582,7 +2788,6 @@ void FallingRock::Touch(Event *ev)
 }
 
 void FallingRock::Bounce(Event *ev)
-
 {
     Vector delta;
 
@@ -2622,7 +2827,14 @@ Ladder trigger volume
 
 ******************************************************************************/
 
-Event EV_LadderSetup("_ladder_setup", EV_CODEONLY, NULL, NULL, "Does the post spawn setup of the ladder");
+Event EV_LadderSetup
+(
+    "_ladder_setup",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Does the post spawn setup of the ladder"
+);
 
 CLASS_DECLARATION(Entity, FuncLadder, "func_ladder") {
     {&EV_Use,         NULL                        },
@@ -2652,6 +2864,14 @@ void FuncLadder::LadderSetup(Event *ev)
     edict->r.svFlags |= SVF_NOCLIENT;
 }
 
+void FuncLadder::SetLadderFacing(Event *ev)
+{
+    m_vFacingAngles    = vec_zero;
+    m_vFacingAngles[1] = AngleMod(ev->GetFloat(1));
+
+    AngleVectorsLeft(m_vFacingAngles, m_vFacingDir, NULL, NULL);
+}
+
 qboolean FuncLadder::CanUseLadder(Entity *pUser)
 {
     int     iMask;
@@ -2764,14 +2984,6 @@ void FuncLadder::PositionOnLadder(Entity *pUser)
     pUser->setAngles(m_vFacingAngles);
 }
 
-void FuncLadder::SetLadderFacing(Event *ev)
-{
-    m_vFacingAngles    = vec_zero;
-    m_vFacingAngles[1] = AngleMod(ev->GetFloat(1));
-
-    AngleVectorsLeft(m_vFacingAngles, m_vFacingDir, NULL, NULL);
-}
-
 void FuncLadder::AdjustPositionOnLadder(Entity *pUser)
 {
     float   fHeight;
@@ -2785,7 +2997,7 @@ void FuncLadder::AdjustPositionOnLadder(Entity *pUser)
 
     fHeight = ((int)(pUser->origin[2] + 8.0f) & ~15);
 
-    if (vDelta.length() > 16.0f && pUser->origin[2] == fHeight) {
+    if (vDelta.length() == 16.0f && pUser->origin[2] == fHeight) {
         return;
     }
 
@@ -2872,8 +3084,32 @@ void FuncLadder::EnsureForwardOffLadder(Entity *pUser)
     pUser->setOrigin(trace.endpos);
 }
 
-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);
+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},
diff --git a/code/fgame/misc.h b/code/fgame/misc.h
index 924fad3b..95f4d2c2 100644
--- a/code/fgame/misc.h
+++ b/code/fgame/misc.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.
 
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "mover.h"
 #include "animate.h"
 
-class InfoNull : public Entity
+class InfoNull : public Listener
 {
 public:
     CLASS_PROTOTYPE(InfoNull);
@@ -133,7 +133,7 @@ public:
     virtual void Teleport(Event *ev);
     virtual void StopTeleport(Event *ev);
     void         SetThread(Event *ev);
-    void         Archive(Archiver        &arc) override;
+    void         Archive(Archiver& arc) override;
 };
 
 inline void Teleporter::Archive(Archiver& arc)
@@ -488,7 +488,7 @@ private:
     Entity *SetNextBounceDir(void);
     void    SetBounceSound(str sound);
     void    SetBounceSound(Event *ev);
-    void    Archive(Archiver   &arc) override;
+    void    Archive(Archiver& arc) override;
 
 public:
     CLASS_PROTOTYPE(FallingRock);
@@ -564,8 +564,21 @@ public:
 
     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:
diff --git a/code/fgame/movegrid.cpp b/code/fgame/movegrid.cpp
index ee755b89..feb60248 100644
--- a/code/fgame/movegrid.cpp
+++ b/code/fgame/movegrid.cpp
@@ -82,7 +82,7 @@ void cMoveGrid::CalculateBoxPoints(void)
             for (z = 0; z < m_iZRes; z++) {
                 gridpoint_t *gridPoint = GetGridPoint(x, y, z);
 
-                gridPoint->origin = Vector(xdelta - rx, ydelta - ry, zdelta + rz / 2);
+                gridPoint->origin = Vector(xdelta - rx, ydelta - ry, zdelta + rz / 2.f);
                 zdelta += rz;
             }
             zdelta = 0;
@@ -107,18 +107,18 @@ void cMoveGrid::CalculateBoxPoints(void)
                 if (rx >= ry) {
                     Vector vec;
 
-                    vec = Vector(-ry / 2, -ry / 2, -rz / 2);
+                    vec = Vector(-ry / 2.f, -ry / 2.f, -rz / 2.f);
                     vec.copyTo(gridPoint->vm.mins);
 
-                    vec = Vector(ry / 2, ry / 2, rz / 2);
+                    vec = Vector(ry / 2.f, ry / 2.f, rz / 2.f);
                     vec.copyTo(gridPoint->vm.maxs);
                 } else {
                     Vector vec;
 
-                    vec = Vector(-rx / 2, -rx / 2, -rz / 2);
+                    vec = Vector(-rx / 2.f, -rx / 2.f, -rz / 2.f);
                     vec.copyTo(gridPoint->vm.mins);
 
-                    vec = Vector(rx / 2, rx / 2, rz / 2);
+                    vec = Vector(rx / 2.f, rx / 2.f, rz / 2.f);
                     vec.copyTo(gridPoint->vm.maxs);
                 }
             }
@@ -218,10 +218,23 @@ qboolean cMoveGrid::CheckStuck(void)
 
 void cMoveGrid::Archive(Archiver& arc)
 {
+    int i;
+
     arc.ArchiveInteger(&m_iXRes);
     arc.ArchiveInteger(&m_iYRes);
     arc.ArchiveInteger(&m_iZRes);
-    arc.ArchiveRaw(&v, sizeof(vmove_t));
+
+    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]);
diff --git a/code/fgame/movegrid.h b/code/fgame/movegrid.h
index 4740aaab..6847d1b2 100644
--- a/code/fgame/movegrid.h
+++ b/code/fgame/movegrid.h
@@ -39,7 +39,7 @@ typedef struct vehicleState_s {
     int      entityNum;
     vec2_t   desired_dir;
     qboolean hit_obstacle;
-    float    hit_origin[3];
+    vec3_t   hit_origin;
     vec3_t   obstacle_normal;
     qboolean useGravity;
 } vehicleState_t;
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 4d786a95..e8a8f24d 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.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,6 +31,7 @@ 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
 
@@ -45,6 +46,7 @@ cvar_t *ai_fallheight;
 cvar_t *ai_debugpath;
 cvar_t *ai_pathchecktime;
 cvar_t *ai_pathcheckdist;
+cvar_t *ai_editmode; // Added in OPM
 
 static const vec_t *path_start;
 static const vec_t *path_end;
@@ -148,6 +150,7 @@ PathInfo *PathSearch::GeneratePath(PathInfo *path)
             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++;
         }
 
@@ -157,7 +160,8 @@ PathInfo *PathSearch::GeneratePath(PathInfo *path)
             if (pathway->dist) {
                 VectorCopy(pathway->pos2, current_path->point);
                 VectorCopy2D(pathway->dir, current_path->dir);
-                current_path->dist      = pathway->dist;
+                current_path->dist = pathway->dist;
+                assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
                 current_path->bAccurate = true;
                 current_path++;
             }
@@ -166,6 +170,7 @@ PathInfo *PathSearch::GeneratePath(PathInfo *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;
@@ -214,6 +219,7 @@ PathInfo *PathSearch::GeneratePathNear(PathInfo *path)
                 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++;
             }
         }
@@ -252,11 +258,12 @@ PathInfo *PathSearch::GeneratePathAway(PathInfo *path)
         pathway = &ParentNode->Child[Node->pathway];
 
         if (pathway->dist) {
-            VectorCopy(pathway->pos2, path->point);
-            VectorCopy2D(pathway->dir, path->dir);
-            path->dist = 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++;
         }
 
@@ -268,6 +275,7 @@ PathInfo *PathSearch::GeneratePathAway(PathInfo *path)
                 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++;
             }
         }
@@ -314,8 +322,10 @@ int PathSearch::FindPath(
     PathNode  *to;
 
     if (ent) {
+        // Added in OPM
+        //  Check for simple actor
         if (ent->IsSubclassOfActor()) {
-            Node = NearestStartNode(start, (SimpleActor *)ent);
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
         } else {
             Node = DebugNearestStartNode(start, ent);
         }
@@ -380,6 +390,9 @@ int PathSearch::FindPath(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
 
             if (vLeashHome) {
                 VectorSub2D(pathway->pos2, vLeashHome, vDist);
@@ -423,7 +436,8 @@ int PathSearch::FindPath(
             }
 
             if (pathway->fallheight <= fallheight
-                && (!ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team]
+                )) {
                 NewNode->m_Depth   = Node->m_Depth + 1;
                 NewNode->Parent    = Node;
                 NewNode->pathway   = i;
@@ -493,8 +507,10 @@ int PathSearch::FindPathNear(
     vec2_t     delta;
 
     if (ent) {
+        // Added in OPM
+        //  Check for simple actor
         if (ent->IsSubclassOfActor()) {
-            Node = NearestStartNode(start, (SimpleActor *)ent);
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
         } else {
             Node = DebugNearestStartNode(start, ent);
         }
@@ -553,6 +569,9 @@ int PathSearch::FindPathNear(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
 
             g = (int)(pathway->dist + Node->g + 1.0f);
 
@@ -589,7 +608,8 @@ int PathSearch::FindPathNear(
             }
 
             if (pathway->fallheight <= fallheight
-                && (!ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team]
+                )) {
                 NewNode->m_Depth   = Node->m_Depth + 1;
                 NewNode->Parent    = Node;
                 NewNode->pathway   = i;
@@ -656,15 +676,16 @@ int PathSearch::FindPathAway(
     PathNode  *next;
     int        f;
     float      fBias;
-    vec2_t     dir;
     vec2_t     delta;
     float      fMinSafeDistSquared;
 
     fMinSafeDistSquared = fMinSafeDist * fMinSafeDist;
 
     if (ent) {
+        // Added in OPM
+        //  Check for simple actor
         if (ent->IsSubclassOfActor()) {
-            Node = NearestStartNode(start, (SimpleActor *)ent);
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
         } else {
             Node = DebugNearestStartNode(start, ent);
         }
@@ -681,13 +702,13 @@ int PathSearch::FindPathAway(
     open = NULL;
 
     VectorSub2D(Node->origin, start, path_startdir);
-    VectorSub2D(start, avoid, dir);
+    VectorSub2D(start, avoid, delta);
 
     fBias = VectorLength2D(vPreferredDir);
 
     Node->inopen = true;
     Node->g      = VectorNormalize2D(path_startdir);
-    Node->h      = fMinSafeDist - VectorNormalize2D(dir);
+    Node->h      = fMinSafeDist - VectorNormalize2D(delta);
     Node->h += fBias - DotProduct2D(vPreferredDir, delta);
     Node->Parent    = NULL;
     Node->m_Depth   = 2;
@@ -720,6 +741,9 @@ int PathSearch::FindPathAway(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
 
             if (vLeashHome) {
                 VectorSub2D(pathway->pos2, vLeashHome, vDist);
@@ -752,9 +776,9 @@ int PathSearch::FindPathAway(
                 }
             }
 
-            VectorSub2D(pathway->pos2, avoid, dir);
-            NewNode->h = VectorNormalize2D(dir);
-            NewNode->h += fBias - DotProduct2D(dir, vPreferredDir);
+            VectorSub2D(pathway->pos2, avoid, delta);
+            NewNode->h = VectorNormalize2D(delta);
+            NewNode->h += fBias - DotProduct2D(delta, vPreferredDir);
 
             f = (int)((float)g + NewNode->h);
 
@@ -807,7 +831,7 @@ int PathSearch::FindPathAway(
 }
 
 PathNode *PathSearch::FindCornerNodeForWall(
-    const vec3_t start, const vec3_t end, SimpleActor *ent, float maxPath, const vec4_t plane
+    const vec3_t start, const vec3_t end, Entity *ent, float maxPath, const vec4_t plane
 )
 {
     int        i, g;
@@ -818,7 +842,18 @@ PathNode *PathSearch::FindCornerNodeForWall(
     vec2_t     delta;
     vec2_t     dir;
 
-    Node = NearestStartNode(start, ent);
+    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;
@@ -880,7 +915,11 @@ PathNode *PathSearch::FindCornerNodeForWall(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
-            g       = (int)(pathway->dist + Node->g + 1.0f);
+            if (!NewNode) {
+                continue;
+            }
+
+            g = (int)(pathway->dist + Node->g + 1.0f);
 
             if (NewNode->findCount == findFrame) {
                 if (NewNode->g <= g) {
@@ -960,9 +999,9 @@ PathNode *PathSearch::FindCornerNodeForWall(
     return NULL;
 }
 
-PathNode *PathSearch::FindCornerNodeForExactPath(SimpleActor *pSelf, Sentient *enemy, float fMaxPath)
+PathNode *PathSearch::FindCornerNodeForExactPath(Entity *pSelf, Sentient *enemy, float fMaxPath)
 {
-    PathNode *pPathNode[4096];
+    PathNode *pPathNode[MAX_PATHNODES];
     PathNode *pParentNode;
     size_t    i, iDepth;
     Vector    vEnd;
@@ -974,7 +1013,12 @@ PathNode *PathSearch::FindCornerNodeForExactPath(SimpleActor *pSelf, Sentient *e
         return NULL;
     }
 
-    vEyePos   = pSelf->EyePosition();
+    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++) {
@@ -1026,8 +1070,8 @@ void PathSearch::ResetNodes(void)
     m_LoadIndex    = -1;
 
     if (!startBulkNavMemory && nodecount) {
-        for (x = PATHMAP_GRIDSIZE - 1; x >= 0; x--) {
-            for (y = PATHMAP_GRIDSIZE - 1; y >= 0; y--) {
+        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);
                 }
@@ -1035,22 +1079,23 @@ void PathSearch::ResetNodes(void)
         }
 
         for (i = 0; i < nodecount; i++) {
-            if (pathnodes[i]->Child) {
+            if (pathnodes[i] && 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 (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+            PathMap[x][y] = MapCell();
         }
     }
 
     for (i = 0; i < nodecount; i++) {
-        delete pathnodes[i];
-        pathnodes[i] = NULL;
+        if (pathnodes[i]) {
+            delete pathnodes[i];
+            pathnodes[i] = NULL;
+        }
     }
 
     nodecount = 0;
@@ -1063,6 +1108,76 @@ void PathSearch::ResetNodes(void)
     }
 }
 
+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;
@@ -1072,6 +1187,9 @@ void PathSearch::UpdatePathwaysForBadPlace(const Vector& origin, float radius, i
 
     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];
@@ -1088,21 +1206,47 @@ void PathSearch::UpdatePathwaysForBadPlace(const Vector& origin, float radius, i
 
 void AI_AddNode(PathNode *node)
 {
-    int i = PathSearch::nodecount;
+    int i;
 
     assert(node);
 
-    if (i < MAX_PATHNODES) {
-        if (i > ai_maxnode) {
-            ai_maxnode = i;
+    //
+    // Find a free slot
+    //
+    for (i = 0; i < PathSearch::nodecount; i++) {
+        if (!PathSearch::pathnodes[i]) {
+            PathSearch::pathnodes[i] = node;
+            node->nodenum            = i;
+            return;
         }
-        PathSearch::pathnodes[i] = node;
-        node->nodenum            = i;
-        PathSearch::nodecount++;
+    }
+
+    if (i > ai_maxnode) {
+        ai_maxnode = i;
+    }
+
+    if (i >= MAX_PATHNODES) {
+        gi.Error(ERR_DROP, "Exceeded MAX_PATHNODES!\n");
         return;
     }
 
-    gi.Error(ERR_DROP, "Exceeded MAX_PATHNODES!\n");
+    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--;
+    }
 }
 
 /*****************************************************************************/
@@ -1138,7 +1282,8 @@ Event EV_Path_SetLowWallArc
     EV_DEFAULT,
     "f",
     "arc_half_angle",
-    "Marks this node as good for low-wall behavior, and gives the arc"
+    "Marks this node as good for low-wall behavior"
+    "and gives the arc"
 );
 
 CLASS_DECLARATION(SimpleEntity, PathNode, "info_pathnode") {
@@ -1218,7 +1363,7 @@ void PathNode::SetLowWallArc(Event *ev)
 
 void PathNode::ConnectTo(PathNode *node)
 {
-    Child[virtualNumChildren].node            = nodenum;
+    Child[virtualNumChildren].node            = node->nodenum;
     Child[virtualNumChildren].numBlockers     = 0;
     Child[virtualNumChildren].badPlaceTeam[0] = 0;
     Child[virtualNumChildren].badPlaceTeam[1] = 0;
@@ -1287,6 +1432,9 @@ void PathNode::DrawConnections(void)
     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);
     }
@@ -1308,27 +1456,32 @@ static void droptofloor(Vector& vec, PathNode *node)
 
 static bool IsValidPathnode(int spawnflags)
 {
-    if ((spawnflags & AI_DUCK) && (spawnflags & AI_COVERFLAGS2)) {
+    if ((spawnflags & AI_DUCK)
+        && (spawnflags & (AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_CONCEALMENT) && (spawnflags & AI_SNIPERFLAGS)) {
+    if ((spawnflags & AI_CONCEALMENT) && (spawnflags & (AI_COVER | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER))) {
         return false;
     }
 
-    if ((spawnflags & AI_CORNER_LEFT) && (spawnflags & AI_COVER_LEFT_FLAGS)) {
+    if ((spawnflags & AI_CORNER_LEFT)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_CORNER_RIGHT) && (spawnflags & AI_COVER_RIGHT_FLAGS)) {
+    if ((spawnflags & AI_CORNER_RIGHT)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_LEFT | AI_SNIPER | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_SNIPER) && (spawnflags & AI_CRATEFLAGS)) {
+    if ((spawnflags & AI_SNIPER)
+        && (spawnflags & (AI_DUCK | AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_ALL) && (spawnflags & AI_COVERFLAGS3)) {
+    if ((spawnflags & AI_CRATE)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER))) {
         return false;
     }
 
@@ -1337,27 +1490,51 @@ static bool IsValidPathnode(int spawnflags)
 
 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 {
+    if (!IsValidPathnode(spawnflags)) {
         VectorCopy(COLOR_PATHNODE_ERROR, color);
+        return;
     }
+
+    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);
+    }
+}
+
+static int GetNodeTypeFromName(const char *name)
+{
+    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;
+    }
+
+    return -1;
 }
 
 void DrawNode(int iNodeCount)
@@ -1377,7 +1554,7 @@ void DrawNode(int iNodeCount)
     Vector    aStart;
     Vector    aEnd;
     PathNode *node;
-    PathNode *nodelist[4096];
+    PathNode *nodelist[MAX_PATHNODES];
     Vector    end;
     Vector    start;
     Vector    p;
@@ -1385,8 +1562,8 @@ void DrawNode(int iNodeCount)
 
     playerorigin = g_entities[0].client->ps.origin;
 
-    if (iNodeCount > 4096) {
-        iNodeCount = 4096;
+    if (iNodeCount > MAX_PATHNODES) {
+        iNodeCount = MAX_PATHNODES;
     }
 
     if (ai_showallnode->integer) {
@@ -1492,6 +1669,9 @@ void DrawAllConnections(void)
 
     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;
@@ -1509,7 +1689,11 @@ void DrawAllConnections(void)
             }
 
             reverse = false;
-            to      = PathSearch::pathnodes[path->node];
+
+            to = PathSearch::pathnodes[path->node];
+            if (!to) {
+                continue;
+            }
 
             for (int k = to->numChildren - 1; k >= 0; k--) {
                 path2 = &to->Child[k];
@@ -1713,10 +1897,12 @@ int PathSearch::DebugNearestNodeList(const vec3_t pos, PathNode **nodelist, int
 
     int node_count = NearestNodeSetup(pos, cell, nodes, deltas);
     int n          = 0;
-    int j          = 0;
 
-    for (i = 0; i < node_count && j < iMaxNodes; i++) {
+    for (i = 0; i < node_count && n < iMaxNodes; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
         VectorCopy(pos, start);
         VectorCopy(pos, end);
@@ -1769,6 +1955,9 @@ int PathSearch::DebugNearestNodeList2(const vec3_t pos, PathNode **nodelist, int
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
 
         if (pos[2] > node->origin[2] + 94.0f) {
             continue;
@@ -1825,6 +2014,9 @@ PathNode *PathSearch::DebugNearestStartNode(const vec3_t pos, Entity *ent)
 
     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);
@@ -1875,6 +2067,9 @@ PathNode *PathSearch::NearestStartNode(const vec3_t pos, SimpleActor *ent)
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
         VectorAdd(start, deltas[nodes[i]], end);
 
@@ -1942,6 +2137,9 @@ PathNode *PathSearch::NearestEndNode(const vec3_t pos)
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
         VectorAdd(start, deltas[nodes[i]], end);
 
@@ -2016,6 +2214,8 @@ void PathSearch::ShowNodes(void)
             }
         }
     }
+
+    navMaster.Frame();
 }
 
 qboolean PathSearch::ArchiveSaveNodes(void)
@@ -2088,21 +2288,32 @@ void PathSearch::Init(void)
     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);
+
+    //
+    // Added in OPM
+    //
+    ai_editmode = gi.Cvar_Get("ai_editmode", "0", CVAR_LATCH);
+
+    navMaster.Init();
 }
 
 void *PathSearch::AllocPathNode(void)
 {
     if (!bulkNavMemory) {
         return gi.Malloc(sizeof(PathNode));
+    } else {
+        bulkNavMemory -= sizeof(PathNode);
+        if (ai_editmode->integer) {
+            return gi.Malloc(sizeof(PathNode));
+        }
     }
 
-    bulkNavMemory -= sizeof(PathNode);
     return bulkNavMemory;
 }
 
 void PathSearch::FreePathNode(void *ptr)
 {
-    if (!bulkNavMemory) {
+    if (!bulkNavMemory || ai_editmode->integer) {
         gi.Free(ptr);
     }
 }
@@ -2117,7 +2328,7 @@ void PathSearch::PlayerCover(Player *pPlayer)
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
 
-        if (!node || !(node->nodeflags & AI_COVERFLAGS)) {
+        if (!node || !(node->nodeflags & AI_MOVE_MASK)) {
             continue;
         }
 
@@ -2156,20 +2367,20 @@ int node_compare(const void *pe1, const void *pe2)
     nodeinfo *Pe2 = (nodeinfo *)pe2;
     int       iConcealment;
 
-    iConcealment = (Pe1->pNode->nodeflags & AI_CONCEALMENT_MASK) != 0;
+    iConcealment = (Pe1->pNode->nodeflags & AI_CONCEALMENT_MASK) ? 1 : 0;
     if (Pe2->pNode->nodeflags & AI_CONCEALMENT_MASK) {
-        --iConcealment;
+        iConcealment--;
     }
 
     return (
-        (Pe1->fDistSquared) + (iConcealment << 23)
+        *(unsigned int*)&Pe1->fDistSquared + (iConcealment << 23)
         + (((Pe1->pNode->nodeflags & AI_CONCEALMENT) - (Pe2->pNode->nodeflags & AI_CONCEALMENT)) << 21)
-        - (Pe2->fDistSquared)
+        - *(unsigned int*)&Pe2->fDistSquared
     );
 }
 
 int PathSearch::FindPotentialCover(
-    SimpleActor *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind
+    Entity *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind
 )
 {
     nodeinfo  nodes[MAX_PATHNODES];
@@ -2225,7 +2436,7 @@ int PathSearch::FindPotentialCover(
     return nNodes;
 }
 
-PathNode *PathSearch::FindNearestSniperNode(SimpleActor *pEnt, Vector& vPos, Entity *pEnemy)
+PathNode *PathSearch::FindNearestSniperNode(Entity*pEnt, Vector& vPos, Entity *pEnemy)
 {
     Actor    *pSelf = (Actor *)pEnt;
     PathNode *pNode;
@@ -2289,7 +2500,10 @@ PathNode *PathSearch::FindNearestSniperNode(SimpleActor *pEnt, Vector& vPos, Ent
 
 PathNode *PathSearch::GetSpawnNode(ClassDef *cls)
 {
-    if (m_bNodesloaded) {
+    if (m_bNodesloaded
+        // Fixed in OPM
+        && m_LoadIndex < nodecount
+        ) {
         return pathnodes[m_LoadIndex++];
     } else {
         // Otherwise create a new node
@@ -2360,6 +2574,9 @@ void PathSearch::CreatePaths(void)
 
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
 
         droptofloor(node->origin, node);
         node->centroid = node->origin;
@@ -2370,6 +2587,9 @@ void PathSearch::CreatePaths(void)
 
         for (j = i - 1; j >= 0; j--) {
             PathNode *node2 = pathnodes[j];
+            if (!node2) {
+                continue;
+            }
 
             if (node->origin == node2->origin) {
                 Com_Printf(
@@ -2391,7 +2611,7 @@ void PathSearch::CreatePaths(void)
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
 
-        if (node->nodeflags & PATH_DONT_LINK) {
+        if (!node || (node->nodeflags & PATH_DONT_LINK)) {
             continue;
         }
 
@@ -2401,7 +2621,7 @@ void PathSearch::CreatePaths(void)
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
 
-        if (node->nodeflags & PATH_DONT_LINK) {
+        if (!node || (node->nodeflags & PATH_DONT_LINK)) {
             continue;
         }
 
@@ -2603,6 +2823,9 @@ bool PathSearch::Connect(PathNode *node, int x, int y)
 
     for (i = 0; i < cell->numnodes; i++) {
         node2 = pathnodes[cell->nodes[i]];
+        if (!node2) {
+            continue;
+        }
 
         if (node2->findCount != findFrame) {
             node2->findCount = findFrame;
@@ -2667,15 +2890,14 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
     mm.mins[2] = 0;
     mm.maxs[0] = size;
     mm.maxs[1] = size;
-    mm.maxs[2] = 94.0f;
+    mm.maxs[2] = MAXS_Z;
 
     testcount  = 0;
     fallheight = 0.0f;
     air_z      = mm.origin[2];
 
-    for (i = 200; i != 1; i--) {
-        testpos[i - 1] = mm.origin;
-        testcount++;
+    for (i = 0; i < 200; i++) {
+        testpos[testcount++] = mm.origin;
 
         MmoveSingle(&mm);
 
@@ -2683,6 +2905,32 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
             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;
                 }
@@ -2698,10 +2946,8 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
         if (DotProduct2D(dir, mm.desired_dir) <= 0.1f) {
             error = mm.origin[2] - pos[2];
 
-            gi.Printf("error = %f\n", error);
-
             *path_fallheight = (short)fallheight;
-            if (fabs(error) <= 94.0f) {
+            if (fabs(error) <= MAXS_Z) {
                 if (error <= 0.0f || mm.groundPlane) {
                     return true;
                 }
@@ -2718,8 +2964,6 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
                     *path_fallheight = (short)test_fallheight + fallheight;
                     return test_fallheight + fallheight <= 1024.0f;
                 }
-            } else {
-                return true;
             }
 
             if (mm.groundPlane) {
@@ -3033,6 +3277,9 @@ int PathSearch::NearestNodeSetup(const vec3_t pos, MapCell *cell, int *nodes, ve
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[cell->nodes[i]];
+        if (!node) {
+            continue;
+        }
 
         if (pos[2] > node->origin[2] + 94.0f) {
             continue;
@@ -3064,12 +3311,323 @@ int PathSearch::NearestNodeSetup(const vec3_t pos, MapCell *cell, int *nodes, ve
     return n;
 }
 
-PathNode *PathSearch::FindNearestCover(SimpleActor *pEnt, Vector& vPos, Entity *pEnemy)
+PathNode *PathSearch::FindNearestCover(Entity *pEnt, Vector& vPos, Entity *pEnemy)
 {
     // not found in ida
     return NULL;
 }
 
+//===============
+// 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()
+{
+    G_CreateMaster("nav", this);
+
+    if (ai_editmode->integer) {
+        // show routes by default
+        gi.cvar_set("ai_showroutes", "1");
+        gi.cvar_set("ai_shownode", "30");
+    }
+}
+
+void NavMaster::CreatePaths(Event *ev)
+{
+    if (!ai_editmode->integer) {
+        return;
+    }
+    PathSearch::ClearNodes();
+    PathSearch::CreatePaths();
+}
+
+void NavMaster::CreateNode(Event *ev)
+{
+    str       type;
+    int       spawnflags = 0;
+    PathNode *node;
+    Entity   *ent;
+
+    if (ev->NumArgs() > 0) {
+        type       = ev->GetString(1);
+        spawnflags = GetNodeTypeFromName(type);
+        if (spawnflags == -1) {
+            ScriptError("Unrecognized node type '%s'", type.c_str());
+        }
+    }
+
+    ent = g_entities->entity;
+    if (!ent) {
+        return;
+    }
+
+    node = new PathNode;
+
+    node->nodeflags = spawnflags;
+    node->setOrigin(ent->origin);
+}
+
+void NavMaster::SetNodeFlags(Event *ev)
+{
+    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());
+}
+
+void NavMaster::SetNodeTargetName(Event *ev)
+{
+    CheckNodeSelected();
+
+    selectedNode->targetname = ev->GetString(1);
+
+    gi.Printf("Node %d got new targetname '%s'\n", selectedNode->nodenum, selectedNode->targetname.c_str());
+}
+
+void NavMaster::SetNodeTarget(Event *ev)
+{
+    CheckNodeSelected();
+
+    selectedNode->target = ev->GetString(1);
+
+    gi.Printf("Node %d got new target '%s'\n", selectedNode->nodenum, selectedNode->target.c_str());
+}
+
+void NavMaster::RemoveNode(Event *ev)
+{
+    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",
@@ -3079,7 +3637,6 @@ Event EV_AttractiveNode_GetPriority
     "Get the node priority",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetPriority
 (
     "priority",
@@ -3089,7 +3646,6 @@ Event EV_AttractiveNode_SetPriority
     "Set the node priority",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetDistance
 (
     "max_dist",
@@ -3099,7 +3655,6 @@ Event EV_AttractiveNode_GetDistance
     "Get the max distance for this node",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetDistance
 (
     "max_dist",
@@ -3109,7 +3664,6 @@ Event EV_AttractiveNode_SetDistance
     "Set the max distance for this node to be attracted, -1 for unlimited distance.",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetStayTime
 (
     "stay_time",
@@ -3119,7 +3673,6 @@ Event EV_AttractiveNode_GetStayTime
     "Get the max stay time for this node",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetStayTime
 (
     "stay_time",
@@ -3129,7 +3682,6 @@ Event EV_AttractiveNode_SetStayTime
     "Set the maximum stay time AI will stay on this node",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetRespawnTime
 (
     "respawn_time",
@@ -3139,7 +3691,6 @@ Event EV_AttractiveNode_GetRespawnTime
     "Get the how much time will this node re-attract already attracted AIs",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetRespawnTime
 (
     "respawn_time",
@@ -3150,7 +3701,6 @@ Event EV_AttractiveNode_SetRespawnTime
     "AI will get stuck.",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetTeam
 (
     "team",
@@ -3160,7 +3710,6 @@ Event EV_AttractiveNode_GetTeam
     "Get the attractive node team. 'none' for no team.",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetTeam
 (
     "team",
@@ -3170,8 +3719,14 @@ Event EV_AttractiveNode_SetTeam
     "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");
+Event EV_AttractiveNode_SetUse
+(
+    "setuse",
+    EV_DEFAULT,
+    "b",
+    "use",
+    "Set if AI should use or not"
+);
 
 CLASS_DECLARATION(SimpleArchivedEntity, AttractiveNode, NULL) {
     {&EV_AttractiveNode_GetPriority,    &AttractiveNode::GetPriority   },
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 8d6934df..3404aebc 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.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.
 
@@ -66,6 +66,7 @@ extern int path_checksthisframe;
 
 class Path;
 class PathNode;
+class SimpleActor;
 
 #define NUM_WIDTH_VALUES 16
 #define WIDTH_STEP       8
@@ -103,9 +104,18 @@ public:
     vec2_t dir;
 
 public:
+    PathInfo();
+
     void 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);
@@ -131,17 +141,10 @@ typedef enum {
 // 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 | AI_LOW_WALL_ARC)
-#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_COVER_MASK        (AI_CRATE | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_COVER)
-#define AI_CONCEALMENT_MASK  (AI_CRATE | AI_CORNER_RIGHT | AI_CONCEALMENT | AI_LOW_WALL_ARC)
-#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);
@@ -249,7 +252,7 @@ private:
     static int       m_LoadIndex;
 
 public:
-    static PathNode   *pathnodes[4096];
+    static PathNode   *pathnodes[MAX_PATHNODES];
     static int         nodecount;
     static float       total_dist;
     static const char *last_error;
@@ -283,7 +286,7 @@ public:
     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, class SimpleActor *ent);
+    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);
@@ -294,8 +297,9 @@ public:
     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 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);
@@ -331,15 +335,14 @@ public:
         float        fLeashDistSquared,
         int          fallheight
     );
-    static class PathNode *FindCornerNodeForWall(
-        const vec3_t start, const vec3_t end, class SimpleActor *ent, float maxPath, const vec4_t 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 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(const vec3_t pos, MapCell *cell, int *nodes, vec3_t *deltas);
@@ -357,6 +360,34 @@ extern PathSearch PathManager;
 // 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);
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 f94913bf..7b10c5bb 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.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.
 
@@ -58,6 +58,13 @@ 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);
 
+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
 //
@@ -87,7 +94,7 @@ const char *pInstantMsgEng[6][9] = {
      "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
+    // 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!",
@@ -278,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
@@ -1174,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",
@@ -1278,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
@@ -1352,6 +1362,15 @@ Event EV_Player_AdminRights
     "returns client admin rights",
     EV_GETTER
 );
+Event EV_Player_IsAdmin
+(
+    "isadmin",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "checks if player is logged as admin",
+    EV_RETURN
+);
 Event EV_Player_BindWeap
 (
     "bindweap",
@@ -1361,24 +1380,6 @@ Event EV_Player_BindWeap
     "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",
@@ -1388,15 +1389,6 @@ Event EV_Player_Dive
     "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",
@@ -1478,15 +1470,6 @@ Event EV_Player_GetTorsoState
     "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",
@@ -1505,15 +1488,6 @@ Event EV_Player_InventorySet
     "Set up the player's inventory",
     EV_SETTER
 );
-Event EV_Player_IsAdmin
-(
-    "isadmin",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "checks if player is logged as admin",
-    EV_RETURN
-);
 Event EV_Player_LeanLeftHeld
 (
     "leanleftheld",
@@ -1560,15 +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",
@@ -1585,7 +1550,7 @@ Event EV_Player_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
@@ -1616,33 +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",
@@ -1671,13 +1609,13 @@ 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
@@ -1734,6 +1672,62 @@ Event EV_Player_ViewModelAnimValid
     "True if the view model animation is valid.",
     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",
@@ -1762,6 +1756,7 @@ 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);
 
@@ -1915,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                 },
@@ -1943,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               },
@@ -1957,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                                  }
 };
 
@@ -2033,11 +2027,14 @@ Player::Player()
     //
     // Added in OPM
     //====
-    m_bShowingHint      = false;
-    disable_spectate    = false;
-    disable_team_change = false;
-    m_fpsTiki           = NULL;
-    m_bConnected        = false;
+#ifdef OPM_FEATURES
+    m_bShowingHint = false;
+#endif
+    m_fpsTiki    = NULL;
+    m_bConnected = false;
+
+    m_iInstantMessageTime = 0;
+    m_iTextChatTime       = 0;
     //====
 
     if (LoadingSavegame) {
@@ -2213,6 +2210,17 @@ 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;
 }
 
@@ -2262,6 +2270,8 @@ void Player::Init(void)
 
         Event *ev = new Event;
         ev->AddEntity(this);
+
+        scriptDelegate_connected.Trigger(this, *ev);
         scriptedEvents[SE_CONNECTED].Trigger(ev);
     }
 
@@ -2304,7 +2314,6 @@ void Player::InitEdict(void)
 }
 
 void Player::InitSound(void)
-
 {
     //
     // reset the music
@@ -2361,7 +2370,9 @@ void Player::InitClient(void)
 
     SetStopwatch(0);
 
+#ifdef OPM_FEATURES
     m_bShowingHint = false;
+#endif
 }
 
 void Player::InitState(void)
@@ -2390,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);
@@ -2401,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)
@@ -2438,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
             //
@@ -2530,12 +2540,12 @@ 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);
 }
@@ -2562,7 +2572,6 @@ void Player::InitPhysics(void)
 }
 
 void Player::InitPowerups(void)
-
 {
     // powerups
     poweruptimer = 0;
@@ -2586,17 +2595,21 @@ 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)
@@ -2663,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;
@@ -2721,7 +2738,6 @@ void Player::Respawn(Event *ev)
 }
 
 void Player::SetDeltaAngles(void)
-
 {
     int i;
 
@@ -2800,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()));
@@ -2921,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,
@@ -3008,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()));
@@ -3120,7 +3136,7 @@ void Player::Killed(Event *ev)
     RemoveFromVehiclesAndTurrets();
 
     if (g_gametype->integer != GT_SINGLE_PLAYER && attacker && attacker->IsSubclassOfPlayer()) {
-        ((Player *)attacker)->KilledPlayerInDeathmatch(this);
+        static_cast<Player *>(attacker)->KilledPlayerInDeathmatch(this, (meansOfDeath_t)meansofdeath);
     }
 
     deadflag = DEAD_DYING;
@@ -3209,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);
@@ -3279,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;
 
     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)
@@ -3364,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;
     }
 
@@ -3417,6 +3444,7 @@ 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
@@ -3428,39 +3456,76 @@ void Player::DoUse(Event *ev)
         return;
     }
 
-    if (m_pVehicle || m_pTurret) {
+    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 ((buttons & BUTTON_ATTACKLEFT) || (buttons & BUTTON_ATTACKRIGHT)) {
-        //
-        // Added in 2.0
-        //  Only allow use if the player isn't holding attack buttons
-        //
-        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);
 
-    for (i = 0; i < num; i++) {
-        hit = &g_entities[touch[i]];
+    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]];
 
-        if (!hit->inuse) {
-            continue;
+            if (!hit->inuse) {
+                continue;
+            }
+
+            Event *event = new Event(EV_Use);
+            event->AddListener(this);
+
+            hit->entity->ProcessEvent(event);
+
+            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]];
 
-        Event *event = new Event(EV_Use);
-        event->AddListener(this);
+            if (!hit->inuse) {
+                continue;
+            }
 
-        hit->entity->ProcessEvent(event);
+            Event *event = new Event(EV_Use);
+            event->AddListener(this);
 
-        if (m_pVehicle || m_pTurret) {
-            break;
+            hit->entity->ProcessEvent(event);
         }
     }
 
-    if (i < num && m_pVehicle) {
+    if (!bWasInTurretOrVehicle && m_pVehicle) {
         //
         // Added in 2.30
         //  Make the vehicle also invincible if the player is invincible
@@ -3568,6 +3633,10 @@ void Player::GetMoveInfo(pmove_t *pm)
         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]);
@@ -3656,14 +3725,23 @@ void Player::SetMoveInfo(pmove_t *pm, usercmd_t *ucmd)
         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->leanRecoverSpeed = 15.f;
         pm->leanSpeed        = 4.f;
     }
 
     pm->protocol = g_protocol;
+
+    // Added in OPM
+    //  Initialize the ground entity
+    pm->ps->groundEntityNum = ENTITYNUM_NONE;
 }
 
 pmtype_t Player::GetMovePlayerMoveType(void)
@@ -3737,7 +3815,6 @@ qboolean Player::AnimMove(Vector& move, Vector *endpos)
 }
 
 qboolean Player::TestMove(Vector& move, Vector *endpos)
-
 {
     trace_t trace;
     Vector  pos(origin + move);
@@ -3790,7 +3867,6 @@ qboolean Player::TestMove(Vector& move, Vector *endpos)
 }
 
 float Player::TestMoveDist(Vector& move)
-
 {
     Vector endpos;
 
@@ -3876,7 +3952,6 @@ qboolean Player::CheckMove(Vector& move, Vector *endpos)
 }
 
 float Player::CheckMoveDist(Vector& move)
-
 {
     Vector endpos;
 
@@ -3891,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;
@@ -3910,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();
         }
     }
@@ -3927,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;
@@ -3948,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) {
@@ -4008,9 +4083,9 @@ 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();
             }
         }
     }
@@ -4115,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;
@@ -4129,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);
     }
@@ -4146,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) {
@@ -4161,10 +4240,19 @@ void Player::TurretMove(usercmd_t *ucmd)
 
     client->ps.gravity = gravity * sv_gravity->value;
 
-    if (!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);
     }
 }
 
@@ -4188,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")) {
             //
@@ -4217,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;
@@ -4432,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 != GT_SINGLE_PLAYER && 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 {
@@ -4445,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))) {
@@ -4466,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) {
@@ -4643,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);
             }
         }
 
@@ -4672,7 +4768,7 @@ void Player::Think(void)
                 }
             } else {
                 if ((server_new_buttons & BUTTON_USE)) {
-                    SetPlayerSpectateRandom();
+                    SetPlayerSpectate(true);
                 }
             }
 
@@ -4685,7 +4781,8 @@ void Player::Think(void)
                     if (!ent->inuse || !ent->entity) {
                         // Invalid spectate entity
                         SetPlayerSpectateRandom();
-                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator() || IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
+                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator()
+                               || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
                         SetPlayerSpectateRandom();
                     }
                 }
@@ -4708,9 +4805,11 @@ void Player::Think(void)
                     if (!ent->inuse || !ent->entity) {
                         // Invalid spectate entity
                         SetPlayerSpectateRandom();
-                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator() || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
+                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator()
+                               || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
                         SetPlayerSpectateRandom();
-                    } else if (g_gametype->integer >= GT_TEAM && GetTeam() > TEAM_FREEFORALL && static_cast<Player*>(ent->entity)->GetTeam() != GetTeam()) {
+                    } else if (g_gametype->integer >= GT_TEAM && GetTeam() > TEAM_FREEFORALL
+                               && static_cast<Player *>(ent->entity)->GetTeam() != GetTeam()) {
                         SetPlayerSpectateRandom();
                     }
                 }
@@ -4728,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:
@@ -4844,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) {
@@ -4889,6 +4988,8 @@ void Player::Think(void)
     }
 
     server_new_buttons = 0;
+
+    edict->r.svFlags &= ~(SVF_SINGLECLIENT | SVF_NOTSINGLECLIENT);
 }
 
 void Player::InitLegsStateTable(void)
@@ -4920,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;
 
@@ -4973,7 +5090,6 @@ void Player::ResetState(Event *ev)
 }
 
 void Player::StartPush(void)
-
 {
     trace_t trace;
     Vector  end(origin + yaw_forward * 64.0f);
@@ -4989,7 +5105,6 @@ void Player::StartPush(void)
 }
 
 void Player::StartClimbLadder(void)
-
 {
     trace_t trace;
     Vector  end(origin + yaw_forward * 20.0f);
@@ -5066,13 +5181,11 @@ void Player::StartUseAnim(void)
 }
 
 void Player::StartLoopUseAnim(void)
-
 {
     useanim_numloops--;
 }
 
 void Player::FinishUseAnim(Event *ev)
-
 {
     UseAnim *ua;
 
@@ -5086,7 +5199,6 @@ void Player::FinishUseAnim(Event *ev)
 }
 
 void Player::SetupUseObject(void)
-
 {
     UseObject *uo;
     Vector     neworg;
@@ -5136,7 +5248,6 @@ void Player::SetupUseObject(void)
 }
 
 void Player::StartUseObject(Event *ev)
-
 {
     UseObject *uo;
 
@@ -5149,7 +5260,6 @@ void Player::StartUseObject(Event *ev)
 }
 
 void Player::FinishUseObject(Event *ev)
-
 {
     UseObject *uo;
 
@@ -5163,7 +5273,6 @@ void Player::FinishUseObject(Event *ev)
 }
 
 void Player::Turn(Event *ev)
-
 {
     float  yaw;
     Vector oldang(v_angle);
@@ -5187,7 +5296,6 @@ void Player::Turn(Event *ev)
 }
 
 void Player::TurnUpdate(Event *ev)
-
 {
     float  yaw;
     float  timeleft;
@@ -5216,7 +5324,6 @@ void Player::TurnUpdate(Event *ev)
 }
 
 void Player::TurnLegs(Event *ev)
-
 {
     float yaw;
 
@@ -5239,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
@@ -5260,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);
@@ -5304,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 {
@@ -5311,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);
                 }
 
@@ -5321,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) {
@@ -5362,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);
@@ -5397,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;
@@ -5408,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"
             );
@@ -5430,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"
             );
@@ -5473,26 +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 != GT_SINGLE_PLAYER) {
-            while (weapon && weapon != activeWeapon && weapon->IsSubclassOfInventoryItem()) {
-                Weapon *prev = PreviousWeapon(weapon);
-                // Added in OPM
-                //  Fixes the bug that cause infinite loop when the last weapon has no ammo
-                //  and the only weapon is an inventory item
-                if (prev == weapon) {
-                    break;
-                }
-                weapon = prev;
+    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 {
@@ -5502,30 +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 != GT_SINGLE_PLAYER) {
-            while (weapon && weapon != activeWeapon && weapon->IsSubclassOfInventoryItem()) {
-                Weapon *next = NextWeapon(weapon);
-                // Added in OPM
-                //  Fixes the bug that cause infinite loop when the last weapon has no ammo
-                //  and the only weapon is an inventory item
-                if (next == weapon) {
-                    break;
-                }
-                weapon = next;
+    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 {
@@ -5591,13 +5807,11 @@ void Player::DropCurrentWeapon(Event *ev)
 }
 
 void Player::GiveWeaponCheat(Event *ev)
-
 {
     giveItem(ev->GetString(1));
 }
 
 void Player::GiveCheat(Event *ev)
-
 {
     str name;
 
@@ -5627,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;
@@ -5638,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;
                 }
@@ -5774,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;
@@ -5786,7 +6001,6 @@ void Player::NoclipCheat(Event *ev)
 }
 
 void Player::GameVersion(Event *ev)
-
 {
     gi.SendServerCommand(edict - g_entities, "print \"%s : %s\n\"", GAMEVERSION, __DATE__);
 }
@@ -5804,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)
@@ -5845,7 +6064,6 @@ CalcRoll
 ===============
 */
 float Player::CalcRoll(void)
-
 {
     float  sign;
     float  side;
@@ -5956,7 +6174,6 @@ AddBlend
 =============
 */
 void Player::AddBlend(float r, float g, float b, float a)
-
 {
     float a2;
     float a3;
@@ -5983,7 +6200,6 @@ CalcBlend
 =============
 */
 void Player::CalcBlend(void)
-
 {
     int    contents;
     Vector vieworg;
@@ -6154,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;
@@ -6741,7 +6963,6 @@ void Player::SetupView(void)
 }
 
 Vector Player::GetAngleToTarget(Entity *ent, str tag, float yawclamp, float pitchclamp, Vector baseangles)
-
 {
     assert(ent);
 
@@ -6786,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;
@@ -6901,7 +7121,7 @@ void Player::FinishMove(void)
     DamageFeedback();
     CalcBlend();
 
-    if (g_gametype->integer != GT_SINGLE_PLAYER && 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 {
@@ -6932,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;
@@ -6969,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;
@@ -6998,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;
@@ -7122,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()) {
@@ -7207,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);
         }
     }
@@ -7453,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;
 
@@ -7484,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;
@@ -7569,7 +7781,6 @@ void Player::EndFrame(void)
 }
 
 void Player::GotKill(Event *ev)
-
 {
     /*
     Entity *victim;
@@ -7592,7 +7803,6 @@ void Player::GotKill(Event *ev)
 }
 
 void Player::SetPowerupTimer(Event *ev)
-
 {
     Event *event;
 
@@ -7603,7 +7813,6 @@ void Player::SetPowerupTimer(Event *ev)
 }
 
 void Player::UpdatePowerupTimer(Event *ev)
-
 {
     poweruptimer -= 1;
     if (poweruptimer > 0) {
@@ -7641,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;
@@ -7649,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;
@@ -7666,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;
     }
 }
 
@@ -7689,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);
@@ -7699,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
@@ -7713,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;
@@ -7728,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()
@@ -7882,7 +8120,6 @@ void Player::Holster(Event *ev)
 }
 
 void Player::WatchActor(Event *ev)
-
 {
     if (camera || currentState_Torso->getCameraType() != CAMERA_BEHIND) {
         return;
@@ -7892,7 +8129,6 @@ void Player::WatchActor(Event *ev)
 }
 
 void Player::StopWatchingActor(Event *ev)
-
 {
     Actor *old_actor;
 
@@ -7915,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;
@@ -7933,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);
 
@@ -7944,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();
@@ -7956,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();
@@ -8601,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()
@@ -8696,7 +8929,12 @@ void Player::EquipWeapons()
             }
             break;
         case NA_GERMAN:
-            if (g_target_game < target_game_e::TG_MOHTA || 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");
@@ -8904,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;
     }
@@ -9074,10 +9322,6 @@ void Player::SetPlayerSpectate(bool bNext)
         }
     }
 
-    if (m_iPlayerSpectating >= game.maxclients) {
-        m_iPlayerSpectating = 0;
-    }
-
     for (i = num; i < game.maxclients && i >= 0; i += dir) {
         ent = &g_entities[i];
         if (!ent->inuse || !ent->entity) {
@@ -9092,12 +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;
     }
 
     if (m_iPlayerSpectating) {
@@ -9227,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")) {
@@ -9252,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;
     }
 
@@ -9450,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;
@@ -9481,19 +9711,21 @@ 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 != GT_SINGLE_PLAYER) {
-        dmManager.RemovePlayer(this);
-    }
+    //     if (g_gametype->integer != GT_SINGLE_PLAYER) {
+    //         dmManager.RemovePlayer(this);
+    //     }
 }
 
 void Player::CallVote(Event *ev)
@@ -9870,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) {
@@ -9960,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;
 }
 
@@ -10097,7 +10370,9 @@ void Player::Stats(Event *ev)
         }
     }
 
-    szPreferredWeapon = m_sPerferredWeaponOverride;
+    if (m_sPerferredWeaponOverride.length()) {
+        szPreferredWeapon = m_sPerferredWeaponOverride;
+    }
 
     if (iNumHits) {
         Com_sprintf(
@@ -10109,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,
@@ -10163,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;
+        }
     }
 }
 
@@ -10314,11 +10608,12 @@ void Player::PlayInstantMessageSound(const char *name)
 
 void Player::EventDMMessage(Event *ev)
 {
-    int              i;
-    int              iStringLength;
+    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;
@@ -10335,6 +10630,17 @@ void Player::EventDMMessage(Event *ev)
         return;
     }
 
+    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
@@ -10347,8 +10653,31 @@ void Player::EventDMMessage(Event *ev)
             return;
         }
 
+        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;
+        }
+
+        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);
-        sAliasName += va("%c%c", (sToken[1] + '0'), (sToken[2] + '0'));
+        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 {
+            sAliasName += va("%c%c", (sToken[1] + '0'), (sToken[2] + '0'));
+        }
+
         sRandomAlias = GetRandomAlias(sAliasName, &pSoundAlias);
 
         // find a random alias
@@ -10392,26 +10721,48 @@ void Player::EventDMMessage(Event *ev)
             } else {
                 iMode = -1;
             }
+        }
+    } else {
+        if (!g_textmsg_allowed->integer) {
+            // Added in OPM
 
-            if (g_voiceChatTime->value > 0) {
-                m_fTalkTime = g_voiceChatTime->value + level.time;
-            }
+            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 (!bInstaMessage) {
+    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;
     }
 
-    strcpy(szPrintString, "print \"" HUD_MESSAGE_CHAT_WHITE);
+    Q_strncpyz(szPrintString, "print \"" HUD_MESSAGE_CHAT_WHITE, sizeof(szPrintString));
 
     if (m_bSpectator) {
         if (iMode <= 0) {
-            strcat(szPrintString, gi.CL_LV_ConvertString("(spectator)"));
-            strcat(szPrintString, " ");
+            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];
 
@@ -10431,8 +10782,8 @@ void Player::EventDMMessage(Event *ev)
         }
     } else if (IsDead() || m_bTempSpectator) {
         if (iMode <= 0) {
-            strcat(szPrintString, gi.CL_LV_ConvertString("(dead)"));
-            strcat(szPrintString, " ");
+            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];
 
@@ -10451,24 +10802,31 @@ void Player::EventDMMessage(Event *ev)
             }
         }
     } else if (iMode < 0) {
-        strcat(szPrintString, gi.CL_LV_ConvertString("(team)"));
-        strcat(szPrintString, " ");
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(team)"));
+        Q_strcat(szPrintString, sizeof(szPrintString), " ");
     } else if (iMode > 0) {
-        strcat(szPrintString, gi.CL_LV_ConvertString("(private)"));
-        strcat(szPrintString, " ");
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(private)"));
+        Q_strcat(szPrintString, sizeof(szPrintString), " ");
     }
 
-    strcat(szPrintString, client->pers.netname);
+    Q_strcat(szPrintString, sizeof(szPrintString), client->pers.netname);
 
     if (bInstaMessage) {
-        strcat(szPrintString, ": ");
-        strcat(szPrintString, gi.LV_ConvertString(pTmpInstantMsg));
+        Q_strcat(szPrintString, sizeof(szPrintString), ": ");
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.LV_ConvertString(pTmpInstantMsg));
     } else {
-        bool met_comment;
+        bool met_comment = false;
 
-        strcat(szPrintString, ":");
+        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
@@ -10480,34 +10838,57 @@ void Player::EventDMMessage(Event *ev)
                 break;
             }
 
-            // Added in OPM.
-            //  Checks for comments in string (as COM_Parse will parse them)
-            if (strstr(sToken, "/*")) {
-                met_comment = true;
-            }
-
-            if (strstr(sToken, "*/") && met_comment) {
+            if (met_comment && strstr(sToken, "*/")) {
                 // ignore messages containing comments
                 return;
             }
 
-            strcat(szPrintString, " ");
-            strcat(szPrintString, gi.LV_ConvertString(sToken));
+            Q_strcat(szPrintString, sizeof(szPrintString), " ");
+            Q_strcat(szPrintString, sizeof(szPrintString), gi.LV_ConvertString(sToken));
         }
     }
 
-    strcat(szPrintString, "\n");
+    Q_strcat(szPrintString, sizeof(szPrintString), "\n");
 
     // ignore names containing comments
-    if (strstr(client->pers.netname, "//")
-        || (strstr(client->pers.netname, "/*") && strstr(client->pers.netname, "*/"))) {
-        return;
+    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) {
         //
-        // team message
+        // 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];
@@ -10548,10 +10929,27 @@ void Player::EventDMMessage(Event *ev)
                 gi.SendServerCommand(i, "%s", szPrintString);
             }
         }
+
+        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
         //
+
+        // 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];
@@ -10568,41 +10966,41 @@ void Player::EventDMMessage(Event *ev)
             }
         } else {
             for (i = 0; i < game.maxclients; i++) {
+                bool bSameTeam;
+
                 ent = &g_entities[i];
 
                 if (!ent->inuse || !ent->entity) {
                     continue;
                 }
 
-                if (static_cast<Player *>(ent->entity)->GetTeam() != GetTeam()) {
-                    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(qtrue, 1);
-                    gi.MSG_WriteBits(edict - g_entities, 6);
-                    gi.MSG_WriteString(sAliasName.c_str());
-                    gi.MSG_EndCGM();
-
-                    continue;
+                bSameTeam = static_cast<Player *>(ent->entity)->GetTeam() == GetTeam();
+                if (bSameTeam) {
+                    gi.SendServerCommand(i, "%s", szPrintString);
                 }
 
-                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(qfalse, 1);
+                    gi.MSG_WriteBits(!bSameTeam, 1);
                     gi.MSG_WriteBits(edict - g_entities, 6);
                     gi.MSG_WriteString(sAliasName.c_str());
                     gi.MSG_EndCGM();
                 }
             }
         }
+
+        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];
 
@@ -10620,6 +11018,25 @@ void Player::EventDMMessage(Event *ev)
             return;
         }
 
+        // 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(iMode - 1, "%s", szPrintString);
 
         if (ent->entity != this) {
@@ -10663,7 +11080,7 @@ str Player::GetBattleLanguageCondition() const
     case 0:
         return "almost dead";
     case 1:
-        return "severly wounded";
+        return "severely wounded";
     case 2:
         return "wounded";
     case 3:
@@ -10735,7 +11152,7 @@ str Player::GetBattleLanguageLocalFolks()
                     break;
                 }
 
-                strcpy(p, ", ");
+                Q_strncpyz(p, ", ", sizeof(buf) - (p - buf));
                 p += 2;
                 curP = p;
                 remaining -= 2;
@@ -10746,7 +11163,7 @@ str Player::GetBattleLanguageLocalFolks()
                 break;
             }
 
-            strcpy(p, client->pers.netname);
+            Q_strncpyz(p, client->pers.netname, sizeof(buf) - (p - buf));
             p += length;
             remaining -= length;
             pFolk = pPlayer;
@@ -10754,8 +11171,8 @@ str 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";
     }
@@ -10888,7 +11305,7 @@ str Player::TranslateBattleLanguageTokens(const char *string)
     }
 
     if (!string) {
-        return NULL;
+        return str();
     }
 
     if (string[0] != '$') {
@@ -10939,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())
+        );
     }
 }
 
@@ -11167,7 +11588,6 @@ void Player::EventSetPerferredWeapon(Event *ev)
 }
 
 void Player::SetMouthAngle(Event *ev)
-
 {
     int    tag_num;
     float  angle_percent;
@@ -11200,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);
@@ -11367,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) {
@@ -11541,9 +12021,9 @@ void Player::UserSelectWeapon(bool bWait)
     }
 
     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
@@ -11552,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;
     }
 
@@ -11664,51 +12144,160 @@ bool Player::IsReady(void) const
 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)
@@ -11732,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;
@@ -11793,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)
@@ -11847,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)
@@ -11919,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)
@@ -12002,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;
@@ -12057,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);
@@ -12118,32 +12675,7 @@ 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)
@@ -12155,38 +12687,6 @@ void Player::SetKillHandler(Event *ev)
     }
 }
 
-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;
@@ -12237,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);
@@ -12299,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
@@ -12353,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 != 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_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));
-    }
-}
+#endif
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 03501e3c..93a7986b 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.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.
 
@@ -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,12 +356,12 @@ 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];
     ScriptThreadLabel   m_killedLabel;
@@ -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);
@@ -539,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);
 
@@ -800,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();
@@ -843,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);
@@ -906,19 +924,18 @@ public:
     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);
@@ -933,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);
@@ -945,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);
@@ -978,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);
@@ -1123,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) {
@@ -1145,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);
@@ -1157,10 +1192,31 @@ 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();
     }
 
diff --git a/code/fgame/player_animation.cpp b/code/fgame/player_animation.cpp
index a8098fe1..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.
 
@@ -61,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;
     }
 
@@ -89,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;
@@ -113,7 +115,7 @@ 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]);
@@ -143,7 +145,7 @@ void Player::StopPartAnimating(bodypart_t part)
 
     StopAnimating(m_iPartSlot[part]);
 
-    if (part) {
+    if (part != legs) {
         animdone_Torso = false;
     } else {
         animdone_Legs = false;
@@ -158,7 +160,7 @@ void Player::PausePartAnim(bodypart_t part)
 
 int Player::CurrentPartAnim(bodypart_t part) const
 {
-    if (!*partAnim[part]) {
+    if (partAnim[part] == "") {
         return -1;
     }
 
@@ -345,18 +347,12 @@ void Player::AdjustAnimBlends(void)
     if (m_fPartBlends[legs] <= 0.0f) {
         if (partOldAnim[legs] != "") {
             StopAnimating(iOldPartSlot);
+        }
 
-            if (partAnim[legs] == "") {
-                SetWeight(iPartSlot, 0.0);
-            } else {
-                SetWeight(iPartSlot, 1.0);
-            }
+        if (partAnim[legs] == "") {
+            SetWeight(iPartSlot, 0.0);
         } else {
-            if (partAnim[legs] == "") {
-                SetWeight(iPartSlot, 0.0);
-            } else {
-                SetWeight(iPartSlot, 1.0);
-            }
+            SetWeight(iPartSlot, 1.0);
         }
     } else {
         m_fPartBlends[legs] -= level.frametime * partBlendMult[legs];
@@ -387,12 +383,14 @@ void Player::AdjustAnimBlends(void)
         if (partOldAnim[torso] != "") {
             StopAnimating(iOldPartSlot);
             partOldAnim[torso] = "";
+        }
 
-            if (partAnim[torso] == "") {
-                SetWeight(iPartSlot, 0.0);
-            } else {
-                SetWeight(iPartSlot, 1.0);
-            }
+        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];
@@ -404,8 +402,8 @@ void Player::AdjustAnimBlends(void)
                 fWeightTotal += m_fPartBlends[torso];
             }
             if (partAnim[torso] != "") {
-                SetWeight(iPartSlot, 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;
@@ -427,16 +425,16 @@ void Player::AdjustAnimBlends(void)
     if (m_fPainBlend) {
         if (m_sPainAnim == "") {
             StopAnimating(ANIMSLOT_PAIN);
-            edict->s.frameInfo[ANIMSLOT_PAIN].weight = 0;
-            m_fPainBlend                             = 0;
-            animdone_Pain                            = false;
+            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);
-                edict->s.frameInfo[ANIMSLOT_PAIN].weight = 0;
-                m_fPainBlend                             = 0;
-                animdone_Pain                            = false;
+                SetWeight(ANIMSLOT_PAIN, 0);
+                m_fPainBlend  = 0;
+                animdone_Pain = false;
             }
         }
 
@@ -444,12 +442,12 @@ void Player::AdjustAnimBlends(void)
             int   i;
             float w;
 
-            edict->s.frameInfo[ANIMSLOT_PAIN].weight = m_fPainBlend;
-            w                                        = 1.0 - m_fPainBlend * 0.5;
+            SetWeight(ANIMSLOT_PAIN, m_fPainBlend);
+            w = 1.0 - m_fPainBlend * 0.5;
 
             for (i = 0; i < ANIMSLOT_PAIN; i++) {
-                if (edict->s.frameInfo[i].weight) {
-                    edict->s.frameInfo[i].weight *= w;
+                if (GetWeight(i)) {
+                    SetWeight(i, GetWeight(i) * w);
                 }
             }
 
@@ -490,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;
@@ -509,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)
 {
-    // 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_conditionals.cpp b/code/fgame/player_conditionals.cpp
index c0b59831..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.
 
@@ -63,7 +63,6 @@ qboolean Player::CondTrue(Conditional& condition)
 }
 
 qboolean Player::CondChance(Conditional& condition)
-
 {
     float percent_chance;
 
@@ -73,7 +72,6 @@ qboolean Player::CondChance(Conditional& condition)
 }
 
 qboolean Player::CondHealth(Conditional& condition)
-
 {
     return health < atoi(condition.getParm(1));
 }
@@ -96,9 +94,8 @@ qboolean Player::CondBlocked(Conditional& condition)
 }
 
 qboolean Player::CondPain(Conditional& condition)
-
 {
-    return (pain != 0 || knockdown != 0);
+    return pain != 0 && level.time > nextpaintime;
 }
 
 qboolean Player::CondOnGround(Conditional& condition)
@@ -112,13 +109,11 @@ qboolean Player::CondOnGround(Conditional& condition)
 }
 
 qboolean Player::CondHasWeapon(Conditional& condition)
-
 {
     return WeaponsOut();
 }
 
 qboolean Player::CondNewWeapon(Conditional& condition)
-
 {
     Weapon *weapon;
 
@@ -144,7 +139,6 @@ qboolean Player::CondImmediateSwitch(Conditional& condition)
 
 // Check to see if a weapon has been raised
 qboolean Player::CondUseWeapon(Conditional& condition)
-
 {
     const char *weaponName;
     const char *parm;
@@ -367,7 +361,7 @@ qboolean Player::CondVehicleType(Conditional& condition)
 {
     str sType = condition.getParm(1);
     if (m_pVehicle && m_pVehicle->IsSubclassOfVehicle()) {
-        return !str::cmp(sType, "vehicle");
+        return !str::cmp(sType, m_pVehicle->getName());
     } else {
         return !str::cmp(sType, "none");
     }
@@ -439,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)
@@ -507,7 +584,6 @@ qboolean Player::CondPutAwayMain(Conditional& condition)
 
 // Check to see if any of the active weapons need to be put away
 qboolean Player::CondPutAwayOffHand(Conditional& condition)
-
 {
     Weapon *weapon = GetActiveWeapon(WEAPON_OFFHAND);
 
@@ -516,7 +592,6 @@ qboolean Player::CondPutAwayOffHand(Conditional& condition)
 
 // Checks to see if any weapon is active in the specified hand
 qboolean Player::CondAnyWeaponActive(Conditional& condition)
-
 {
     weaponhand_t hand;
     Weapon      *weap;
@@ -532,7 +607,6 @@ qboolean Player::CondAnyWeaponActive(Conditional& condition)
 }
 
 qboolean Player::CondAttackBlocked(Conditional& condition)
-
 {
     if (attack_blocked) {
         attack_blocked = qfalse;
@@ -618,14 +692,12 @@ qboolean Player::CondMaxChargeTime(Conditional& condition)
 }
 
 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;
 
@@ -641,7 +713,6 @@ 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;
@@ -779,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)
 {
+    // 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);
 }
@@ -813,6 +896,8 @@ qboolean Player::CondAnimDoneTorso(Conditional& condition)
 
 qboolean Player::CondAttackPrimary(Conditional& condition)
 {
+    Weapon *weapon;
+
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
     }
@@ -821,21 +906,19 @@ qboolean Player::CondAttackPrimary(Conditional& condition)
         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 (!(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)
@@ -853,6 +936,8 @@ qboolean Player::CondAttackButtonPrimary(Conditional& condition)
 
 qboolean Player::CondAttackSecondary(Conditional& condition)
 {
+    Weapon *weapon;
+
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
     }
@@ -861,21 +946,19 @@ qboolean Player::CondAttackSecondary(Conditional& condition)
         return false;
     }
 
-    if (last_ucmd.buttons & BUTTON_ATTACKRIGHT) {
-        Weapon *weapon;
-
-        last_attack_button = BUTTON_ATTACKRIGHT;
-
-        weapon = GetActiveWeapon(WEAPON_MAIN);
-        if (weapon) {
-            return true;
-        }
-
-        // No ammo
-        return false;
-    } else {
+    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)
@@ -935,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);
@@ -1042,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)) {
@@ -1053,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)) {
@@ -1064,7 +1143,6 @@ qboolean Player::Cond45DegreeSlope(Conditional& condition)
 }
 
 qboolean Player::CondRightLegHigh(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1078,7 +1156,6 @@ qboolean Player::CondRightLegHigh(Conditional& condition)
 }
 
 qboolean Player::CondLeftLegHigh(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1092,7 +1169,6 @@ qboolean Player::CondLeftLegHigh(Conditional& condition)
 }
 
 qboolean Player::CondFacingUpSlope(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1106,7 +1182,6 @@ qboolean Player::CondFacingUpSlope(Conditional& condition)
 }
 
 qboolean Player::CondFacingDownSlope(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1120,13 +1195,11 @@ qboolean Player::CondFacingDownSlope(Conditional& condition)
 }
 
 qboolean Player::CondFalling(Conditional& condition)
-
 {
     return falling;
 }
 
 qboolean Player::CondGroundEntity(Conditional& condition)
-
 {
     return (groundentity != NULL);
 }
@@ -1147,14 +1220,12 @@ qboolean Player::CondCanFall(Conditional& condition)
 }
 
 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)) {
@@ -1165,7 +1236,6 @@ qboolean Player::CondAtUseAnim(Conditional& condition)
 }
 
 qboolean Player::CondTouchUseAnim(Conditional& condition)
-
 {
     if (toucheduseanim) {
         return ((UseAnim *)(Entity *)toucheduseanim)->canBeUsed(this);
@@ -1175,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)) {
@@ -1192,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)) {
@@ -1203,13 +1270,11 @@ qboolean Player::CondLoopUseObject(Conditional& condition)
 }
 
 qboolean Player::CondDead(Conditional& condition)
-
 {
     return (deadflag);
 }
 
 qboolean Player::CondKnockDown(Conditional& condition)
-
 {
     if (knockdown) {
         knockdown = false;
@@ -1294,7 +1359,6 @@ qboolean Player::CondPainLocation(Conditional& condition)
 }
 
 qboolean Player::CondPainThreshold(Conditional& condition)
-
 {
     float threshold = atof(condition.getParm(1));
 
@@ -1307,7 +1371,6 @@ qboolean Player::CondPainThreshold(Conditional& condition)
 }
 
 qboolean Player::CondLegsState(Conditional& condition)
-
 {
     if (currentState_Legs) {
         str current = currentState_Legs->getName();
@@ -1322,7 +1385,6 @@ qboolean Player::CondLegsState(Conditional& condition)
 }
 
 qboolean Player::CondTorsoState(Conditional& condition)
-
 {
     if (currentState_Torso) {
         str current = currentState_Torso->getName();
@@ -1337,7 +1399,6 @@ qboolean Player::CondTorsoState(Conditional& condition)
 }
 
 qboolean Player::CondStateName(Conditional& condition)
-
 {
     str part      = condition.getParm(1);
     str statename = condition.getParm(2);
@@ -1352,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))) {
@@ -1366,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))) {
@@ -1379,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;
@@ -1458,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;
@@ -1511,7 +1568,6 @@ qboolean Player::CondLookingUp(Conditional& condition)
 }
 
 qboolean Player::CondCanStand(Conditional& condition)
-
 {
     Vector  newmins(mins);
     Vector  newmaxs(maxs);
@@ -1857,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                  },
@@ -1975,7 +2031,7 @@ Condition<Player> Player::Conditions[] = {
     {"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 aaf043e4..eda69045 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -94,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);
+        if (ent->edict->tiki) {
+            animname = AnimName(0);
         }
 
         if (!animname) {
@@ -326,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]...");
@@ -360,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;
@@ -387,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);
+    }
 }
 
 //====================
@@ -596,7 +608,11 @@ 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)
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 1241d9df..958e4ce4 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.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.
 
@@ -27,34 +27,27 @@ 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 |= ECF_BOT;
-
     if (LoadingSavegame) {
         return;
     }
 
-    m_Path.SetFallHeight(96);
-    m_bPathing   = false;
-    m_bTempAway  = false;
-    m_bDeltaMove = true;
-
     m_botCmd.serverTime = 0;
     m_botCmd.msec       = 0;
     m_botCmd.buttons    = 0;
@@ -70,379 +63,164 @@ PlayerBot::PlayerBot()
     m_botEyes.angles[1] = 0;
     m_botEyes.ofs[0]    = 0;
     m_botEyes.ofs[1]    = 0;
-    m_botEyes.ofs[2]    = viewheight;
+    m_botEyes.ofs[2]    = DEFAULT_VIEWHEIGHT;
 
-    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_iConfirmTime  = 0;
+    m_iEnemyEyesTag = -1;
 
-    m_iCuriousTime = 0;
-    m_iAttackTime  = 0;
+    m_iNextTauntTime = 0;
 
     m_StateFlags = 0;
     m_RunLabel.TrySetScript("global/bot_run.scr");
 }
 
-void PlayerBot::Init(void)
+BotController::~BotController()
+{
+    if (controlledEnt) {
+        controlledEnt->delegate_gotKill.Remove(delegateHandle_gotKill);
+        controlledEnt->delegate_killed.Remove(delegateHandle_killed);
+        controlledEnt->delegate_stufftext.Remove(delegateHandle_stufftext);
+    }
+}
+
+BotMovement& BotController::GetMovement()
+{
+    return movement;
+}
+
+void BotController::Init(void)
 {
     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;
+        botfuncs[i].BeginState = &BotController::State_DefaultBegin;
+        botfuncs[i].EndState   = &BotController::State_DefaultEnd;
     }
 
     InitState_Attack(&botfuncs[0]);
     InitState_Curious(&botfuncs[1]);
     InitState_Grenade(&botfuncs[2]);
     InitState_Idle(&botfuncs[3]);
-    InitState_Weapon(&botfuncs[4]);
+    //InitState_Weapon(&botfuncs[4]);
 }
 
-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 PlayerBot::TurnThink(void)
-{
-    float diff, factor, maxchange, anglespeed, desired_speed;
-    int   i;
-
-    if (m_vTargetAng[PITCH] > 180) {
-        m_vTargetAng[PITCH] -= 360;
-    }
-
-    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];
-}
-
-void PlayerBot::CheckAttractiveNodes(void)
-{
-    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);
-        }
-    }
-}
-
-void PlayerBot::MoveThink(void)
-{
-    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);
-
-        m_vCurrentGoal = origin;
-        VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
-
-        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.DPrintf2("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[0] = m_Path.CurrentDelta()[0];
-    vDir[1] = m_Path.CurrentDelta()[1];
-    vDir[2] = 0;
-    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);
-    }
-}
-
-void PlayerBot::CheckJump(void)
-{
-    Vector  start;
-    Vector  end;
-    Vector  dir;
-    trace_t trace;
-
-    if (!m_Path.CurrentNode()) {
-        return;
-    }
-
-    dir = m_Path.CurrentDelta();
-    VectorNormalizeFast(dir);
-
-    if (ai_debugpath->integer) {
-        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);
-    }
-
-    Vector vStart = origin + Vector(0, 0, STEPSIZE);
-    Vector vEnd   = origin + Vector(0, 0, STEPSIZE) + dir * 4;
-
-    // Check if the bot needs to jump
-    trace = G_Trace(vStart, mins, maxs, vEnd, this, MASK_PLAYERSOLID, false, "PlayerBot::CheckJump");
-
-    // No need to jump
-    if (trace.fraction >= 0.95f) {
-        m_botCmd.upmove = 0;
-        return;
-    }
-
-    start = origin + Vector(0, 0, 56);
-    end   = origin + Vector(0, 0, 56) + dir * 4;
-
-    // Check if the bot can jump
-    trace = G_Trace(start, mins, maxs, end, this, MASK_PLAYERSOLID, true, "PlayerBot::CheckJump");
-
-    // 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;
-    }
-}
-
-void PlayerBot::CheckEndPos(void)
-{
-    Vector  start;
-    Vector  end;
-    trace_t trace;
-
-    if (!m_Path.LastNode()) {
-        return;
-    }
-
-    start = m_Path.LastNode()->point;
-    end   = m_vTargetPos;
-
-    trace = G_Trace(start, mins, maxs, end, this, MASK_TARGETPATH, true, "PlayerBot::CheckEndPos");
-
-    if (trace.fraction < 0.95f) {
-        m_vTargetPos = trace.endpos;
-    }
-}
-
-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 PlayerBot::GetUsercmd(usercmd_t *ucmd)
+void BotController::GetUsercmd(usercmd_t *ucmd)
 {
     *ucmd = m_botCmd;
 }
 
-void PlayerBot::GetEyeInfo(usereyes_t *eyeinfo)
+void BotController::GetEyeInfo(usereyes_t *eyeinfo)
 {
     *eyeinfo = m_botEyes;
 }
 
-void PlayerBot::UpdateBotStates(void)
+void BotController::UpdateBotStates(void)
 {
     if (bot_manualmove->integer) {
         memset(&m_botCmd, 0, sizeof(usercmd_t));
         return;
     }
 
-    if (IsDead()) {
+    if (!controlledEnt->client->pers.dm_primary[0]) {
+        Event *event;
+
+        //
+        // Primary weapon
+        //
+        event = new Event(EV_Player_PrimaryDMWeapon);
+        event->AddString("auto");
+
+        controlledEnt->ProcessEvent(event);
+    }
+
+    if (controlledEnt->GetTeam() == TEAM_NONE || controlledEnt->GetTeam() == TEAM_SPECTATOR) {
+        float time;
+
+        // Add some delay to avoid telefragging
+        time = controlledEnt->entnum / 20.0;
+
+        if (controlledEnt->EventPending(EV_Player_AutoJoinDMTeam)) {
+            return;
+        }
+
+        //
+        // Team
+        //
+        controlledEnt->PostEvent(EV_Player_AutoJoinDMTeam, time);
+        return;
+    }
+
+    if (controlledEnt->IsDead() || controlledEnt->IsSpectator()) {
         // The bot should respawn
         m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
         return;
     }
 
     m_botCmd.buttons |= BUTTON_RUN;
+    m_botCmd.serverTime = level.svsTime;
 
     m_botEyes.ofs[0]    = 0;
     m_botEyes.ofs[1]    = 0;
-    m_botEyes.ofs[2]    = viewheight;
+    m_botEyes.ofs[2]    = controlledEnt->viewheight;
     m_botEyes.angles[0] = 0;
     m_botEyes.angles[1] = 0;
 
-    SetTargetAngles(Vector(0, 90, 0));
-
     CheckStates();
 
-    MoveThink();
-    TurnThink();
+    movement.MoveThink(m_botCmd);
+    rotation.TurnThink(m_botCmd, m_botEyes);
     CheckUse();
+
+    CheckValidWeapon();
 }
 
-void PlayerBot::SendCommand(const char *text)
+void BotController::CheckUse(void)
+{
+    Vector  dir;
+    Vector  start;
+    Vector  end;
+    trace_t trace;
+
+    controlledEnt->angles.AngleVectorsLeft(&dir);
+
+    start = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight);
+    end   = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight) + dir * 32;
+
+    trace = G_Trace(start, vec_zero, vec_zero, end, controlledEnt, MASK_USABLE, false, "BotController::CheckUse");
+
+    // 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 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 BotController::SendCommand(const char *text)
 {
     char        *buffer;
     char        *data;
@@ -461,7 +239,7 @@ void PlayerBot::SendCommand(const char *text)
         return;
     }
 
-    m_lastcommand = com_token;
+    controlledEnt->m_lastcommand = com_token;
 
     if (!Event::GetEvent(com_token)) {
         return;
@@ -474,7 +252,7 @@ void PlayerBot::SendCommand(const char *text)
         return;
     }
 
-    ev.SetConsoleEdict(edict);
+    ev.SetConsoleEdict(controlledEnt->edict);
 
     while (1) {
         com_token = COM_Parse(&data);
@@ -489,62 +267,12 @@ void PlayerBot::SendCommand(const char *text)
     gi.Free(buffer);
 
     try {
-        ProcessEvent(ev);
+        controlledEnt->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);
-}
-
 /*
 ====================
 AimAtAimNode
@@ -552,15 +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;
+
+    if (!movement.IsMoving()) {
+        return;
     }
 
-    m_vTargetAng[PITCH] = 0;
+    goal = movement.GetCurrentGoal();
+    if (goal != controlledEnt->origin) {
+        rotation.AimAt(goal);
+    }
+
+    Vector targetAngles = rotation.GetTargetAngles();
+    targetAngles.x      = 0;
+    rotation.SetTargetAngles(targetAngles);
 }
 
 /*
@@ -570,236 +305,15 @@ 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.LastNode() || 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;
-}
-
 /*
 ====================
 NoticeEvent
@@ -807,22 +321,47 @@ 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()) {
+    fRangeFactor = 1.0 - (fDistanceSquared / fRadiusSquared);
+
+    if (fRangeFactor < random()) {
+        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;
+    }
+
+    if (pSentOwner) {
+        if (pSentOwner == controlledEnt) {
+            // Ignore self
             return;
         }
-    } else if (pEnt->IsSubclassOfWeapon()) {
-        Weapon *pWeap = (Weapon *)pEnt;
 
-        if (pWeap->GetOwner()) {
-            Player *p = (Player *)pWeap->GetOwner();
+        if ((pSentOwner->flags & FL_NOTARGET) || pSentOwner->getSolidType() == SOLID_NOT) {
+            return;
+        }
 
-            if (p->IsSubclassOfPlayer() && p->GetTeam() == GetTeam()) {
+        // Ignore teammates
+        if (pSentOwner->IsSubclassOfPlayer()) {
+            Player *p = static_cast<Player *>(pSentOwner);
+
+            if (g_gametype->integer >= GT_TEAM && p->GetTeam() == controlledEnt->GetTeam()) {
                 return;
             }
         }
@@ -842,8 +381,8 @@ void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanc
     case AI_EVENT_FOOTSTEP:
     case AI_EVENT_GRENADE:
     default:
-        m_iCuriousTime    = level.inttime + 20000;
-        m_vLastCuriousPos = vPos;
+        m_iCuriousTime   = level.inttime + 20000;
+        m_vNewCuriousPos = vPos;
         break;
     }
 }
@@ -855,10 +394,12 @@ ClearEnemy
 Clear the bot's enemy
 ====================
 */
-void PlayerBot::ClearEnemy(void)
+void BotController::ClearEnemy(void)
 {
     m_iAttackTime   = 0;
+    m_iConfirmTime  = 0;
     m_pEnemy        = NULL;
+    m_iEnemyEyesTag = -1;
     m_vOldEnemyPos  = vec_zero;
     m_vLastEnemyPos = vec_zero;
 }
@@ -877,7 +418,7 @@ ____________________
 ====================
 */
 
-void PlayerBot::CheckStates(void)
+void BotController::CheckStates(void)
 {
     m_StateCount = 0;
 
@@ -917,7 +458,7 @@ void PlayerBot::CheckStates(void)
 
     assert(m_StateCount);
     if (!m_StateCount) {
-        gi.DPrintf("*** WARNING *** %s was stuck with no states !!!", client->pers.netname);
+        gi.DPrintf("*** WARNING *** %s was stuck with no states !!!", controlledEnt->client->pers.netname);
         State_Reset();
     }
 }
@@ -929,14 +470,14 @@ 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;
@@ -945,6 +486,7 @@ void PlayerBot::State_Reset(void)
     m_vLastEnemyPos   = vec_zero;
     m_vLastDeathPos   = vec_zero;
     m_pEnemy          = NULL;
+    m_iEnemyEyesTag   = -1;
 }
 
 /*
@@ -954,13 +496,13 @@ 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;
@@ -973,20 +515,24 @@ bool PlayerBot::CheckCondition_Idle(void)
     return true;
 }
 
-void PlayerBot::State_Idle(void)
+void BotController::State_Idle(void)
 {
     AimAtAimNode();
     CheckReload();
 
-    if (!MoveToBestAttractivePoint() && !IsMoving()) {
+    if (!movement.MoveToBestAttractivePoint() && !movement.IsMoving()) {
         if (m_vLastDeathPos != vec_zero) {
-            MoveTo(m_vLastDeathPos);
+            movement.MoveTo(m_vLastDeathPos);
 
-            if (MoveDone()) {
+            if (movement.MoveDone()) {
                 m_vLastDeathPos = vec_zero;
             }
         } else {
-            AvoidPath(origin - Vector(orientation[0]) * 128.0f, 1024);
+            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);
         }
     }
 }
@@ -998,13 +544,13 @@ 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;
@@ -1013,7 +559,7 @@ bool PlayerBot::CheckCondition_Curious(void)
 
     if (level.inttime > m_iCuriousTime) {
         if (m_iCuriousTime) {
-            ClearMove();
+            movement.ClearMove();
             m_iCuriousTime = 0;
         }
 
@@ -1023,16 +569,16 @@ bool PlayerBot::CheckCondition_Curious(void)
     return true;
 }
 
-void PlayerBot::State_Curious(void)
+void BotController::State_Curious(void)
 {
-    //AimAt( m_vLastCuriousPos );
     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()) {
+    if (movement.MoveDone()) {
         m_iCuriousTime = 0;
     }
 }
@@ -1044,11 +590,11 @@ 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;
@@ -1075,49 +621,86 @@ static int sentients_compare(const void *elem1, const void *elem2)
     }
 }
 
-bool PlayerBot::CheckCondition_Attack(void)
+bool BotController::IsValidEnemy(Sentient *sent) const
 {
-    Container<Sentient *> sents = SentientList;
+    if (sent == controlledEnt) {
+        return false;
+    }
 
-    bot_origin = origin;
+    if (sent->hidden() || (sent->flags & FL_NOTARGET)) {
+        // Ignore hidden / non-target enemies
+        return false;
+    }
+
+    if (sent->IsDead()) {
+        // Ignore dead enemies
+        return false;
+    }
+
+    if (sent->getSolidType() == SOLID_NOT) {
+        // Ignore non-solid, like spectators
+        return false;
+    }
+
+    if (sent->IsSubclassOfPlayer()) {
+        Player *player = static_cast<Player *>(sent);
+
+        if (g_gametype->integer >= GT_TEAM && player->GetTeam() == controlledEnt->GetTeam()) {
+            return false;
+        }
+    } else {
+        if (sent->m_Team == controlledEnt->m_Team) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool BotController::CheckCondition_Attack(void)
+{
+    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);
-        Player   *player = (Player *)sent;
+        Sentient *sent = sents.ObjectAt(i);
 
-        if (sent == this) {
+        if (!IsValidEnemy(sent)) {
             continue;
         }
 
-        if (sent->hidden()) {
-            continue;
-        }
+        maxDistance = Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828);
 
-        if (sent->IsDead()) {
-            continue;
-        }
-
-        if (sent->IsSubclassOfPlayer()) {
-            if (g_gametype->integer >= GT_TEAM && player->GetTeam() == GetTeam()) {
-                continue;
+        if (controlledEnt->CanSee(sent, 80, maxDistance, false)) {
+            if (m_pEnemy != sent) {
+                m_iEnemyEyesTag = -1;
             }
-        } else {
-            if (sent->m_Team == m_Team) {
-                continue;
+
+            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 (CanSee(sent, 80, world->m_fAIVisionDistance, false)) {
-            m_pEnemy      = sent;
-            m_iAttackTime = level.inttime + 10000;
+        if (m_pEnemy && level.inttime >= m_iConfirmTime) {
+            m_iAttackTime = level.inttime + 1000;
             return true;
         }
     }
 
     if (level.inttime > m_iAttackTime) {
         if (m_iAttackTime) {
-            ClearMove();
+            movement.ClearMove();
             m_iAttackTime = 0;
         }
 
@@ -1127,29 +710,34 @@ bool PlayerBot::CheckCondition_Attack(void)
     return true;
 }
 
-void PlayerBot::State_EndAttack(void)
+void BotController::State_EndAttack(void)
 {
     m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+    controlledEnt->ZoomOff();
 }
 
-void PlayerBot::State_Attack(void)
+void BotController::State_Attack(void)
 {
-    Player *p                   = (Player *)m_pEnemy.Pointer();
     bool    bMelee              = false;
+    bool    bCanSee             = false;
     float   fMinDistance        = 128;
     float   fMinDistanceSquared = fMinDistance * fMinDistance;
+    float   fEnemyDistanceSquared;
+    Weapon *pWeap   = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
+    bool    bNoMove = false;
 
-    if (!m_pEnemy || m_pEnemy->IsDead() || (!p->IsSubclassOfPlayer() && m_pEnemy->m_Team == m_Team)
-        || (g_gametype->integer >= GT_TEAM && p->GetTeam() == GetTeam())) {
+    if (!m_pEnemy || !IsValidEnemy(m_pEnemy)) {
+        // Ignore dead enemies
         m_iAttackTime = 0;
         return;
     }
+    float fDistanceSquared = (m_pEnemy->origin - controlledEnt->origin).lengthSquared();
 
-    float fDistanceSquared = (m_pEnemy->origin - origin).lengthSquared();
-
-    if (CanSee(m_pEnemy, 20, world->m_fAIVisionDistance, false)) {
-        Weapon *pWeap = GetActiveWeapon(WEAPON_MAIN);
+    m_vOldEnemyPos = m_vLastEnemyPos;
 
+    bCanSee =
+        controlledEnt->CanSee(m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false);
+    if (bCanSee) {
         if (!pWeap) {
             return;
         }
@@ -1158,6 +746,20 @@ void PlayerBot::State_Attack(void)
         float fPrimaryBulletRangeSquared   = fPrimaryBulletRange * fPrimaryBulletRange;
         float fSecondaryBulletRange        = pWeap->GetBulletRange(FIRE_SECONDARY);
         float fSecondaryBulletRangeSquared = fSecondaryBulletRange * fSecondaryBulletRange;
+        float fSpreadFactor                = pWeap->GetSpreadFactor(FIRE_PRIMARY);
+
+        //
+        // check the fire movement speed if the weapon has a max fire movement
+        //
+        if (pWeap->GetMaxFireMovement() < 1 && pWeap->HasAmmoInClip(FIRE_PRIMARY)) {
+            float length;
+
+            length = controlledEnt->velocity.length();
+            if ((length / sv_runspeed->value) > (pWeap->GetMaxFireMovementMult())) {
+                bNoMove = true;
+                movement.ClearMove();
+            }
+        }
 
         fMinDistance = fPrimaryBulletRange;
 
@@ -1167,51 +769,125 @@ void PlayerBot::State_Attack(void)
 
         fMinDistanceSquared = fMinDistance * fMinDistance;
 
-        if (client->ps.stats[STAT_AMMO] > 0 || client->ps.stats[STAT_CLIPAMMO] > 0) {
+        if (controlledEnt->client->ps.stats[STAT_AMMO] > 0 || controlledEnt->client->ps.stats[STAT_CLIPAMMO] > 0) {
             if (fDistanceSquared <= fPrimaryBulletRangeSquared) {
                 if (pWeap->IsSemiAuto()) {
-                    m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
+                    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;
+                m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+                controlledEnt->ZoomOff();
             }
-        } else if (pWeap->GetFireType(FIRE_SECONDARY) == FT_MELEE) {
-            bMelee = true;
+        } else {
+            m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+            controlledEnt->ZoomOff();
+        }
+
+        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 (bMelee) {
+            m_botCmd.buttons &= ~BUTTON_ATTACKLEFT;
 
             if (fDistanceSquared <= fSecondaryBulletRangeSquared) {
                 m_botCmd.buttons ^= BUTTON_ATTACKRIGHT;
             } else {
                 m_botCmd.buttons &= ~BUTTON_ATTACKRIGHT;
             }
-        } else {
-            m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | 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;
     }
 
-    AimAt(m_vLastEnemyPos);
+    if (bCanSee || level.inttime < m_iAttackStopAimTime) {
+        Vector        vRandomOffset;
+        Vector        vTarget;
+        orientation_t eyes_or;
 
-    m_vOldEnemyPos  = m_vLastEnemyPos;
-    m_vLastEnemyPos = m_pEnemy->centroid;
+        if (m_iEnemyEyesTag == -1) {
+            // Cache the tag
+            m_iEnemyEyesTag = gi.Tag_NumForName(m_pEnemy->edict->tiki, "eyes bone");
+        }
 
-    if ((!MoveToBestAttractivePoint(5) && !IsMoving()) || (m_vOldEnemyPos != m_vLastEnemyPos && !MoveDone())) {
-        if (!bMelee) {
-            if ((origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {
-                Vector vDir = origin - m_vLastEnemyPos;
+        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);
 
-                AvoidPath(m_vLastEnemyPos, fMinDistance, vDir);
+                movement.AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(controlledEnt->orientation[1]) * 512);
             } else {
-                MoveNear(m_vLastEnemyPos, fMinDistance);
+                movement.MoveTo(m_vLastEnemyPos);
+            }
+
+            if (!bCanSee && movement.MoveDone()) {
+                // Lost track of the enemy
+                ClearEnemy();
+                return;
             }
         } else {
-            MoveTo(m_vLastEnemyPos);
+            movement.MoveTo(m_vLastEnemyPos);
         }
     }
+
+    if (movement.IsMoving()) {
+        m_iAttackTime = level.inttime + 1000;
+    }
 }
 
 /*
@@ -1221,19 +897,19 @@ 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;
 }
 
-void PlayerBot::State_Grenade(void)
+void BotController::State_Grenade(void)
 {
     // FIXME: TODO
 }
@@ -1245,20 +921,21 @@ 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");
@@ -1268,17 +945,124 @@ void PlayerBot::State_BeginWeapon(void)
     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)
+Weapon* BotController::FindMeleeWeapon() {
+  
+    Weapon *next;
+    int     n;
+    int     j;
+    int     bestrank;
+    Weapon *bestweapon;
+    const Container<int>& inventory = controlledEnt->getInventory();
+
+    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->GetRank() < bestrank) {
+            continue;
+        }
+
+        if (next->GetFireType(FIRE_SECONDARY) != FT_MELEE) {
+            continue;
+        }
+
+        bestweapon = (Weapon*)next;
+        bestrank = bestweapon->GetRank();
+    }
+
+    return bestweapon;
+}
+
+void BotController::UseWeaponWithAmmo() {
+    Weapon* bestWeapon = FindWeaponWithAmmo();
+    if (!bestWeapon) {
+        //
+        // If there is no weapon with ammo, fallback to a weapon that can melee
+        //
+        bestWeapon = FindMeleeWeapon();
+    }
+
+    if (!bestWeapon || bestWeapon == controlledEnt->GetActiveWeapon(WEAPON_MAIN)) {
+        return;
+    }
+
+    controlledEnt->useWeapon(bestWeapon, WEAPON_MAIN);
+}
+
+void BotController::Spawned(void)
 {
-    Player::Killed(ev);
+    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)) {
@@ -1293,18 +1077,155 @@ void PlayerBot::Killed(Event *ev)
     m_botEyes.angles[0] = 0;
     m_botEyes.angles[1] = 0;
 
-    m_vLastDeathPos = origin;
+    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 PlayerBot::GotKill(Event *ev)
+void BotController::GotKill(const Event& ev)
 {
-    Player::GotKill(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 PlayerBot::EventStuffText(Event *ev)
+void BotController::EventStuffText(const str& text)
 {
-    SendCommand(ev->GetString(1));
+    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 c39954fe..6d67fab3 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.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.
 
@@ -21,8 +21,7 @@ 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"
@@ -35,65 +34,144 @@ typedef struct nodeAttract_s {
     AttractiveNodePtr m_pNode;
 } nodeAttract_t;
 
-class PlayerBot : public Player
+class BotController;
+
+class BotMovement
 {
+public:
+    BotMovement();
+
+    void SetControlledEntity(Player *newEntity);
+
+    void MoveThink(usercmd_t& botcmd);
+
+    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);
+
+    bool CanMoveTo(Vector vPos);
+    bool MoveDone();
+    bool IsMoving(void);
+    void ClearMove(void);
+
+    Vector GetCurrentGoal() const;
+
+private:
+    void CheckAttractiveNodes();
+    void CheckEndPos(Entity *entity);
+    void CheckJump(usercmd_t& botcmd);
+    void NewMove();
+
+private:
+    SafePtr<Player>            controlledEntity;
+    AttractiveNodePtr          m_pPrimaryAttract;
+    Container<nodeAttract_t *> m_attractList;
+    ActorPath                  m_Path;
+
+    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;
+};
+
+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 (PlayerBot::*CheckCondition)(void);
-        void (PlayerBot::*BeginState)(void);
-        void (PlayerBot::*EndState)(void);
-        void (PlayerBot::*ThinkState)(void);
+        bool (BotController::*CheckCondition)(void);
+        void (BotController::*BeginState)(void);
+        void (BotController::*EndState)(void);
+        void (BotController::*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;
+    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;
 
-    // Direction
-    Vector m_vTargetAng;
-    Vector m_vCurrentAng;
-    Vector m_vAngSpeed;
-    float  m_fYawSpeedMult;
-
     // States
     int               m_StateCount;
     unsigned int      m_StateFlags;
     ScriptThreadLabel m_RunLabel;
 
+    // Taunts
+    int m_iNextTauntTime;
+
 private:
-    void CheckAttractiveNodes(void);
-    void MoveThink(void);
-    void TurnThink(void);
-    void CheckEndPos(void);
-    void CheckJump(void);
+    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);
@@ -116,6 +194,7 @@ private:
     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);
@@ -132,51 +211,80 @@ private:
     void CheckStates(void);
 
 public:
-    CLASS_PROTOTYPE(PlayerBot);
+    CLASS_PROTOTYPE(BotController);
 
-    PlayerBot();
+    BotController();
+    ~BotController();
 
     static void Init(void);
 
     void GetEyeInfo(usereyes_t *eyeinfo);
     void GetUsercmd(usercmd_t *ucmd);
-    void SetTargetAngles(Vector vAngles);
 
     void UpdateBotStates(void);
     void CheckReload(void);
 
-    void AimAt(Vector vPos);
     void AimAtAimNode(void);
 
-    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);
-
-    bool CanMoveTo(Vector vPos);
-    bool MoveDone(void);
-    bool IsMoving(void);
-    void ClearMove(void);
-
     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 Think();
 
-    void Spawned(void) override;
+    void Spawned(void);
 
-    void Killed(Event *ev);
-    void GotKill(Event *ev);
-    void EventStuffText(Event *ev);
+    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;
 };
 
-#endif /* playerbot.h */
+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 2ac3bc4a..718d0bd0 100644
--- a/code/fgame/portableturret.cpp
+++ b/code/fgame/portableturret.cpp
@@ -215,7 +215,7 @@ void CarryableTurret::EventPlaceTurret(Event *ev)
 
         if (trace.startsolid || trace.fraction < 1 || trace.ent) {
             gi.DPrintf(
-                "~*~*~ Not enough room to auto place protable turret at (%i %i %i)\n",
+                "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n",
                 (int)origin[0],
                 (int)origin[1],
                 (int)origin[2]
@@ -243,7 +243,7 @@ void CarryableTurret::EventPlaceTurret(Event *ev)
 
         if (trace.startsolid || trace.fraction < 1) {
             gi.DPrintf(
-                "~*~*~ Not enough room to auto place protable turret at (%i %i %i)\n",
+                "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n",
                 (int)origin[0],
                 (int)origin[1],
                 (int)origin[2]
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 56a1b9d8..6900dc42 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -230,7 +230,7 @@ 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",
@@ -346,7 +346,7 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/fullbody.scr",
     "salute",
     "sentry",
-    "officier",
+    "officer",
     "rover",
     "none",
     "machinegunner",
@@ -399,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",
-    //
     // Added in OPM
-    //
     "respawn",
     "viewmodelanim_done"
 };
@@ -440,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);
 
@@ -470,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
@@ -525,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();
@@ -541,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);
 
@@ -665,6 +734,10 @@ ScriptThread *ScriptMaster::CreateScriptThread(ScriptClass *scriptClass, str lab
     }
 }
 
+ScriptMaster::ScriptMaster()
+{
+}
+
 void ScriptMaster::Reset(qboolean samemap)
 {
     ScriptClass_allocator.FreeAll();
@@ -693,6 +766,8 @@ void ScriptMaster::Reset(qboolean samemap)
         StringDict.clear();
         InitConstStrings();
     }
+
+    ScriptDelegate::ResetAllDelegates();
 }
 
 void ScriptMaster::ExecuteRunning(void)
@@ -766,7 +841,7 @@ void ScriptMaster::RemoveTiming(ScriptThread *thread)
 
 ScriptClass *ScriptMaster::CurrentScriptClass(void)
 {
-    return CurrentThread()->GetScriptClass();
+    return CurrentScriptThread()->GetScriptClass();
 }
 
 void ScriptMaster::CloseGameScript(void)
@@ -797,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;
@@ -1030,7 +1105,6 @@ ScriptThread *ScriptMaster::CurrentThread(void)
 
 ScriptThread *ScriptMaster::CurrentScriptThread(void)
 {
-    assert(m_CurrentThread);
     if (!m_CurrentThread) {
         ScriptError("current thread is NULL");
     }
@@ -1105,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";
diff --git a/code/fgame/scriptmaster.h b/code/fgame/scriptmaster.h
index 12a7708b..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();
 
     //
diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index f2929f18..b357820f 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.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.
 
@@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "game.h"
 #include "debuglines.h"
 #include "weaputils.h"
+#include "parm.h"
 
 /*****************************************************************************/
 /*QUAKED script_object (0 0.5 1) ? NOT_SOLID
@@ -68,6 +69,22 @@ Event EV_ScriptSlave_WaitMove
     "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",
@@ -221,6 +238,15 @@ Event EV_ScriptSlave_MoveRight
     "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",
@@ -462,7 +488,7 @@ Event EV_ScriptSlave_FollowPath
     "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.",
+    "ignorevelocity, normalangles, loop, and a number specifying the start time.",
     EV_NORMAL
 );
 Event EV_ScriptSlave_FollowPath_RelativeYaw
@@ -608,6 +634,8 @@ CLASS_DECLARATION(Mover, ScriptSlave, "script_object") {
     {&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        },
@@ -627,6 +655,7 @@ CLASS_DECLARATION(Mover, ScriptSlave, "script_object") {
     {&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        },
@@ -654,6 +683,10 @@ CLASS_DECLARATION(Mover, ScriptSlave, "script_object") {
     {&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         },
@@ -692,14 +725,23 @@ ScriptSlave::ScriptSlave()
     // this is a normal entity
     edict->s.eType = ET_GENERAL;
 
+    splineTime = 0;
+
+    ignoreangles   = false;
+    ignorevelocity = false;
+    moving         = false;
+
     speed           = 100;
     takedamage      = DAMAGE_YES;
     waypoint        = NULL;
-    NewAngles       = localangles;
-    NewPos          = localorigin;
     traveltime      = 0;
     commandswaiting = false;
 
+    splinePath           = NULL;
+    splineangles         = false;
+    m_fFollowRelativeYaw = 0;
+
+    attack_finished    = 0;
     dmg                = 2;
     dmg_means_of_death = MOD_CRUSH;
 
@@ -709,20 +751,16 @@ ScriptSlave::ScriptSlave()
         edict->s.renderfx = RF_ALWAYSDRAW;
     }
 
-    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;
-    m_fFollowRelativeYaw = 0;
-    attack_finished      = 0;
-
     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);
     }
@@ -762,10 +800,7 @@ void ScriptSlave::NewMove(void)
         BroadcastEvent(0, ev);
     }
 
-    if (m_pCurPath) {
-        PostEvent(EV_ScriptSlave_FollowingPath, 0);
-    } else if (splinePath) {
-        moving = true;
+    if (m_pCurPath || splinePath) {
         PostEvent(EV_ScriptSlave_FollowingPath, 0);
     } else {
         float t = traveltime;
@@ -773,13 +808,11 @@ void ScriptSlave::NewMove(void)
             dist = Vector(NewPos - localorigin).length();
             t    = dist / speed;
         }
-        moving = true;
         LinearInterpolate(NewPos, NewAngles, t, EV_ScriptSlave_MoveDone);
     }
 }
 
 void ScriptSlave::BindEvent(Event *ev)
-
 {
     Entity *ent;
 
@@ -794,7 +827,6 @@ void ScriptSlave::BindEvent(Event *ev)
 }
 
 void ScriptSlave::EventUnbind(Event *ev)
-
 {
     unbind();
 
@@ -811,7 +843,25 @@ void ScriptSlave::DoMove(Event *ev)
 void ScriptSlave::WaitMove(Event *ev)
 {
     NewMove();
-    Register(0, Director.CurrentThread());
+    Register(0, Director.CurrentScriptThread());
+}
+
+void ScriptSlave::Stop(Event *ev)
+{
+    commandswaiting = false;
+    if (RegisterSize(0)) {
+        Event newev(EV_DelayThrow);
+        newev.AddConstString(STRING_FAIL);
+        BroadcastEvent(0, newev);
+    }
+
+    Mover::Stop();
+}
+
+void ScriptSlave::ThreadMove(Event *ev)
+{
+    NewMove();
+    Register(0, CreateThreadInternal(ev->GetValue(1)));
 }
 
 void ScriptSlave::MoveEnd(Event *ev)
@@ -820,15 +870,13 @@ void ScriptSlave::MoveEnd(Event *ev)
 }
 
 void ScriptSlave::SetAnglesEvent(Event *ev)
-
 {
-    commandswaiting = true;
+    CheckNewOrders();
     SetAngles(ev);
     NewAngles = localangles;
 }
 
 void ScriptSlave::SetAngleEvent(Event *ev)
-
 {
     float angle;
 
@@ -880,7 +928,6 @@ void ScriptSlave::SetModelEvent(Event *ev)
 }
 
 void ScriptSlave::TriggerEvent(Event *ev)
-
 {
     Entity *ent;
     Event  *e;
@@ -898,9 +945,8 @@ void ScriptSlave::TriggerEvent(Event *ev)
 }
 
 void ScriptSlave::GotoNextWaypoint(Event *ev)
-
 {
-    commandswaiting = true;
+    CheckNewOrders();
 
     if (!waypoint) {
         ScriptError("%s is currently not at a waypoint", TargetName().c_str());
@@ -956,9 +1002,8 @@ void ScriptSlave::JumpTo(Event *ev)
 }
 
 void ScriptSlave::MoveToEvent(Event *ev)
-
 {
-    commandswaiting = true;
+    CheckNewOrders();
 
     //
     // see if it is a vector
@@ -966,22 +1011,29 @@ void ScriptSlave::MoveToEvent(Event *ev)
     if (ev->IsVectorAt(1)) {
         NewPos = ev->GetVector(1);
     } else {
-        waypoint = (Waypoint *)ev->GetEntity(1);
-        if (waypoint) {
-            NewPos = waypoint->origin;
+        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);
 }
@@ -1076,6 +1128,12 @@ void ScriptSlave::MoveRight(Event *ev)
     NewPos -= v * ev->GetFloat(1);
 }
 
+void ScriptSlave::MoveOffset(Event *ev)
+{
+    CheckNewOrders();
+    NewPos += ev->GetVector(1);
+}
+
 // exact rotate commands
 
 void ScriptSlave::RotateXdownto(Event *ev)
@@ -1276,25 +1334,21 @@ void ScriptSlave::RotateAxisup(Event *ev)
 }
 
 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;
 
@@ -1302,25 +1356,60 @@ void ScriptSlave::RotateAxis(Event *ev)
     avelocity[axis] = ev->GetFloat(2);
 }
 
+void ScriptSlave::TouchFunc(Event* ev)
+{
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_TOUCH);
+}
+
+void ScriptSlave::BlockFunc(Event* ev)
+{
+    Entity* other;
+
+    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);
+        }
+    }
+
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_BLOCK);
+}
+
+void ScriptSlave::TriggerFunc(Event* ev)
+{
+    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;
 
@@ -1344,36 +1433,50 @@ void ScriptSlave::CreatePath(SplinePath *path, splinetype_t type)
 
 void ScriptSlave::FollowPath(Event *ev)
 {
-    int         i, argnum;
-    Entity     *ent;
-    str         token;
-    SplinePath *path;
-    qboolean    clamp;
-    float       starttime;
+    int               i, argnum;
+    SimpleEntity     *ent;
+    str               token;
+    SplinePath       *path;
+    qboolean          clamp;
+    float             starttime;
 
-    ent          = ev->GetEntity(1);
-    argnum       = 2;
-    starttime    = -2;
-    clamp        = true;
-    ignoreangles = false;
-    splineangles = true;
+    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()) {
-        commandswaiting = true;
-        path            = (SplinePath *)ent;
+        path = (SplinePath *)ent;
         if (clamp) {
             CreatePath(path, SPLINE_CLAMP);
         } else {
@@ -1384,7 +1487,9 @@ void ScriptSlave::FollowPath(Event *ev)
         if (!ignoreangles) {
             avelocity = vec_zero;
         }
-        velocity = vec_zero;
+        if (!ignorevelocity) {
+            velocity = vec_zero;
+        }
     }
 }
 
@@ -1401,7 +1506,9 @@ void ScriptSlave::EndPath(Event *ev)
 
     delete splinePath;
     splinePath = NULL;
-    velocity   = vec_zero;
+    if (!ignorevelocity) {
+        velocity = vec_zero;
+    }
     if (!ignoreangles) {
         avelocity = vec_zero;
     }
@@ -1431,22 +1538,57 @@ void ScriptSlave::FollowingPath(Event *ev)
         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);
+                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++) {
-                    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
-                    );
+                    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) {
+        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;
@@ -1454,37 +1596,6 @@ void ScriptSlave::FollowingPath(Event *ev)
             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;
@@ -1499,39 +1610,47 @@ void ScriptSlave::FollowingPath(Event *ev)
             }
         }
 
-        vWishAngles = vWishPosition - origin;
+        vDelta = vWishPosition - origin;
 
-        if (vWishAngles.length() > 0.0f) {
-            VectorNormalize(vWishAngles);
-            VectorToAngles(vWishAngles, vNextWishAngles);
+        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 {
-            AngleVectorsLeft(angles, vWishAngles, NULL, NULL);
             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.0f) {
-                if (n_angles[i] < -180.0f) {
-                    n_angles[i] += 360.0f;
-                }
-            } else {
-                n_angles[i] -= 360.0f;
+            if (n_angles[i] > 180) {
+                n_angles[i] -= 360;
+            } else if (n_angles[i] < -180) {
+                n_angles[i] += 360;
             }
 
-            float change = level.frametime * 360.0f;
-            float error  = 0.33f * n_angles[i];
+            change = level.frametime * 360.0f;
+            error  = 0.33f * n_angles[i];
 
-            if (-change > error) {
+            if (error < -change) {
                 error = -change;
-            } else if (error <= change) {
-                change = error;
+            } else if (error > change) {
+                error = change;
             }
 
-            primal_angles[i] = change + angles[i];
+            primal_angles[i] = angles[i] + error;
         }
 
         setAngles(primal_angles);
@@ -1563,15 +1682,15 @@ void ScriptSlave::FollowingPath(Event *ev)
         }
 
         avelocity = vDeltaAngles;
-        velocity  = vWishAngles * m_fCurSpeed;
+        velocity  = vDelta * m_fCurSpeed;
 
-        if (m_fCurSpeed < m_fIdealSpeed) {
+        if (m_fIdealSpeed > m_fCurSpeed) {
             m_fCurSpeed += m_fIdealAccel * level.frametime;
 
             if (m_fCurSpeed > m_fIdealSpeed) {
                 m_fCurSpeed = m_fIdealSpeed;
             }
-        } else if (m_fCurSpeed > m_fIdealSpeed) {
+        } else if (m_fIdealSpeed < m_fCurSpeed) {
             m_fCurSpeed -= m_fIdealAccel * level.frametime;
 
             if (m_fCurSpeed < m_fIdealSpeed) {
@@ -1586,7 +1705,9 @@ void ScriptSlave::FollowingPath(Event *ev)
         if ((splinePath->GetType() == SPLINE_CLAMP) && (splineTime > (splinePath->EndPoint() - 2))) {
             delete splinePath;
             splinePath = NULL;
-            velocity   = vec_zero;
+            if (!ignorevelocity) {
+                velocity = vec_zero;
+            }
             if (!ignoreangles) {
                 avelocity = vec_zero;
             }
@@ -1628,7 +1749,6 @@ void ScriptSlave::FollowingPath(Event *ev)
 }
 
 void ScriptSlave::Explode(Event *ev)
-
 {
     float damage;
 
@@ -1758,15 +1878,11 @@ void ScriptSlave::EventNormalAngles(Event *ev)
 void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
 {
     str name;
-    //int iObjNum;
+    int                     iObjNum = 0;
     Vector                  vLastOrigin;
     SimpleEntity           *ent;
-    int                     i;
-    static cSpline<4, 512> *pTmpPath = NULL;
-
-    if (!pTmpPath) {
-        pTmpPath = new cSpline<4, 512>;
-    }
+    int                     i = 1;
+    static cSpline<4, 512> *pTmpPath = new cSpline<4, 512>;
 
     if (!pPath) {
         return;
@@ -1779,25 +1895,22 @@ void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
 
     name = se->Target();
 
-    if (name.c_str()) {
-        Vector vDelta;
-        vec4_t origin;
-        float  fCurLength;
+    if (name.length()) {
+        for(ent = se; ent; ent = ent->Next()) {
+            Vector vDelta;
+            vec4_t vTmp;
 
-        i          = 0;
-        fCurLength = 0;
-        ent        = se;
-        while (ent) {
-            if (vLastOrigin.length() == 0.0f && i > 1) {
+            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 {
-                origin[0] = fCurLength;
-                origin[1] = ent->origin[0];
-                origin[2] = ent->origin[1];
-                origin[3] = ent->origin[2];
-                pTmpPath->Add(origin, 0);
+                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;
-                fCurLength++;
             }
 
             if (ent == se && i > 1) {
@@ -1805,35 +1918,38 @@ void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
             }
 
             i++;
-            ent = ent->Next();
         }
+    }
 
-        if (pTmpPath->m_iPoints > 2) {
-            float *vTmp;
+    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.0f, 0);
+        pPath->Reset();
 
-            vLastOrigin[0] = vTmp[1];
-            vLastOrigin[1] = vTmp[2];
-            vLastOrigin[2] = vTmp[3];
+        vTmp = pTmpPath->GetByNode(0, NULL);
+        VectorCopy((vTmp + 1), vLastOrigin);
+        VectorCopy((vTmp + 1), origin);
 
-            fCurLength = 0;
+        for (i = 0; i < pTmpPath->m_iPoints; i++) {
+            vec4_t vTmp2;
 
-            for (i = 0; i < pTmpPath->m_iPoints; i++) {
-                vTmp = pTmpPath->GetByNode(i, 0);
+            vTmp = pTmpPath->GetByNode(i, NULL);
 
-                vDelta = (vTmp + 1) - vLastOrigin;
+            VectorCopy((vTmp + 1), vLastOrigin);
+            VectorSubtract(vLastOrigin, origin, vDelta);
 
-                fCurLength += vDelta.length();
-                origin[0] = fCurLength;
-                origin[1] = vTmp[1];
-                origin[2] = vTmp[2];
-                origin[3] = vTmp[3];
+            fCurLength += VectorLength(vDelta);
+            vTmp2[0] = fCurLength;
+            vTmp2[1] = vLastOrigin[0];
+            vTmp2[2] = vLastOrigin[1];
+            vTmp2[3] = vLastOrigin[2];
 
-                pPath->Add(origin, 0);
-                vLastOrigin = (vTmp + 1);
-            }
+            pPath->Add(vTmp2, 0);
+            VectorCopy(vLastOrigin, origin);
         }
     }
 }
@@ -1917,7 +2033,8 @@ void ScriptModel::SetAnimEvent(Event *ev)
 
         animnum = gi.Anim_NumForName(edict->tiki, animname);
         if (animnum >= 0) {
-            NewAnim(animnum);
+            NewAnim(animnum, EV_ScriptModel_AnimDone);
+            RestartAnimSlot(0);
         }
     }
 }
@@ -2040,9 +2157,40 @@ Used as an alternate origin for objects.  Bind the object to the script_origin
 in order to simulate changing that object's origin.
 ******************************************************************************/
 
+// 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},
-    {NULL,      NULL                        }
+
+    //
+    // Added in 2.30
+    //
+    {&EV_ScriptOrigin_SetAngle, &ScriptOrigin::SetAngleEvent},
+    {&EV_ScriptOrigin_GetAngle, &ScriptOrigin::GetAngleEvent},
+    {NULL,                      NULL                        }
 };
 
 ScriptOrigin::ScriptOrigin()
@@ -2051,6 +2199,39 @@ ScriptOrigin::ScriptOrigin()
     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) ?
 
@@ -2064,6 +2245,7 @@ CLASS_DECLARATION(ScriptSlave, ScriptSkyOrigin, "script_skyorigin") {
 ScriptSkyOrigin::ScriptSkyOrigin()
 {
     edict->s.renderfx |= RF_SKYORIGIN;
+    edict->r.svFlags &= ~SVF_NOCLIENT;
     setContents(0);
     setSolidType(SOLID_NOT);
 }
@@ -2211,8 +2393,9 @@ Event EV_ScriptAimedStrafingGunfire_AimTarget
 );
 
 CLASS_DECLARATION(ScriptSimpleStrafingGunfire, ScriptAimedStrafingGunfire, "script_aimedstrafinggunfire") {
-    {&EV_ScriptSimpleStrafingGunfire_Fire, &ScriptAimedStrafingGunfire::GunFire},
-    {NULL,                                 NULL                                }
+    {&EV_ScriptAimedStrafingGunfire_AimTarget, &ScriptAimedStrafingGunfire::SetAimTarget},
+    {&EV_ScriptSimpleStrafingGunfire_Fire,     &ScriptAimedStrafingGunfire::GunFire     },
+    {NULL,                                 NULL                                         }
 };
 
 ScriptAimedStrafingGunfire::ScriptAimedStrafingGunfire()
@@ -2230,8 +2413,8 @@ void ScriptAimedStrafingGunfire::GunFire(Event *ev)
     Vector dir, right, up;
     Vector horzAngles;
 
-    AngleVectors(angles, NULL, NULL, up);
-    dir = -1 * up;
+    dir = aimTarget->origin - origin;
+    dir.normalize();
 
     VectorToAngles(dir, horzAngles);
     AngleVectors(horzAngles, NULL, right, up);
diff --git a/code/fgame/scriptslave.h b/code/fgame/scriptslave.h
index 9e1a6cfe..b3bbae74 100644
--- a/code/fgame/scriptslave.h
+++ b/code/fgame/scriptslave.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.
 
@@ -93,6 +93,8 @@ protected:
     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);
@@ -113,6 +115,7 @@ protected:
     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);
@@ -136,6 +139,11 @@ protected:
     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);
@@ -150,7 +158,6 @@ protected:
     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 EventNormalAngles(Event *ev); // Added in 2.0
@@ -201,6 +208,7 @@ inline void ScriptSlave::Archive(Archiver& arc)
     arc.ArchiveFloat(&splineTime);
     arc.ArchiveBoolean(&splineangles);
     arc.ArchiveBoolean(&ignoreangles);
+    arc.ArchiveBoolean(&ignorevelocity);
     arc.ArchiveBoolean(&moving);
 
     if (arc.Saving()) {
@@ -280,6 +288,9 @@ class ScriptOrigin : public ScriptSlave
 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
diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 7146f58b..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.",
@@ -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
 (
@@ -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                                   }
 };
 
@@ -2273,7 +2326,7 @@ ScriptThread::ScriptThread(ScriptClass *scriptClass, unsigned char *pCodePos)
 
 ScriptThread::~ScriptThread()
 {
-    ScriptVM* vm;
+    ScriptVM *vm;
 
     if (g_scripttrace->integer && CanScriptTracePrint()) {
         gi.DPrintf2("---Destructor THREAD: %p\n", this);
@@ -2282,10 +2335,11 @@ ScriptThread::~ScriptThread()
     assert(m_ScriptVM);
     if (!m_ScriptVM) {
         // should never happen
-        throw ScriptException("Attempting to delete a dead thread.");
+        //throw ScriptException("Attempting to delete a dead thread.");
+        gi.Error(ERR_DROP, "Attempting to delete a dead thread.");
     }
 
-    vm = m_ScriptVM;
+    vm         = m_ScriptVM;
     m_ScriptVM = NULL;
     if (vm->ThreadState() == THREAD_WAITING) {
         vm->m_ThreadState = THREAD_RUNNING;
@@ -2366,7 +2420,7 @@ void ScriptThread::ScriptExecuteInternal(ScriptVariable *data, int dataSize)
     SafePtr<ScriptThread> currentThread;
     SafePtr<ScriptThread> previousThread;
 
-    currentThread = Director.CurrentThread();
+    currentThread  = Director.CurrentThread();
     previousThread = this;
 
     Director.m_PreviousThread = Director.CurrentThread();
@@ -2474,7 +2528,7 @@ void ScriptThread::Stop(void)
     }
 }
 
-void ScriptThread::Wait(float time)
+void ScriptThread::Wait(int time)
 {
     StartTiming(level.inttime + time);
     m_ScriptVM->Suspend();
@@ -2489,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 {
@@ -2707,12 +2761,17 @@ void ScriptThread::EventDelayThrow(Event *ev)
 
 void ScriptThread::EventWait(Event *ev)
 {
-    Wait((int)(ev->GetFloat(1) * 1000.0f + 0.5f));
+    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((int)(level.frametime * 1000.0f + 0.5f));
+    Wait((int)roundf(level.frametime * 1000));
 }
 
 void ScriptThread::EventResume(Event *ev)
@@ -2788,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)
@@ -2801,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)
@@ -2814,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)
@@ -2827,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)
@@ -2906,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)
@@ -3022,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)) {
@@ -3463,7 +3533,15 @@ void ScriptThread::CameraCommand(Event *ev)
 
 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) {}
@@ -3523,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)
@@ -3576,7 +3669,7 @@ void ScriptThread::Angles_PointAt(Event *ev)
 
 void ScriptThread::EventIsAlive(Event *ev)
 {
-    Entity* ent;
+    Entity *ent;
 
     if (!ev->IsEntityAt(1)) {
         ev->AddInteger(false);
@@ -3705,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) {
@@ -3746,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);
@@ -3765,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;
@@ -3781,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);
@@ -3868,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") {
@@ -3878,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);
@@ -4022,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)
@@ -4067,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);
     }
 }
 
@@ -4139,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;
     }
@@ -4170,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)
@@ -4274,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;
@@ -4375,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;
@@ -4622,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)
@@ -4716,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);
 }
@@ -5022,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") {
@@ -5032,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);
@@ -5283,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;
         }
     }
@@ -5333,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) {}
@@ -5350,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();
 
@@ -5362,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();
 
@@ -5420,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);
 
@@ -5431,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;
@@ -5444,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);
 
@@ -5467,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;
@@ -5478,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);
 
@@ -5489,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;
@@ -5500,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();
 
@@ -5521,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);
 
@@ -5534,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();
 
@@ -5546,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");
@@ -5559,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();
 
@@ -5570,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);
 
@@ -5581,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();
 
@@ -5594,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);
 
@@ -5629,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();
 
@@ -5640,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);
 
@@ -5651,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();
 
@@ -5662,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);
 
@@ -5673,7 +5763,6 @@ void ScriptThread::FileFlush(Event *ev)
 
 void ScriptThread::FileExists(Event *ev)
 {
-    int   id      = 0;
     int   numArgs = 0;
     FILE *f       = 0;
     str   filename;
@@ -5686,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");
     }
 
@@ -5701,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();
 
@@ -5715,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);
@@ -5741,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();
 
@@ -5753,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");
     }
@@ -5770,7 +5866,6 @@ void ScriptThread::FileSaveAll(Event *ev)
 
 void ScriptThread::FileRemove(Event *ev)
 {
-    int id      = 0;
     int numArgs = 0;
     int ret     = 0;
     str filename;
@@ -5783,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");
     }
 
@@ -5794,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;
@@ -5894,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");
     }
 
@@ -5969,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");
     }
 
@@ -5997,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");
     }
 
@@ -6242,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)
@@ -6593,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];
@@ -6642,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);
@@ -6650,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];
@@ -6675,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);
@@ -6695,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");
@@ -6732,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");
@@ -6791,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);
@@ -6822,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);
@@ -6855,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;
@@ -6927,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);
 }
@@ -7021,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 d46f3b1c..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,13 +192,13 @@ public:
     ScriptThread(ScriptClass *scriptClass, unsigned char *pCodePos);
     virtual ~ScriptThread();
 
-    void                  Execute(Event                 &ev);
+    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();
@@ -225,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
@@ -345,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.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 46535362..1551a715 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -146,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
 );
@@ -193,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
@@ -391,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
@@ -531,7 +531,7 @@ Event EV_Sentient_ForceDropWeapon2
 );
 Event EV_Sentient_ForceDropHealth
 (
-    "forcedropweapon",
+    "forcedrophealth",
     EV_DEFAULT,
     NULL,
     NULL,
@@ -540,7 +540,7 @@ Event EV_Sentient_ForceDropHealth
 );
 Event EV_Sentient_ForceDropHealth2
 (
-    "forcedropweapon",
+    "forcedrophealth",
     EV_DEFAULT,
     NULL,
     NULL,
@@ -578,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",
@@ -656,10 +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           },
-    {&EV_Sentient_Client_Landing,       &Sentient::EventClientLanding           },
-    {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;
@@ -690,7 +710,8 @@ void Sentient::EventGiveDynItem(Event *ev)
 }
 
 Sentient::Sentient()
-    : m_bIsAnimal(false)
+    : mAccuracy(0.2f)
+    , m_bIsAnimal(false)
 {
     SentientList.AddObject((Sentient *)this);
     entflags |= ECF_SENTIENT;
@@ -1031,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();
 
@@ -1120,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;
@@ -1212,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;
@@ -1353,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;
@@ -1395,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;
     }
 
@@ -1403,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
@@ -1470,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)
@@ -1505,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);
@@ -1541,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;
     }
 
@@ -1572,44 +1550,88 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
         }
     }
 
-    if (health > 0) {
-        // Send pain event
-        event = new 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);
+    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, 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);
+        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)
@@ -1962,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();
     }
 }
 
@@ -2152,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 {
@@ -2166,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;
 
@@ -2182,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);
+            }
         }
     }
 
@@ -2212,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();
@@ -2229,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);
 }
@@ -2515,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)
@@ -2532,7 +2626,6 @@ void Sentient::EventAmerican(Event *ev)
         DisbandSquadMate(this);
     }
 
-
     Unlink();
     m_Team = TEAM_AMERICAN;
     Link();
@@ -2546,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)
@@ -2721,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)
@@ -2845,7 +2946,7 @@ 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;
@@ -2866,7 +2967,7 @@ void Sentient::UpdateFootsteps(void)
         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;
@@ -2945,42 +3046,47 @@ void Sentient::SetMinViewVariation(const Vector& vVariation)
     m_vViewVariation.z = Q_min(m_vViewVariation.z, vVariation.z);
 }
 
-void Sentient::SetHolsteredByCode(bool holstered) {
+void Sentient::SetHolsteredByCode(bool holstered)
+{
     weapons_holstered_by_code = holstered;
 }
 
-Vehicle* Sentient::GetVehicle() const
+Vehicle *Sentient::GetVehicle() const
 {
     return m_pVehicle;
 }
 
-void Sentient::SetVehicle(Vehicle* pVehicle)
+void Sentient::SetVehicle(Vehicle *pVehicle)
 {
     m_pVehicle = NULL;
 }
 
-TurretGun* Sentient::GetTurret() const
+TurretGun *Sentient::GetTurret() const
 {
     return m_pTurret;
 }
 
-void Sentient::SetTurret(TurretGun* 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)
+void Sentient::EventClientLanding(Event *ev)
 {
-    float fVolume = ev->NumArgs() >= 1 ? ev->GetFloat(1) : 1;
-    int iEquipment = ev->NumArgs() >= 2 ? ev->GetInteger(2) : 1;
+    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)
+void Sentient::FootstepMain(trace_t *trace, int iRunning, int iEquipment)
 {
     int    contents;
     int    surftype;
@@ -3000,12 +3106,10 @@ void Sentient::FootstepMain(trace_t* trace, int iRunning, int iEquipment)
         contents = gi.pointcontents(midlegs, -1);
         if (contents & MASK_WATER) {
             sSoundName += "wade";
-        }
-        else {
+        } else {
             sSoundName += "puddle";
         }
-    }
-    else {
+    } else {
         surftype = trace->surfaceFlags & MASK_SURF_TYPE;
         switch (surftype) {
         case SURF_FOLIAGE:
@@ -3065,8 +3169,7 @@ void Sentient::FootstepMain(trace_t* trace, int iRunning, int iEquipment)
         } else {
             fVolume = 1.0;
         }
-    }
-    else {
+    } else {
         fVolume = 0.25;
     }
 
@@ -3082,7 +3185,7 @@ void Sentient::FootstepMain(trace_t* trace, int iRunning, int iEquipment)
     }
 }
 
-void Sentient::Footstep(const char* szTagName, int iRunning, int iEquipment)
+void Sentient::Footstep(const char *szTagName, int iRunning, int iEquipment)
 {
     int           i;
     int           iTagNum;
@@ -3115,8 +3218,7 @@ void Sentient::Footstep(const char* szTagName, int iRunning, int iEquipment)
 
         VectorSet(vMins, -2, -2, -8);
         VectorSet(vMaxs, 2, 2, 8);
-    }
-    else {
+    } else {
         VectorSet(vMins, -4, -4, 0);
         VectorSet(vMaxs, 4, 4, 2);
 
@@ -3127,28 +3229,9 @@ void Sentient::Footstep(const char* szTagName, int iRunning, int iEquipment)
     }
 
     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"
-        );
+        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) {
@@ -3160,14 +3243,14 @@ void Sentient::Footstep(const char* szTagName, int iRunning, int 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 };
+    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;
@@ -3182,26 +3265,11 @@ void Sentient::LandingSound(float volume, int iEquipment)
     vEnd[2] -= 64.0;
 
     if (IsSubclassOfPlayer()) {
-        trace = G_Trace(
-            vStart,
-            g_vFootstepMins,
-            g_vFootstepMaxs,
-            vEnd,
-            edict,
-            MASK_PLAYERSOLID,
-            qtrue,
-            "Player Footsteps"
-        );
+        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"
+            vStart, g_vFootstepMins, g_vFootstepMaxs, vEnd, edict, MASK_MONSTERSOLID, qfalse, "Monster Footsteps"
         );
     }
 
diff --git a/code/fgame/sentient.h b/code/fgame/sentient.h
index 184629e9..c148db26 100644
--- a/code/fgame/sentient.h
+++ b/code/fgame/sentient.h
@@ -321,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);
@@ -349,16 +350,23 @@ public:
     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 6ebe3279..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,8 +54,13 @@ 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)
@@ -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);
         }
     }
@@ -446,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());
@@ -863,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;
@@ -895,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;
@@ -1035,7 +1075,6 @@ Weapon *Sentient::GetActiveWeapon(weaponhand_t hand) const
 }
 
 qboolean Sentient::IsActiveWeapon(Weapon *weapon)
-
 {
     int i;
 
@@ -1063,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) {
@@ -1080,8 +1122,7 @@ void Sentient::useWeapon(Weapon *weapon, weaponhand_t hand)
     }
 
     if (newActiveWeapon.weapon) {
-        newActiveWeapon.weapon = weapon;
-        newActiveWeapon.hand   = hand;
+        SetNewActiveWeapon(weapon, hand);
         return;
     }
 
@@ -1093,14 +1134,15 @@ 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)
@@ -1246,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;
@@ -1274,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 7c4aecf6..d4d407db 100644
--- a/code/fgame/simpleactor.cpp
+++ b/code/fgame/simpleactor.cpp
@@ -85,7 +85,7 @@ SimpleActor::SimpleActor()
     m_csNextAnimString        = STRING_NULL;
 
     for (int i = 0; i < MAX_FRAMEINFOS; i++) {
-        m_weightType[i] = 0.0f;
+        m_weightType[i] = ANIM_WEIGHT_NONE;
     }
 
     m_ChangeActionAnimIndex = -1;
@@ -187,30 +187,42 @@ void SimpleActor::SetPath(
     m_Path.FindPath(origin, vDestPos, this, 0.0, vLeashHome, fLeashDistSquared);
 
     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 (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);
+        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);
     }
 }
 
@@ -653,7 +665,7 @@ void SimpleActor::StopAnimating(int slot)
 {
     int index = 0;
 
-    m_weightType[slot] = 0;
+    m_weightType[slot] = ANIM_WEIGHT_NONE;
     DoExitCommands(slot);
 
     if (edict->s.frameInfo[slot].index || gi.TIKI_NumAnims(edict->tiki) <= 1) {
@@ -802,7 +814,6 @@ void SimpleActor::StartAimAnimSlot(int slot, int anim)
 
     m_weightType[slot]       = ANIM_WEIGHT_AIM;
     m_weightCrossBlend[slot] = 0.0;
-    m_weightBase[slot]       = 1.0;
     NewAnim(anim, slot, 1.0);
 
     RestartAnimSlot(slot);
@@ -853,9 +864,9 @@ void SimpleActor::UpdateCrossBlendAnimSlot(int slot)
 void SimpleActor::UpdateCrossBlendDialogAnimSlot(int slot)
 {
     if (m_iSaySlot >= 0) {
-        m_weightCrossBlend[m_iSaySlot] -= level.frametime / 0.1f;
+        m_weightCrossBlend[slot] -= level.frametime / 0.1f;
     } else {
-        m_weightCrossBlend[m_iSaySlot] -= level.frametime / 0.5f;
+        m_weightCrossBlend[slot] -= level.frametime / 0.5f;
     }
 
     if (m_weightCrossBlend[slot] > 0.0) {
@@ -869,9 +880,9 @@ void SimpleActor::UpdateCrossBlendDialogAnimSlot(int slot)
 void SimpleActor::UpdateSayAnimSlot(int slot)
 {
     if (m_iSaySlot >= 0) {
-        m_weightCrossBlend[m_iSaySlot] += level.frametime / 0.1f;
+        m_weightCrossBlend[slot] += level.frametime / 0.1f;
     } else {
-        m_weightCrossBlend[m_iSaySlot] += level.frametime / 0.5f;
+        m_weightCrossBlend[slot] += level.frametime / 0.5f;
     }
 
     SetBlendedWeight(slot);
@@ -1066,7 +1077,7 @@ int SimpleActor::GetEmotionAnim(void)
         default:
 
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"Unknown value for m_EmotionMode in SimpleActor::GetEmotionAnim\"\n\tMessage: ");
+            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;
@@ -1089,7 +1100,7 @@ int SimpleActor::GetEmotionAnim(void)
         default:
 
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"Unknown value for m_csMood in SimpleActor::GetEmotionAnim\"\n\tMessage: ");
+            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;
diff --git a/code/fgame/simpleactor.h b/code/fgame/simpleactor.h
index 873a8885..4aea2112 100644
--- a/code/fgame/simpleactor.h
+++ b/code/fgame/simpleactor.h
@@ -469,7 +469,7 @@ inline void SimpleActor::SetDesiredYawDest(const vec3_t vec)
     vec2_t facedir;
     VectorSub2D(vec, origin, facedir);
 
-    if (!facedir[0] || !facedir[1]) {
+    if (facedir[0] || facedir[1]) {
         SetDesiredYawDir(facedir);
     }
 }
diff --git a/code/fgame/simpleentity.cpp b/code/fgame/simpleentity.cpp
index a4120e92..6b582500 100644
--- a/code/fgame/simpleentity.cpp
+++ b/code/fgame/simpleentity.cpp
@@ -356,11 +356,6 @@ int SimpleEntity::IsSubclassOfCrateObject(void) const
     return (entflags & ECF_CRATEOBJECT);
 }
 
-int SimpleEntity::IsSubclassOfBot(void) const
-{
-    return (entflags & ECF_BOT);
-}
-
 void SimpleEntity::SetTargetName(str targetname)
 {
     if (!world) {
@@ -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 93e39a1c..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.
 
@@ -122,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()
@@ -233,42 +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::setOwner(Sentient* other)
+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
+Sentient *SmokeGrenade::getOwner() const
 {
     return owner;
 }
diff --git a/code/fgame/smokegrenade.h b/code/fgame/smokegrenade.h
index d77754d6..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.
 
@@ -26,43 +26,46 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class Sentient;
 
-class SmokeGrenade : public EffectEntity {
+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 setOwner(Sentient* other);
-    Sentient* getOwner() const;
+    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;
+    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 1fe6c5d0..f848a8cb 100644
--- a/code/fgame/smokesprite.cpp
+++ b/code/fgame/smokesprite.cpp
@@ -113,8 +113,56 @@ void G_AddSmokeSprite(const SmokeSprite* sprite)
 }
 
 float G_ObfuscationForSmokeSprites(float visibilityAlpha, const Vector& start, const Vector& end) {
-    // FIXME: unimplemented
-    return 0;
+    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() {
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 aa6ab59b..a32dc460 100644
--- a/code/fgame/spline.h
+++ b/code/fgame/spline.h
@@ -85,7 +85,7 @@ int cSpline<cGrids, cPoints>::Add(float *fAdd, int flags)
     int ii;
     int insertIndex;
 
-    if (m_iPoints + 1 > 512) {
+    if (m_iPoints + 1 > cPoints) {
         return -1;
     }
 
@@ -115,8 +115,8 @@ void cSpline<cGrids, cPoints>::UniformAdd(float *pos)
     int i;
     int ii;
 
-    for (i = m_iPoints; i > 0; i--) {
-        for (ii = 0; ii <= cGrids; ii++) {
+    for (i = 0; i < m_iPoints; i++) {
+        for (ii = 0; ii < cGrids; ii++) {
             m_vPoints[i][ii] += pos[ii];
         }
     }
@@ -197,7 +197,7 @@ float *cSpline<cGrids, cPoints>::GetByNode(float x, int *flags)
     static float r[cGrids];
     double       delta[cGrids];
 
-    rp = (int)(floor(x) + 1.0f);
+    rp = (int)(floor(x) + 1.0);
 
     if (rp <= 0) {
         if (flags) {
@@ -221,11 +221,11 @@ float *cSpline<cGrids, cPoints>::GetByNode(float x, int *flags)
         }
     } else {
         if (flags) {
-            *flags = m_iPointFlags[rp - 1];
+            *flags = m_iPointFlags[m_iPoints - 1];
         }
 
         for (i = 0; i < cGrids; i++) {
-            r[i] = m_vPoints[rp - 1][i];
+            r[i] = m_vPoints[m_iPoints - 1][i];
         }
     }
 
@@ -240,13 +240,16 @@ int cSpline<cGrids, cPoints>::Append(cSpline<cGrids, cPoints> *pNew)
     float  fIndexAdd;
     int    i;
     int    ii;
-    int    iFlags;
+    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++) {
@@ -260,7 +263,7 @@ int cSpline<cGrids, cPoints>::Append(cSpline<cGrids, cPoints> *pNew)
             Add(o_fTmp, iFlags);
         }
 
-        return m_iPoints;
+        return points;
     } else {
         for (i = 0; i < pNew->m_iPoints; i++) {
             i_fTmp = pNew->GetByNode(i, &iFlags);
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 a62fde94..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.
 
@@ -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
@@ -322,7 +322,6 @@ Trigger::Trigger()
 Trigger::~Trigger() {}
 
 void Trigger::SetTriggerDir(float angle)
-
 {
     triggerDirYaw = angle;
     triggerDir    = G_GetMovedir(angle);
@@ -330,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)));
 }
@@ -347,7 +344,6 @@ qboolean Trigger::UsingTriggerDir(void)
 }
 
 void Trigger::SetTriggerDir(Event *ev)
-
 {
     SetTriggerDir(ev->GetFloat(1));
 }
@@ -389,7 +385,6 @@ void Trigger::StartThread(Event *ev)
 }
 
 qboolean Trigger::respondTo(Entity *other)
-
 {
     return (
         ((respondto & TRIGGER_PLAYERS) && other->isClient())
@@ -399,7 +394,6 @@ qboolean Trigger::respondTo(Entity *other)
 }
 
 Entity *Trigger::getActivator(Entity *other)
-
 {
     return other;
 }
@@ -446,6 +440,12 @@ void Trigger::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)
@@ -457,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;
 
@@ -528,10 +528,10 @@ void Trigger::TriggerStuff(Event *ev)
         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));
+            if (activator->IsSubclassOfProjectile()) {
+                Projectile* proj = static_cast<Projectile*>(activator);
+                event->AddEntity(G_GetEntity(proj->owner));
+            }
         }
         PostEvent(event, delay);
     }
@@ -570,7 +570,6 @@ void Trigger::TriggerStuff(Event *ev)
 //==============================
 //
 void Trigger::ActivateTargets(Event *ev)
-
 {
     Entity     *other;
     Entity     *ent;
@@ -647,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);
 }
@@ -668,19 +665,16 @@ void Trigger::EventSetThread(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);
@@ -690,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);
@@ -714,7 +705,6 @@ void Trigger::SetNoise(const char *text)
 }
 
 str& Trigger::Noise(void)
-
 {
     return Director.GetString(noise);
 }
@@ -766,6 +756,10 @@ void Trigger::DamageEvent(Event *ev)
     Vector  dir;
     Vector  momentum;
 
+    if (!takedamage) {
+        return;
+    }
+
     if (Immune(ev->GetInteger(9))) {
         // trigger is immune
         return;
@@ -788,6 +782,10 @@ void Trigger::DamageEvent(Event *ev)
     if (health <= 0) {
         Event *event;
 
+        if (max_health) {
+            deadflag = DEAD_DEAD;
+        }
+
         event = new Event(EV_Activate, 1);
         event->AddEntity(attacker);
         ProcessEvent(event);
@@ -839,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;
@@ -873,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},
@@ -901,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))
@@ -987,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);
     }
@@ -1067,7 +1076,6 @@ TouchField::TouchField()
 }
 
 void TouchField::Setup(Entity *ownerentity, Event& touchevent, Vector min, Vector max, int respondto)
-
 {
     assert(ownerentity);
     if (!ownerentity) {
@@ -1090,7 +1098,6 @@ void TouchField::Setup(Entity *ownerentity, Event& touchevent, Vector min, Vecto
 }
 
 void TouchField::SendEvent(Event *ev)
-
 {
     Event *event;
 
@@ -1199,7 +1206,8 @@ set "message" to text string
 
 ******************************************************************************/
 
-Event EV_TriggerSave_SaveName(
+Event EV_TriggerSave_SaveName
+(
     "savename",
     EV_DEFAULT,
     "s",
@@ -1225,7 +1233,7 @@ 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)
@@ -1301,7 +1309,6 @@ TriggerSecret::TriggerSecret()
 }
 
 void TriggerSecret::FoundSecret(Event *ev)
-
 {
     //
     // anything that causes the trigger to fire increments the number
@@ -1387,7 +1394,6 @@ void TriggerPush::SetPushDir(Event *ev)
 }
 
 void TriggerPush::SetPushSpeed(Event *ev)
-
 {
     speed = ev->GetFloat(1);
 }
@@ -1522,7 +1528,6 @@ CLASS_DECLARATION(Trigger, TriggerPlaySound, "play_sound_triggered") {
 };
 
 void TriggerPlaySound::ToggleSound(Event *ev)
-
 {
     if (!state) {
         // noise should already be initialized
@@ -1548,7 +1553,6 @@ void TriggerPlaySound::ToggleSound(Event *ev)
 }
 
 void TriggerPlaySound::StartSound(void)
-
 {
     // turn the current one off
     state = 1;
@@ -1560,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);
 }
@@ -1718,7 +1717,6 @@ CLASS_DECLARATION(TriggerSpeaker, RandomSpeaker, "sound_randomspeaker") {
 };
 
 void RandomSpeaker::TriggerSound(Event *ev)
-
 {
     ScheduleSound();
     if (G_Random(1) <= chance) {
@@ -1727,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;
 }
@@ -1842,7 +1833,6 @@ TriggerChangeLevel::TriggerChangeLevel()
 }
 
 void TriggerChangeLevel::SetMap(Event *ev)
-
 {
     map = ev->GetConstString(1);
 }
@@ -1886,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;
     }
@@ -1947,6 +1937,27 @@ CLASS_DECLARATION(Trigger, TriggerUse, "trigger_use") {
 
 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
 
@@ -2108,13 +2119,11 @@ TriggerDamageTargets::TriggerDamageTargets()
 }
 
 void TriggerDamageTargets::SetDamage(Event *ev)
-
 {
     damage = ev->GetInteger(1);
 }
 
 void TriggerDamageTargets::PassDamage(Event *ev)
-
 {
     Entity     *attacker;
     int         dmg;
@@ -2150,7 +2159,6 @@ void TriggerDamageTargets::PassDamage(Event *ev)
 //
 
 void TriggerDamageTargets::DamageTargets(Event *ev)
-
 {
     Entity     *other;
     Entity     *ent;
@@ -2304,13 +2312,11 @@ TriggerExit::TriggerExit()
 }
 
 void TriggerExit::TurnExitSignOff(Event *ev)
-
 {
     level.near_exit = false;
 }
 
 void TriggerExit::DisplayExitSign(Event *ev)
-
 {
     level.near_exit = qtrue;
 
@@ -2827,7 +2833,6 @@ void TriggerByPushObject::setTriggerName(Event *event)
 }
 
 qboolean TriggerByPushObject::respondTo(Entity *other)
-
 {
     if (other->isSubclassOf(PushObject)) {
         if (triggername != STRING_EMPTY) {
@@ -2841,7 +2846,6 @@ qboolean TriggerByPushObject::respondTo(Entity *other)
 }
 
 Entity *TriggerByPushObject::getActivator(Entity *other)
-
 {
     Entity *owner;
 
@@ -2863,10 +2867,30 @@ void TriggerByPushObject::Archive(Archiver& arc)
     Director.ArchiveString(arc, triggername);
 }
 
-Event EV_TriggerGivePowerup_OneShot("oneshot", EV_DEFAULT, NULL, NULL, "Make this a one time trigger.");
+/*****************************************************************************/
+/*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.
 
-Event EV_TriggerGivePowerup_PowerupName(
-    "powerupname", EV_DEFAULT, "s", "powerup_name", "Specifies the powerup to give to the sentient."
+"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",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make this a one time trigger."
+);
+
+Event EV_TriggerGivePowerup_PowerupName
+(
+    "powerupname",
+    EV_DEFAULT,
+    "s",
+    "powerup_name",
+    "Specifies the powerup to give to the sentient."
 );
 
 CLASS_DECLARATION(Trigger, TriggerGivePowerup, "trigger_givepowerup") {
@@ -3008,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},
@@ -3028,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",
diff --git a/code/fgame/trigger.h b/code/fgame/trigger.h
index d8adabe4..1a4e56e9 100644
--- a/code/fgame/trigger.h
+++ b/code/fgame/trigger.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.
 
@@ -172,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)
@@ -380,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
@@ -401,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:
@@ -593,6 +604,10 @@ inline void TriggerClickItem::Archive(Archiver& arc)
     Trigger::Archive(arc);
 }
 
+//
+// Added in 2.0
+//
+
 class TriggerNoDamage : public TriggerUse
 {
 public:
@@ -602,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
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 1c20db88..6f8ca73b 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -1096,6 +1096,7 @@ Vehicle::Vehicle()
 
     m_bAutoPilot       = qfalse;
     m_fIdealSpeed      = 0;
+    m_fMaxSpeed        = 0;
     m_fIdealAccel      = 0;
     m_fIdealDistance   = 100;
     m_bBounceBackwards = false;
@@ -1173,6 +1174,7 @@ Vehicle::Vehicle()
     m_sAnimationSet = "";
     m_sSoundSet     = "";
 
+    m_iLastTiresUpdate = -1;
     for (i = 0; i < NUM_VEHICLE_TIRES; i++) {
         m_vTireEnd[i] = origin;
         m_bTireHit[i] = false;
@@ -1194,11 +1196,7 @@ Vehicle::~Vehicle
 */
 Vehicle::~Vehicle()
 {
-    for (int i = 0; i < MAX_CORNERS; i++) {
-        if (m_pVehicleSoundEntities[i]) {
-            m_pVehicleSoundEntities[i]->PostEvent(EV_Remove, EV_LINKDOORS);
-        }
-    }
+    RemoveVehicleSoundEntities();
 
     if (m_pCollisionEntity) {
         m_pCollisionEntity->ProcessEvent(EV_Remove);
@@ -1217,7 +1215,7 @@ void Vehicle::ResetSlots(void)
     driver.ent                 = NULL;
     driver.boneindex           = -1;
     driver.enter_boneindex     = -1;
-    driver.flags               = SLOT_UNUSED;
+    driver.flags               = 0;
     lastdriver.ent             = NULL;
     lastdriver.boneindex       = -1;
     lastdriver.enter_boneindex = -1;
@@ -1506,6 +1504,9 @@ void Vehicle::QueryTurretSlotPosition(int slot, float *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);
     }
@@ -2037,7 +2038,7 @@ bool Vehicle::FindExitPosition(Entity *pEnt, const Vector& vOrigin, const Vector
         return false;
     }
 
-    if (!pEnt->IsSubclassOfPlayer() && vOrigin != vec_zero) {
+    if ((g_target_game < target_game_e::TG_MOHTA || !pEnt->IsSubclassOfPlayer()) && vOrigin != vec_zero) {
         if (vAngles) {
             pEnt->setAngles(*vAngles);
         }
@@ -3137,19 +3138,26 @@ void Vehicle::AutoPilot(void)
             fCoef = ProjectLineOnPlane(vDelta, DotProduct(origin, vDelta), vPrev, vCur, NULL);
 
             if (g_showvehiclemovedebug->integer) {
-                Vector vColor;
-                G_DebugBBox(vColor, Vector(-32, -32, -32), Vector(32, 32, 32), 0, 1, 1, 1);
-                G_DebugBBox(vColor, Vector(-32, -32, -32), Vector(32, 32, 32), 1, 1, 0, 1);
-                G_DebugArrow(vColor, m_vIdealDir * -1, (1 - fCoef) * fTotal, 0, 1, 0, 1);
-                G_DebugArrow(vColor, m_vIdealDir * 1, fCoef * fTotal, 0, 0, 1, 1);
+                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];
-            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 (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) {
@@ -3257,7 +3265,8 @@ void Vehicle::AutoPilot(void)
             vDeltaSave[2] = 0;
 
             if (fDistToCurPos > 1) {
-                if (moveimpulse >= 0 && !m_bBounceBackwards) { // 2.30: checks if it doesn't bounce backwards
+                // 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 {
@@ -3296,12 +3305,12 @@ void Vehicle::AutoPilot(void)
                         moveimpulse = -m_fIdealSpeed;
                     }
                 }
-            } else if (m_fIdealSpeed > moveimpulse) {
+            } else if (moveimpulse < m_fIdealSpeed) {
                 moveimpulse += m_fIdealAccel * level.frametime;
                 if (moveimpulse > m_fIdealSpeed) {
                     moveimpulse = m_fIdealSpeed;
                 }
-            } else if (m_fIdealSpeed < moveimpulse) {
+            } else if (moveimpulse > m_fIdealSpeed) {
                 moveimpulse -= m_fIdealAccel * level.frametime;
                 if (moveimpulse < m_fIdealSpeed) {
                     moveimpulse = m_fIdealSpeed;
@@ -3310,13 +3319,19 @@ void Vehicle::AutoPilot(void)
 
             if (m_iNextPathStartNode >= 0 && m_pNextPath && m_pNextPath->m_iPoints
                 && m_iCurNode > m_iNextPathStartNode + 2) {
-                cVehicleSpline *spline = m_pCurPath;
-                m_pCurPath             = m_pNextPath;
-                m_pNextPath            = spline;
-                m_iCurNode             = 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;
             }
@@ -3379,7 +3394,7 @@ void Vehicle::EventDriveInternal(Event *ev, bool wait)
     m_fLookAhead     = 256;
     m_fIdealAccel    = 35;
     m_fIdealSpeed    = 250;
-    m_fMaxSpeed      = 250;
+    m_fMaxSpeed      = 250; // Added in 2.30
 
     switch (ev->NumArgs()) {
     case 6:
@@ -3392,6 +3407,7 @@ void Vehicle::EventDriveInternal(Event *ev, bool wait)
         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) {
@@ -3449,11 +3465,11 @@ void Vehicle::SetupPath(cVehicleSpline *pPath, SimpleEntity *se)
 
     vLastOrigin = se->origin;
 
-    for (ent = se; ent != NULL; ent = ent->Next(), i++) {
+    for (ent = se; ent; ent = ent->Next(), i++) {
         Vector vDelta = vLastOrigin - ent->origin;
         float  vTmp[4];
 
-        if (vDelta.length() == 0.0f && i > 1) {
+        if (vDelta.length() == 0 && i > 1) {
             Com_Printf("^~^~^Warning: Vehicle Driving with a Path that contains 2 equal points\n");
         } else {
             fCurLength += vDelta.length();
@@ -3462,7 +3478,7 @@ void Vehicle::SetupPath(cVehicleSpline *pPath, SimpleEntity *se)
             VectorCopy(ent->origin, vTmp + 1);
 
             if (ent->IsSubclassOfVehiclePoint()) {
-                pPath->Add(vTmp, static_cast<VehiclePoint *>(ent)->spawnflags);
+                pPath->Add(vTmp, static_cast<VehiclePoint*>(ent)->spawnflags);
             } else {
                 pPath->Add(vTmp, 0);
             }
@@ -3665,6 +3681,23 @@ void Vehicle::DriverUse(Event *ev)
         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);
@@ -3722,14 +3755,12 @@ void Vehicle::DriverUse(Event *ev)
             slot = FindTurretSlotByEntity(sent->GetTurret());
 
             if (slot >= 0) {
-                if (bHasExitPosition) {
-                    if (bHasExitAngles) {
-                        AttachTurretSlot(slot, sentTurret, vExitPosition, &vExitAngles);
-                    } else {
-                        AttachTurretSlot(slot, sentTurret, vExitPosition, NULL);
-                    }
+                if (!bHasExitPosition) {
+                    AttachTurretSlot(slot, sent, vec_zero, NULL);
+                } else if (!bHasExitAngles) {
+                    AttachTurretSlot(slot, sent, vExitPosition, NULL);
                 } else {
-                    AttachTurretSlot(slot, sentTurret, vec_zero, NULL);
+                    AttachTurretSlot(slot, sent, vExitPosition, &vExitAngles);
                 }
 
                 sent->SetVehicle(NULL);
@@ -3740,7 +3771,7 @@ void Vehicle::DriverUse(Event *ev)
 
     // Check for passengers slots
     for (slot = 0; slot < MAX_PASSENGERS; slot++) {
-        if (!(Passengers[0].flags & SLOT_FREE)) {
+        if (!(Passengers[slot].flags & SLOT_FREE)) {
             continue;
         }
 
@@ -3758,7 +3789,7 @@ void Vehicle::DriverUse(Event *ev)
     // Check for turrets slots
     if (ent->IsSubclassOfWeapon()) {
         for (slot = 0; slot < MAX_TURRETS; slot++) {
-            if (!(Turrets[0].flags & SLOT_FREE)) {
+            if (!(Turrets[slot].flags & SLOT_FREE)) {
                 continue;
             }
 
@@ -3774,7 +3805,7 @@ void Vehicle::DriverUse(Event *ev)
         }
     } else {
         for (slot = 0; slot < MAX_TURRETS; slot++) {
-            if (!(Turrets[0].flags & SLOT_BUSY)) {
+            if (!(Turrets[slot].flags & SLOT_BUSY)) {
                 continue;
             }
 
@@ -3836,15 +3867,15 @@ void Vehicle::SetMoveInfo(vmove_t *vm)
 {
     memset(vm, 0, sizeof(vmove_t));
 
-    VectorCopy(origin, vs.origin);
+    origin.copyTo(vs.origin);
     vs.useGravity = false;
     vs.entityNum  = entnum;
 
     vm->vs        = &vs;
     vm->frametime = level.frametime;
     vm->tracemask = edict->clipmask;
-    VectorCopy(mins, vm->mins);
-    VectorCopy(maxs, vm->maxs);
+    mins.copyTo(vm->mins);
+    maxs.copyTo(vm->maxs);
 
     vs.entityNum      = edict->s.number;
     vs.desired_dir[0] = velocity[0];
@@ -3881,14 +3912,17 @@ Vehicle::SetCEMoveInfo
 */
 void Vehicle::SetCEMoveInfo(vmove_t *vm)
 {
+    Vector mins, maxs;
+
     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];
+    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);
 }
 
 /*
@@ -4092,12 +4126,12 @@ void Vehicle::SlidePush(Vector vPush)
             if (j == i && other->entity) {
                 other->entity->CheckGround();
 
-                if (other->entity->groundentity
-                    && (other->entity->groundentity == edict || other->entity == m_pCollisionEntity)) {
+                if (other->entity->groundentity && (other->entity->groundentity == edict
+                    || m_pCollisionEntity && other->entity->groundentity->entity == m_pCollisionEntity)) {
                     // save the entity
-                    pSkippedEntities[iNumSkipped]  = other->entity;
+                    pSkippedEntities[iNumSkipped] = other->entity;
                     iContentsEntities[iNumSkipped] = other->r.contents;
-                    solidEntities[iNumSkipped]     = other->solid;
+                    solidEntities[iNumSkipped] = other->solid;
                     iNumSkipped++;
 
                     if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
@@ -4198,6 +4232,9 @@ void Vehicle::MoveVehicle(void)
     int          iNumSkippedEntities = 0;
     Event       *event               = nullptr;
     Entity      *chain;
+    Entity      *driverEnt = NULL;
+    solid_t     solidDriver = SOLID_NOT;
+    int         contentsDriver = 0;
 
     if (m_bMovementLocked) {
         return;
@@ -4217,6 +4254,19 @@ void Vehicle::MoveVehicle(void)
     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;
 
@@ -4255,8 +4305,8 @@ void Vehicle::MoveVehicle(void)
                     tr.ent->entity->CheckGround();
 
                     if (!tr.ent->entity->groundentity
-                        || (tr.ent->entity->groundentity == edict
-                            && (!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity))) {
+                        || (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);
@@ -4277,7 +4327,15 @@ void Vehicle::MoveVehicle(void)
                             );
                         }
 
-                        break;
+                        // 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;
@@ -4337,8 +4395,8 @@ void Vehicle::MoveVehicle(void)
                 tr.ent->entity->CheckGround();
 
                 if (!tr.ent->entity->groundentity
-                    || (tr.ent->entity->groundentity == edict
-                        && (!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity))) {
+                    || (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);
@@ -4359,7 +4417,11 @@ void Vehicle::MoveVehicle(void)
                         );
                     }
 
-                    break;
+                    // Added in OPM
+                    //  (see the comment above)
+                    if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                        break;
+                    }
                 }
 
                 pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;
@@ -4411,14 +4473,10 @@ void Vehicle::MoveVehicle(void)
                     "Vehicle::MoveVehicle"
                 );
 
-                if (tr.fraction != 1.0f || tr.plane.normal[2] < 0.7f || tr.allsolid) {
+                if ((tr.fraction != 1.0f && tr.plane.normal[2] < 0.7f) || tr.allsolid) {
                     flMoveFrac = 0.0f;
                 }
 
-                if (tr.fraction == 1.0f && !tr.allsolid && !tr.startsolid) {
-                    break;
-                }
-
                 if (!tr.ent || !tr.ent->entity || tr.ent->entity == world) {
                     break;
                 }
@@ -4426,8 +4484,8 @@ void Vehicle::MoveVehicle(void)
                 tr.ent->entity->CheckGround();
 
                 if (!tr.ent->entity->groundentity
-                    || (tr.ent->entity->groundentity == edict
-                        && (!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity))) {
+                    || (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);
@@ -4448,7 +4506,11 @@ void Vehicle::MoveVehicle(void)
                         );
                     }
 
-                    break;
+                    // Added in OPM
+                    //  (see the comment above)
+                    if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                        break;
+                    }
                 }
 
                 pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;
@@ -4513,9 +4575,16 @@ void Vehicle::MoveVehicle(void)
         } 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,
@@ -4675,8 +4744,8 @@ void Vehicle::Postthink(void)
     velocity.z = drivespeed * jumpimpulse;
     avelocity *= 0.05f;
 
-    if (steerinplace && drivespeed < 350.0f) {
-        drivespeed = 350.0f;
+    if (steerinplace && drivespeed < 350) {
+        drivespeed = 350;
     }
 
     avelocity.y += turn * drivespeed;
@@ -4882,10 +4951,6 @@ void Vehicle::VehicleTouched(Event *ev)
         return;
     }
 
-    if (drivable && !driver.ent) {
-        return;
-    }
-
     delta = other->origin - last_origin;
     delta.normalize();
 
@@ -5856,15 +5921,20 @@ void Vehicle::UpdateNormals(void)
     }
 
     if (m_iNumNormals > 1) {
+        float x, z;
+
         temp = m_vNormalSum / m_iNumNormals;
         i    = temp.CrossProduct(temp, j);
 
-        pitch     = i;
-        angles[0] = pitch.toPitch();
+        pitch = i;
+        x     = pitch.toPitch();
 
-        temp      = m_vNormalSum / m_iNumNormals;
-        pitch     = temp.CrossProduct(temp, i);
-        angles[2] = pitch.toPitch();
+        temp  = m_vNormalSum / m_iNumNormals;
+        pitch = temp.CrossProduct(temp, i);
+        z     = pitch.toPitch();
+
+        angles[0] = x;
+        angles[2] = z;
     }
 }
 
@@ -5964,7 +6034,7 @@ void Vehicle::UpdatePassengerSlot(int iSlot)
         Passengers[iSlot].ent->avelocity = avelocity;
         Passengers[iSlot].ent->velocity  = velocity;
 
-        if (!Passengers[iSlot].ent->IsSubclassOfActor() || ((Actor *)Passengers[iSlot].ent.Pointer())->m_Enemy) {
+        if (!Passengers[iSlot].ent->IsSubclassOfActor() || !((Actor *)Passengers[iSlot].ent.Pointer())->m_Enemy) {
             Vector newAngles;
 
             MatrixToEulerAngles(orient.axis, newAngles);
@@ -6438,12 +6508,16 @@ void Vehicle::EventCanUse(Event *ev)
     VectorNormalize(vDir);
 
     if (fabs(GetAngleBetweenVectors2D(vForward, vDir)) > m_fMaxUseAngle) {
-        ev->AddInteger(1);
+        ev->AddInteger(false);
     } else {
-        ev->AddInteger(0);
+        ev->AddInteger(true);
     }
 }
 
+int Vehicle::GetProjectileHitsRemaining() const {
+    return m_iProjectileHitsRemaining;
+}
+
 /*
 ====================
 Vehicle::Archive
@@ -6463,6 +6537,7 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveFloat(&conesize);
     arc.ArchiveFloat(&maxtracedist);
     arc.ArchiveString(&weaponName);
+    arc.ArchiveString(&vehicleName);
     arc.ArchiveVector(&last_origin);
     arc.ArchiveVector(&seatangles);
     arc.ArchiveVector(&seatoffset);
@@ -6474,6 +6549,7 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveVector(&Corners[3]);
 
     arc.ArchiveBoolean(&drivable);
+    arc.ArchiveBoolean(&pathDrivable); // Added in 2.30
     arc.ArchiveBoolean(&locked);
     arc.ArchiveBoolean(&hasweapon);
     arc.ArchiveBoolean(&showweapon);
@@ -6481,14 +6557,19 @@ void Vehicle::Archive(Archiver& arc)
     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 = MAX_PASSENGERS - 1; i >= 0; i--) {
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
         Passengers[i].Archive(arc);
     }
 
-    for (int i = MAX_TURRETS - 1; i >= 0; i--) {
+    for (int i = 0; i < MAX_TURRETS; i++) {
         Turrets[i].Archive(arc);
     }
 
@@ -6708,7 +6789,19 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveBoolean(&m_bRemoveOnDeath);
     arc.ArchiveBoolean(&m_bStopEnabled);
     arc.ArchiveBoolean(&m_bEnableSkidding);
-    arc.ArchiveRaw(&vs, sizeof(vehicleState_t));
+
+    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);
@@ -6717,6 +6810,8 @@ void Vehicle::Archive(Archiver& arc)
     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);
@@ -6730,6 +6825,10 @@ void Vehicle::Archive(Archiver& arc)
     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);
 }
 
 /*
@@ -6805,11 +6904,6 @@ DrivableVehicle::DrivableVehicle
 */
 DrivableVehicle::DrivableVehicle()
 {
-    if (LoadingSavegame) {
-        // Archive function will setup all necessary data
-        return;
-    }
-
     AddWaitTill(STRING_DEATH);
 
     drivable = true;
@@ -6929,7 +7023,7 @@ void DrivableVehicle::Killed(Event *ev)
     if (name && strcmp(name, "")) {
         for (ent = G_FindTarget(NULL, name); ent; ent = G_FindTarget(ent, name)) {
             event = new Event(EV_Activate);
-            event->AddEntity(ent);
+            event->AddEntity(attacker);
             ent->ProcessEvent(event);
         }
     }
diff --git a/code/fgame/vehicle.h b/code/fgame/vehicle.h
index d27ea5f5..b8709df2 100644
--- a/code/fgame/vehicle.h
+++ b/code/fgame/vehicle.h
@@ -326,11 +326,6 @@ protected:
     virtual void VehicleStart(Event *ev);
     virtual void VehicleTouched(Event *ev);
     virtual void VehicleBlocked(Event *ev);
-    // Added in 2.30
-    //====
-    void SetProjectileVulnerable(Event *ev);
-    void DoProjectileVulnerability(Entity *pProjectile, Entity *pOwner, meansOfDeath_t meansOfDeath);
-    //====
     void         Think(void) override;
     void         Postthink(void) override;
     virtual void Drivable(Event *ev);
@@ -485,7 +480,7 @@ public:
     virtual qboolean ShowWeapon(void);
     Entity          *Driver(void);
     virtual qboolean IsDrivable(void);
-    void             Archive(Archiver            &arc) override;
+    void             Archive(Archiver& arc) override;
     str              GetSoundSet(void);
     virtual float    QuerySpeed(void);
     virtual int      QueryFreePassengerSlot(void);
@@ -503,7 +498,7 @@ public:
     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
+    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);
@@ -519,12 +514,15 @@ public:
     qboolean         isLocked(void);
     void             Lock(void);
     void             UnLock(void);
-    const str      & getName() const; // added in 2.0
+    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);
     //====
 };
 
@@ -535,7 +533,7 @@ public:
 
     DrivableVehicle(void);
 
-    virtual void Killed(Event *ev);
+    virtual void Killed(Event *ev) override;
 };
 
 class VehicleWheelsX4 : public DrivableVehicle
@@ -592,7 +590,7 @@ public:
     virtual void     CalculateOriginOffset() override;
     void             UpdateSound() override;
     //void             AttachDriverSlot(Event* ev) override;
-    void     AttachDriverSlot(int slot, Entity* ent, Vector vExitPosition) override;
+    void AttachDriverSlot(int slot, Entity *ent, Vector vExitPosition) override;
 };
 
 class VehicleHalfTrack : public DrivableVehicle
diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 7ed211fd..6bd57faa 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -340,7 +340,6 @@ void VehicleTurretGun::Think(void)
     UpdateSound();
     UpdateFireControl();
 
-    sentOwner = GetSentientOwner();
     if (sentOwner) {
         G_TouchTriggers(sentOwner);
         UpdateOwner(sentOwner);
@@ -371,6 +370,11 @@ void VehicleTurretGun::P_UserAim(usercmd_t *ucmd)
         return;
     }
 
+    if (!m_pVehicleOwner) {
+        // Added in OPM
+        return;
+    }
+
     if (!m_pVehicleOwner->IsSubclassOfVehicle()) {
         return;
     }
@@ -386,7 +390,9 @@ void VehicleTurretGun::P_UserAim(usercmd_t *ucmd)
         Entity *slotEnt;
 
         slotEnt = pVehicle->QueryTurretSlotEntity(newSlot);
-        if (slotEnt->IsSubclassOfVehicleTurretGun()) {
+        // slotEnt check:
+        //  Added in OPM
+        if (slotEnt && slotEnt->IsSubclassOfVehicleTurretGun()) {
             VehicleTurretGun *existing;
             Vector            newAng;
             bool              wasThisLocked, wasExistingLocked;
@@ -754,7 +760,7 @@ void VehicleTurretGun::EventDamage(Event *ev)
             break;
         }
 
-        DamageEvent(ev);
+        Entity::DamageEvent(ev);
         return;
     }
 
@@ -809,7 +815,8 @@ void VehicleTurretGun::UpdateSound(void)
 
     case STT_OFF_TRANS_MOVING:
         m_fNextSoundState = level.time;
-        m_eSoundState     = STT_OFF;
+        m_eSoundState     = STT_MOVING;
+        Sound(m_sSoundSet + "snd_move_start");
         break;
 
     case STT_MOVING:
@@ -823,6 +830,7 @@ void VehicleTurretGun::UpdateSound(void)
     case STT_MOVING_TRANS_OFF:
         m_fNextSoundState = level.time;
         m_eSoundState     = STT_OFF;
+        StopLoopSound();
         Sound(m_sSoundSet + "snd_move_stop");
         break;
 
@@ -949,7 +957,7 @@ void VehicleTurretGun::UpdateOwner(Sentient *pOwner)
 
 void VehicleTurretGun::TurretHasBeenMounted()
 {
-    m_fLastFireTime = level.time + m_fWarmupDelay + fire_delay[FIRE_PRIMARY];
+    m_fLastFireTime = (level.time + m_fWarmupDelay) - fire_delay[FIRE_PRIMARY];
     if (m_fWarmupDelay > 0.25) {
         Sound(m_sSoundSet + "snd_warmup");
     }
@@ -1029,6 +1037,18 @@ void VehicleTurretGun::AdjustReloadStatus()
         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);
     }
 }
@@ -1102,7 +1122,7 @@ void VehicleTurretGun::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec
             VectorCopy(position, vBarrelPos);
         }
 
-        delta      = viewer->GunTarget(position) - position;
+        delta      = viewer->GunTarget(false, position) - position;
         aim_angles = delta.toAngles();
 
         if (IsSubclassOfVehicleTurretGun()) {
@@ -1137,6 +1157,14 @@ void VehicleTurretGun::ApplyFireKickback(const Vector& org, float kickback)
         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;
@@ -1502,7 +1530,7 @@ void VehicleTurretGun::UpdateCollisionEntity()
         vec3_t axis[3];
         vec3_t mat[3];
 
-        AnglesToAxis(m_vLocalAngles, mat);
+        AnglesToAxis(m_vLocalAngles, axis);
         MatrixMultiply(axis, m_mBaseOrientation, mat);
         MatrixToEulerAngles(mat, newAngles);
     } else {
@@ -1666,6 +1694,10 @@ void VehicleTurretGun::EndRemoteControl()
     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.
@@ -1765,6 +1797,8 @@ Event EV_VTGP_LinkTurret
     "Sets the next turret in the link.",
     EV_NORMAL
 );
+
+// Added in 2.30
 Event EV_VTGP_SetSwitchThread
 (
     "setswitchthread",
@@ -1777,6 +1811,8 @@ Event EV_VTGP_SetSwitchThread
 
 CLASS_DECLARATION(VehicleTurretGun, VehicleTurretGunTandem, "VehicleTurretGunTandem") {
     {&EV_VTGP_LinkTurret,      &VehicleTurretGunTandem::EventLinkTurret     },
+
+    // Added in 2.30
     {&EV_VTGP_SetSwitchThread, &VehicleTurretGunTandem::EventSetSwitchThread},
     {NULL,                     NULL                                         }
 };
@@ -2039,7 +2075,7 @@ void VehicleTurretGunTandem::RemoteControl(usercmd_t *ucmd, Sentient *owner)
 
     vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
 
-    if (vNewCmdAng[0] || vNewCmdAng[1] || vNewCmdAng[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]);
@@ -2060,7 +2096,7 @@ void VehicleTurretGunTandem::RemoteControlSecondary(usercmd_t *ucmd, Sentient *o
 
     vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
 
-    if (vNewCmdAng[0] || vNewCmdAng[1] || vNewCmdAng[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]);
@@ -2106,10 +2142,16 @@ void VehicleTurretGunTandem::SwitchToLinkedTurret()
 
     if (m_Slot.ent) {
         pTurret = static_cast<VehicleTurretGunTandem*>(m_Slot.ent.Pointer());
-        m_SwitchLabel.Execute(pTurret, NULL);
+        // Added in 2.30
+        m_SwitchLabel.Execute(this, pTurret, NULL);
     } else {
         pTurret = m_PrimaryTurret;
-        m_PrimaryTurret->m_SwitchLabel.Execute(pTurret, NULL);
+        // 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);
@@ -2146,6 +2188,8 @@ void VehicleTurretGunTandem::Archive(Archiver& arc)
     arc.ArchiveSafePointer(&m_ActiveTurret);
     arc.ArchiveFloat(&m_fSwitchTimeRemaining);
     arc.ArchiveFloat(&m_fSwitchDelay);
+    // Added in 2.30
+    m_SwitchLabel.Archive(arc);
 }
 
 VehicleTurretGunTandem *VehicleTurretGunTandem::GetPrimaryTurret()
diff --git a/code/fgame/vehicleturret.h b/code/fgame/vehicleturret.h
index 617cbb65..97244137 100644
--- a/code/fgame/vehicleturret.h
+++ b/code/fgame/vehicleturret.h
@@ -160,6 +160,9 @@ public:
     void Archive(Archiver& arc) override;
 };
 
+//
+// Added in 2.0
+//
 class VehicleTurretGunTandem : public VehicleTurretGun
 {
 private:
@@ -179,7 +182,7 @@ public:
     ~VehicleTurretGunTandem();
 
     virtual void EventLinkTurret(Event *ev);
-    virtual void EventSetSwitchThread(Event *ev);
+    virtual void EventSetSwitchThread(Event *ev); // Added in 2.30
     virtual void AttachLinkedTurret(Entity *ent);
     virtual void UpdateLinkedTurret();
     virtual void OpenSlotsByModel();
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 f6921757..2d7de504 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -195,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",
@@ -205,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",
@@ -216,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",
@@ -350,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",
@@ -358,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",
@@ -654,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",
@@ -870,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           },
@@ -966,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                            }
 };
 
@@ -1133,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;
@@ -1202,15 +1249,9 @@ void Weapon::Delete(void)
 {
     if (g_iInThinks) {
         DetachGun();
-
-        if (owner) {
-            RemoveFromOwner();
-        }
-
-        PostEvent(EV_Remove, 0);
-    } else {
-        delete this;
     }
+
+    Item::Delete();
 }
 
 //======================
@@ -1282,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;
     }
 
@@ -1295,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;
     }
 
@@ -1344,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;
     }
 
@@ -1357,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;
     }
 
@@ -1604,7 +1645,6 @@ void Weapon::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t forwar
     int           i;
 
     owner = (Player *)this->owner.Pointer();
-    assert(owner);
 
     // We should always have an owner
     if (!owner) {
@@ -1815,7 +1855,7 @@ 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);
@@ -1834,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;
@@ -1855,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 {
@@ -2003,11 +2041,17 @@ void Weapon::Shoot(Event *ev)
             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) {
@@ -2334,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;
             }
@@ -2393,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;
 }
@@ -2728,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;
     }
 
@@ -2740,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;
     }
 
@@ -2773,10 +2824,7 @@ void Weapon::GiveStartingAmmoToOwner(Event *ev)
     int mode;
     int i;
 
-    assert(owner);
-
     if (!owner) {
-        warning("Weapon::GiveStartingAmmoToOwner", "Owner not found\n");
         return;
     }
 
@@ -2888,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 {
@@ -2977,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 {
@@ -3028,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;
 }
 
 //======================
@@ -3067,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);
 }
 
 //======================
@@ -3091,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) {
@@ -3129,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;
 }
 
 //======================
@@ -3305,6 +3375,10 @@ void Weapon::DoneReloading(Event *ev)
 {
     SetShouldReload(qfalse);
     weaponstate = WEAPON_READY;
+
+    // Added in OPM
+    //  Set to idle when done reloading
+    SetWeaponIdleAnim();
 }
 
 //======================
@@ -3524,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;
     }
 
@@ -3536,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;
     }
 
@@ -3617,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;
     }
 
@@ -3631,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;
     }
 
@@ -3670,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;
     }
 
@@ -3692,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;
     }
 
@@ -3721,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;
     }
 
@@ -3734,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;
     }
 
@@ -3755,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;
     }
 
@@ -3768,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;
     }
 
@@ -3781,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;
     }
 
@@ -3800,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;
     }
 
@@ -3819,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;
     }
 
@@ -3831,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;
     }
 
@@ -3844,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;
     }
 
@@ -3860,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;
     }
 
@@ -3920,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;
     }
 
@@ -4149,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;
     }
@@ -4220,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;
     }
 
@@ -4232,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;
     }
 
@@ -4516,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
 //======================
@@ -4523,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 e5f223b9..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
@@ -399,12 +400,12 @@ public:
     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);
-    float    FireDelay(firemode_t mode);
-    void     SetFireDelay(Event *ev);
-    void     SetDMFireDelay(Event *ev);
+    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);
@@ -454,8 +455,16 @@ public:
     //
     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]);
@@ -620,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 9b8a7229..9857ac24 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -73,7 +73,7 @@ Event EV_Turret_P_SetPlayerUsable
     EV_DEFAULT,
     "i",
     "state",
-    "Sets wether the turret can be used by players. 0 means no, 1 means yes.",
+    "Sets whether the turret can be used by players. 0 means no, 1 means yes.",
     EV_NORMAL
 );
 Event EV_Turret_AI_SetAimTarget
@@ -309,7 +309,7 @@ Event EV_Turret_SetUsable
     EV_DEFAULT,
     "i",
     "state",
-    "Sets wether the turret can be used as a weapon. 0 means no, 1 means yes.",
+    "Sets whether the turret can be used as a weapon. 0 means no, 1 means yes.",
     EV_NORMAL
 );
 Event EV_Turret_AI_SetBulletSpread
@@ -573,7 +573,12 @@ void TurretGun::ThinkIdle(void)
 
     m_fIdlePitchSpeed -= level.frametime * 300.0f;
 
-    vNewAngles = Vector(angles[0] + level.frametime * m_fIdlePitchSpeed, angles[1], angles[2]);
+    vNewAngles = Vector(
+        Q_max(angles[0] + level.frametime * m_fIdlePitchSpeed, m_fMaxIdlePitch),
+        angles[1],
+        angles[2]
+    );
+
     vNewAngles.AngleVectorsLeft(&vDir);
     vEnd = origin + vDir * m_vIdleCheckOffset[0];
 
@@ -643,14 +648,12 @@ void TurretGun::AI_SetTargetAngles(vec3_t vTargAngles, float speed)
         vTargAngles[1] = m_fStartYaw + m_fMaxYawOffset;
     } else if (fDiff < -m_fMaxYawOffset) {
         vTargAngles[1] = m_fStartYaw - m_fMaxYawOffset;
-    } else {
-        vTargAngles[1] = m_fStartYaw + fDiff;
     }
 
     fYawDiff   = AngleSubtract(vTargAngles[1], angles[1]);
     fPitchDiff = AngleSubtract(vTargAngles[0], angles[0]);
 
-    if (fabs(fPitchDiff) == 0) {
+    if (speed == 0) {
         fTurnYawSpeed   = m_fTurnSpeed * level.frametime;
         fTurnPitchSpeed = m_fAIPitchSpeed * level.frametime;
     } else {
@@ -681,10 +684,10 @@ void TurretGun::AI_SetTargetAngles(vec3_t vTargAngles, float speed)
 
     if (fabs(fYawDiff) < fTurnYawSpeed) {
         angles[1] = vTargAngles[1];
-    } else if (fPitchDiff > 0) {
-        angles[1] += fYawDiff;
+    } else if (fYawDiff > 0) {
+        angles[1] += fTurnYawSpeed;
     } else {
-        angles[1] -= fYawDiff;
+        angles[1] -= fTurnYawSpeed;
     }
 
     setAngles(angles);
@@ -775,7 +778,7 @@ bool TurretGun::AI_CanTarget(const vec3_t pos)
     yawCap = AngleSubtract(vAngles[1], m_fStartYaw);
     if (yawCap > m_fMaxYawOffset) {
         return false;
-    } else if (yawCap < m_fMaxYawOffset) {
+    } else if (yawCap < -m_fMaxYawOffset) {
         return false;
     }
 
@@ -885,7 +888,7 @@ void TurretGun::P_ThinkActive(void)
         m_pUserCamera->setAngles(vAngles);
         m_pUserCamera->SetPositionOffset(m_vViewOffset);
 
-        owner->client->ps.camera_flags |= CF_CAMERA_ANGLES_ALLOWOFFSET;
+        owner->client->ps.camera_flags |= CF_CAMERA_ANGLES_TURRETMODE;
 
         Player *player = (Player *)owner.Pointer();
 
@@ -1238,6 +1241,37 @@ void TurretGun::AI_DoAiming()
 
 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) {
@@ -1261,16 +1295,22 @@ void TurretGun::AI_DoFiring()
 
 void TurretGun::AI_ThinkActive()
 {
+    if (!g_ai->integer) {
+        return;
+    }
+
     AI_DoAiming();
     AI_DoFiring();
 }
 
 void TurretGun::Think(void)
 {
-    if (owner || (!m_bHadOwner && aim_target)) {
+    if (!owner && (m_bHadOwner || !aim_target)) {
+        ThinkIdle();
+    } else if (owner && owner->IsSubclassOfPlayer()) {
         P_ThinkActive();
     } else {
-        ThinkIdle();
+        AI_ThinkActive();
     }
 }
 
@@ -1280,7 +1320,7 @@ void TurretGun::P_UserAim(usercmd_t *ucmd)
 
     vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
 
-    if (vNewCmdAng[0] || vNewCmdAng[1] || vNewCmdAng[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]);
@@ -1288,7 +1328,7 @@ void TurretGun::P_UserAim(usercmd_t *ucmd)
 
     m_vUserLastCmdAng = vNewCmdAng;
 
-    if ((ucmd->buttons & BUTTON_ATTACKLEFT) || (ucmd->buttons & BUTTON_ATTACKRIGHT)) {
+    if (ucmd->buttons & BUTTON_ATTACKLEFT) {
         if (m_iFiring == 0) {
             m_iFiring = 1;
         }
@@ -1460,6 +1500,10 @@ void TurretGun::P_TurretUsed(Player *player)
         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;
@@ -1607,7 +1651,7 @@ void TurretGun::P_EventDoJitter(Event *ev)
 
 void TurretGun::AI_EventBurstFireSettings(Event *ev)
 {
-    if (ev->NumArgs() <= 3) {
+    if (ev->NumArgs() < 4) {
         return;
     }
 
@@ -1835,6 +1879,14 @@ void TurretGun::Archive(Archiver& arc)
     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;
+    }
 }
 
 qboolean TurretGun::AI_SetWeaponAnim(const char *anim, Event *ev)
@@ -1910,11 +1962,18 @@ void TurretGun::StopWeaponAnim(void)
 
 float TurretGun::FireDelay(firemode_t mode)
 {
-    if (owner && owner->IsSubclassOfPlayer()) {
-        return 0.06f;
-    } else {
-        return Weapon::FireDelay(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)
@@ -2089,7 +2148,7 @@ void TurretGun::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t for
             VectorCopy(position, vBarrelPos);
         }
 
-        delta      = viewer->GunTarget(position) - position;
+        delta      = viewer->GunTarget(false, position) - position;
         aim_angles = delta.toAngles();
 
         if (IsSubclassOfVehicleTurretGun()) {
diff --git a/code/fgame/weapturret.h b/code/fgame/weapturret.h
index 1b200081..6646dbf9 100644
--- a/code/fgame/weapturret.h
+++ b/code/fgame/weapturret.h
@@ -200,8 +200,8 @@ public:
     void     StopWeaponAnim() override;
 
     bool          AI_CanTarget(const vec3_t org);
-    virtual float FireDelay(firemode_t mode);
-    virtual void  SetFireDelay(Event *ev); // added in 2.0
+    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
diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 166e74d9..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.
 
@@ -168,7 +168,7 @@ qboolean MeleeAttack(
 
                 victim->Damage(attacker, attacker, damage, pos, dir, vec_zero, knockback, 0, means_of_death);
 
-                if (victim->edict->r.contents & CONTENTS_SOLID) {
+                if (!(victim->edict->r.contents & CONTENTS_CLAYPIDGEON)) {
                     victim->Sound("pistol_hit");
                 }
             }
@@ -602,6 +602,7 @@ Projectile::Projectile()
         return;
     }
 
+    minlife              = 0;
     m_beam               = NULL;
     speed                = 0;
     minspeed             = 0;
@@ -621,19 +622,22 @@ Projectile::Projectile()
     impactmarkradius     = 10;
     charge_fraction      = 1.0;
     target               = NULL;
+    addownervelocity     = false;
     fDrunk               = 0;
     fDrunkRate           = 0;
-    m_iSmashThroughGlass = 0;
-    addownervelocity     = qtrue;
     can_hit_owner        = false;
     remove_when_stopped  = false;
     m_bExplodeOnTouch    = false;
     m_bHurtOwnerOnly     = false;
+    m_iSmashThroughGlass = 0;
     takedamage           = DAMAGE_NO;
     owner                = ENTITYNUM_NONE;
     edict->r.ownerNum    = ENTITYNUM_NONE;
-    m_bArcToTarget       = false;
-    m_bDieInWater        = false;
+
+    // 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);
@@ -643,7 +647,9 @@ Projectile::Projectile()
     //
     flags |= FL_TOUCH_TRIGGERS;
 
-    m_iTeam           = 0;
+    m_iTeam = 0;
+
+    // Added in OPM
     m_bHadPlayerOwner = false;
 }
 
@@ -892,11 +898,13 @@ void Projectile::Explode(Event *ev)
         // 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);
     }
@@ -932,6 +940,13 @@ void Projectile::SetSmashThroughGlass(Event *ev)
 }
 
 void Projectile::SmashThroughGlassThink(Event *ev)
+{
+    SmashThroughGlassThink();
+
+    PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
+}
+
+void Projectile::SmashThroughGlassThink()
 {
     if (velocity.length() > m_iSmashThroughGlass) {
         Vector  vEnd;
@@ -953,8 +968,6 @@ void Projectile::SmashThroughGlassThink(Event *ev)
             }
         }
     }
-
-    PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
 }
 
 void Projectile::BeamCommand(Event *ev)
@@ -1008,7 +1021,13 @@ void Projectile::SetBounceSoundWater(Event *ev)
 
 void Projectile::SetChargeLife(Event *ev)
 {
-    projFlags |= P_CHARGE_LIFE;
+    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)
@@ -1023,7 +1042,13 @@ void Projectile::SetFuse(Event *ev)
 void Projectile::SetMinLife(Event *ev)
 {
     minlife = ev->GetFloat(1);
-    projFlags |= P_CHARGE_LIFE;
+    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::SetLife(Event *ev)
@@ -1144,6 +1169,7 @@ void Projectile::Touch(Event *ev)
     // Bouncy Projectile
     if ((projFlags & P_BOUNCE_TOUCH)) {
         str snd;
+        int flags;
 
         if (level.time - fLastBounceTime < 0.1f) {
             fLastBounceTime = level.time;
@@ -1155,49 +1181,60 @@ void Projectile::Touch(Event *ev)
             if (bouncesound_water.length()) {
                 this->Sound(bouncesound_water, CHAN_BODY);
             }
-        } else {
-            if (bouncesound_metal.length()) {
-                snd = bouncesound_metal;
-            } else if (bouncesound_hard.length()) {
-                snd = bouncesound_hard;
-            } else {
-                snd = bouncesound;
+
+            //
+            // Added in 2.30
+            //
+            if (m_bDieInWater) {
+                PostEvent(EV_Remove, 0.5f);
             }
 
-            int flags = level.impact_trace.surfaceFlags;
+            return;
+        }
 
-            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_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_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 (bouncesound.length()) {
-                    Sound(bouncesound, CHAN_BODY);
-                }
+        if (bouncesound_metal.length()) {
+            snd = bouncesound_metal;
+        } else if (bouncesound_hard.length()) {
+            snd = bouncesound_hard;
+        } else {
+            snd = bouncesound;
+        }
+
+        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_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_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 (bouncesound.length()) {
+                Sound(bouncesound, CHAN_BODY);
             }
         }
 
         BroadcastAIEvent(AI_EVENT_WEAPON_IMPACT);
+        fLastBounceTime = level.time;
+
         return;
     }
 
@@ -1222,21 +1259,21 @@ void Projectile::Touch(Event *ev)
         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 (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 (weap->IsSubclassOfVehicleTurretGun()) {
+                    VehicleTurretGun *t = (VehicleTurretGun *)weap.Pointer();
+                    Player           *p = (Player *)t->GetRemoteOwner().Pointer();
 
-                if (p && p->IsSubclassOfPlayer()) {
-                    p->m_iNumHits++;
-                    p->m_iNumTorsoShots++;
+                    if (p && p->IsSubclassOfPlayer()) {
+                        p->m_iNumHits++;
+                        p->m_iNumTorsoShots++;
+                    }
                 }
             }
         }
@@ -1264,6 +1301,33 @@ void Projectile::Touch(Event *ev)
     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)
@@ -1306,7 +1370,7 @@ void Projectile::SetOwner(Entity *owner)
         if (owner->IsSubclassOfPlayer()) {
             Player *p = (Player *)owner;
             m_iTeam   = p->GetTeam();
-			// Added in OPM
+            // Added in OPM
             //  this was added to prevent glitches, like when the player
             //  disconnects or when the player spectates
             m_bHadPlayerOwner = true;
@@ -1493,6 +1557,11 @@ Explosion::Explosion()
         return;
     }
 
+    flash_r            = 0;
+    flash_g            = 0;
+    flash_b            = 0;
+    flash_a            = 0;
+    flash_radius       = 0;
     radius             = 0;
     constant_damage    = false;
     damage_every_frame = false;
@@ -1804,7 +1873,7 @@ void PlaceLandmine(const Vector& origin, Entity *owner, const str& model, Weapon
             weap->m_iNumShotsFired++;
 
             if (owner && owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
-                Player* p = static_cast<Player*>(owner);
+                Player *p = static_cast<Player *>(owner);
                 p->m_iNumShotsFired++;
             }
         }
@@ -1828,6 +1897,11 @@ Projectile *ProjectileAttack(
     }
 
     args.setArg("model", projectileModel);
+    // Added in 2.0
+    //  Set the projectile targetname
+    //  so they can be managed from scripts
+    args.setArg("targetname", "projectile");
+
     obj = (Entity *)args.Spawn();
 
     if (!obj) {
@@ -1849,9 +1923,9 @@ Projectile *ProjectileAttack(
     proj->setMoveType(MOVETYPE_BOUNCE);
     proj->ProcessInitCommands();
     proj->SetOwner(owner);
-    proj->edict->r.ownerNum = owner->entnum;
     proj->angles            = dir.toAngles();
     proj->charge_fraction   = fraction;
+    proj->weap              = weap;
 
     if (!real_speed) {
         if (proj->projFlags & P_CHARGE_SPEED) {
@@ -2072,6 +2146,7 @@ float BulletAttack(
 {
     Vector  vDir;
     Vector  vTmpEnd;
+    Vector  vOldTmpEnd;
     Vector  vTraceStart;
     Vector  vTraceEnd;
     int     i;
@@ -2085,7 +2160,7 @@ float BulletAttack(
     qboolean bBulletDone;
     qboolean bThroughThing;
     int      iContinueCount;
-    float    vEndArray[64][3];
+    vec3_t   vEndArray[64];
     int      iTracerCount = 0;
     int      iNumHit;
     int      lastSurfaceFlags;
@@ -2133,12 +2208,15 @@ float BulletAttack(
             iTravelDist += MAX_TRAVEL_DIST;
             vTraceStart = start;
             vTraceEnd   = start + vDir * iTravelDist;
+            vOldTmpEnd  = vTraceStart;
 
             memset(&trace, 0, sizeof(trace_t));
 
             oldfrac = -1;
 
             while (trace.fraction < 1.0f) {
+                Vector vDeltaTrace;
+
                 trace = G_Trace(
                     vTraceStart, vec_zero, vec_zero, vTraceEnd, newowner, MASK_SHOT_TRIG, false, "BulletAttack", true
                 );
@@ -2194,6 +2272,11 @@ float BulletAttack(
                     }
 
                     newdamage -= damage * bulletdist * throughThingFrac;
+
+                    if (g_showbullettrace->integer) {
+                        gi.Printf("%.2f\n", newdamage);
+                    }
+
                     if (newdamage < 1.f) {
                         vTmpEnd        = vTraceStart + vDir * -4;
                         trace.fraction = 1.f;
@@ -2239,10 +2322,10 @@ float BulletAttack(
                     ent = NULL;
                 }
 
-                if (ent && ent != world && ent != newowner) {
+                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++;
@@ -2253,7 +2336,7 @@ float BulletAttack(
 
                         ent->Damage(
                             world,
-                            newowner,
+                            owner,
                             newdamage,
                             trace.endpos,
                             dir,
@@ -2272,16 +2355,16 @@ float BulletAttack(
                     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->IsSubclassOfPlayer()) {
+                        } else if (trace.location >= 0 && ent->IsSubclassOfSentient()) {
                             gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_8);
+                            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]);
@@ -2290,7 +2373,7 @@ float BulletAttack(
                             gi.MSG_EndCGM();
                         } else if (ent->edict->r.contents & CONTENTS_SOLID) {
                             gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_7);
+                            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]);
@@ -2300,7 +2383,7 @@ float BulletAttack(
                         }
                     } 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]);
@@ -2313,11 +2396,13 @@ 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)
+                        || (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) {
@@ -2341,7 +2426,7 @@ float BulletAttack(
                                         VectorAdd(tracethrough.endpos, vTmpEnd, tracethrough.endpos);
                                     }
                                 } else {
-                                    trace.fraction = 1.f;
+                                    trace.fraction = 1;
                                     bBulletDone    = qtrue;
 
                                     if (g_showbullettrace->integer) {
@@ -2374,16 +2459,27 @@ float BulletAttack(
                             iContinueCount++;
                         }
                     } else {
-                        trace.fraction = 1.f;
+                        trace.fraction = 1;
                         bBulletDone    = qtrue;
                     }
-
-                    if (oldfrac != trace.fraction) {
-                        oldfrac = trace.fraction;
-                    } else {
-                        trace.fraction = 1.f;
-                    }
                 }
+
+                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;
             }
         }
 
@@ -2399,7 +2495,7 @@ float BulletAttack(
             );
         }
 
-        VectorCopy(vTraceEnd, vEndArray[i]);
+        VectorCopy(vTmpEnd, vEndArray[i]);
 
         if (iTracerFrequency && piTracerCount) {
             (*piTracerCount)++;
@@ -2428,25 +2524,25 @@ float BulletAttack(
         }
     }
 
-    gi.SetBroadcastVisible(start, trace.endpos);
+    gi.SetBroadcastVisible(start, vEndArray[0]);
 
     if (count == 1) {
         if (iTracerCount) {
-            gi.MSG_StartCGM(CGM_BULLET_1);
+            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_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_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) {
@@ -2463,7 +2559,7 @@ float BulletAttack(
         }
     } else {
         if (iTracerCount) {
-            gi.MSG_StartCGM(CGM_BULLET_3);
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_3));
 
             gi.MSG_WriteCoord(vBarrel[0]);
             gi.MSG_WriteCoord(vBarrel[1]);
@@ -2475,7 +2571,7 @@ float BulletAttack(
 
             gi.MSG_WriteBits(Q_min(iTracerCount, 63), 6);
         } else {
-            gi.MSG_StartCGM(CGM_BULLET_4);
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_4));
         }
 
         gi.MSG_WriteCoord(start[0]);
@@ -2487,8 +2583,12 @@ float BulletAttack(
             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);
             }
         }
 
@@ -2574,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);
             }
         }
 
@@ -2585,30 +2689,37 @@ void FakeBulletAttack(
 
 void ClickItemAttack(Vector vStart, Vector vForward, float fRange, Entity *pOwner)
 {
+    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);
+        //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);
     }
 
-    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);
-    } 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")) {
             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)
@@ -2692,7 +2803,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
 
     // Calc the life of the projectile
     if (proj->projFlags & P_CHARGE_LIFE) {
-        if (g_gametype->integer && proj->dmlife) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife;
         } else {
             newlife = proj->life;
@@ -2702,7 +2813,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
             newlife = proj->minlife;
         }
     } else {
-        if (g_gametype->integer && proj->dmlife) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife;
         } else {
             newlife = proj->life;
@@ -2715,7 +2826,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
 
     proj->NewAnim("idle");
 
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         if (weap) {
             weap->m_iNumShotsFired++;
             if (owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
@@ -2845,10 +2956,10 @@ void ExplosionAttack(
             }
 
             // Remove explosion after the life has expired
-            if (explosion->life || (g_gametype->integer && explosion->dmlife)) {
+            if (explosion->life || (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife)) {
                 ev = new Event(EV_Remove);
 
-                if (g_gametype->integer && explosion->dmlife) {
+                if (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife) {
                     explosion->PostEvent(ev, explosion->dmlife);
                 } else {
                     explosion->PostEvent(ev, explosion->life);
diff --git a/code/fgame/weaputils.h b/code/fgame/weaputils.h
index f854c412..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 );
@@ -144,7 +151,7 @@ public:
 	//
 	// Added in OPM
 	//
-	bool			CheckTeams( void );
+	bool			CheckTeams(void);
 };
 
 inline void Projectile::SetMartyr(int entnum)
@@ -361,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 c0ce66e0..b485987c 100644
--- a/code/fgame/windows.cpp
+++ b/code/fgame/windows.cpp
@@ -55,6 +55,16 @@ CLASS_DECLARATION(Entity, WindowObject, "func_window") {
 
 WindowObject::WindowObject()
 {
+    if (LoadingSavegame) {
+        return;
+    }
+
+    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);
@@ -72,24 +82,22 @@ void WindowObject::WindowSetup(Event *ev)
 {
     Entity *pEnt;
 
+    setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_BSP);
+    setContents(CONTENTS_TRIGGER);
 
     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;
 
+            // Don't keep the original entity
             pEnt->PostEvent(EV_Remove, 0);
         }
     }
-
-    takedamage = DAMAGE_YES;
-
-    if (health <= 0.1f) {
-        health = 100.0f;
-    }
 }
 
 void WindowObject::WindowDebrisType(Event *ev)
@@ -118,7 +126,7 @@ void WindowObject::WindowDamaged(Event *ev)
         iDamage *= 2;
     } else if (iMeansOfDeath == MOD_EXPLOSION) {
         // instant break
-        iDamage = health;
+        iDamage *= 10;
     }
 
     health -= iDamage;
@@ -143,7 +151,8 @@ void WindowObject::WindowKilled(Event *ev)
     hideModel();
     takedamage = DAMAGE_NO;
 
-    vCenter = origin + mins + maxs;
+    vCenter = (mins + maxs) * 0.5;
+    vCenter += origin;
 
     gi.SetBroadcastVisible(vCenter, vCenter);
     gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_WINDOW_DEBRIS));
diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index cd677728..cbe476fc 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -627,6 +627,12 @@ World::World()
     m_fNorth = 0;
 }
 
+World::~World()
+{
+    world_dying = false;
+    FreeTargetList();
+}
+
 void World::UpdateConfigStrings(void)
 {
     //
@@ -920,16 +926,17 @@ void World::GetRenderTerrain(Event *ev)
 void World::SetRenderTerrain(Event *ev)
 {
     render_terrain = ev->GetInteger(1);
+    UpdateFog();
 }
 
 void World::GetSkyboxSpeed(Event *ev)
 {
-    ev->AddInteger(skybox_speed);
+    ev->AddFloat(skybox_speed);
 }
 
 void World::SetSkyboxSpeed(Event *ev)
 {
-    skybox_speed = ev->GetInteger(1);
+    skybox_speed = ev->GetFloat(1);
 }
 
 void World::SetSkyAlpha(Event *ev)
@@ -993,24 +1000,23 @@ void World::SetNorthYaw(Event *ev)
     m_fNorth = anglemod(ev->GetFloat(1));
 }
 
-SimpleEntity *World::GetTarget(str targetname, bool quiet)
+Listener *World::GetTarget(str targetname, bool quiet)
 {
-    return GetTarget(Director.AddString(targetname), quiet);
-}
+    TargetList *targetList = GetTargetList(targetname);
 
-SimpleEntity *World::GetTarget(const_str targetname, bool quiet)
-{
-    ConSimple *list = GetTargetList(targetname);
+    if (!targetList) {
+        return NULL;
+    }
 
-    if (list->NumObjects() == 1) {
-        return list->ObjectAt(1);
-    } else if (list->NumObjects() > 1) {
+    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.",
-                list->NumObjects(),
-                Director.GetString(targetname).c_str()
+                targetList->list.NumObjects(),
+                targetname.c_str()
             );
         }
     }
@@ -1018,79 +1024,101 @@ SimpleEntity *World::GetTarget(const_str targetname, bool quiet)
     return NULL;
 }
 
-SimpleEntity *World::GetScriptTarget(str targetname)
+Listener *World::GetScriptTarget(str targetname)
 {
-    return GetScriptTarget(Director.AddString(targetname));
-}
+    TargetList *targetList = GetTargetList(targetname);
 
-SimpleEntity *World::GetScriptTarget(const_str targetname)
-{
-    ConSimple *list = GetTargetList(targetname);
+    if (!targetList) {
+        return NULL;
+    }
 
-    if (list->NumObjects() == 1) {
-        return list->ObjectAt(1);
-    } else if (list->NumObjects() > 1) {
+    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.",
-            list->NumObjects(),
-            Director.GetString(targetname).c_str()
+            targetList->list.NumObjects(),
+            targetname.c_str()
         );
     }
 
     return NULL;
 }
 
-ConSimple *World::GetExistingTargetList(const str& targetname)
+TargetList *World::GetExistingTargetList(const str& targetname)
 {
-    return GetExistingTargetList(Director.AddString(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;
 }
 
-ConSimple *World::GetExistingTargetList(const_str targetname)
+TargetList *World::GetTargetList(str& targetname)
 {
-    return m_targetList.findKeyValue(targetname);
-}
+    TargetList *targetList;
+    int         i;
 
-ConSimple *World::GetTargetList(str& targetname)
-{
-    return GetTargetList(Director.AddString(targetname));
-}
+    if (!targetname.length()) {
+        // Fixed in OPM
+        //  Don't create a targetlist for the empty target name
+        return NULL;
+    }
 
-ConSimple *World::GetTargetList(const_str targetname)
-{
-    return &m_targetList.addKeyValue(targetname);
+    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)
 {
-    str targetname = ent->TargetName();
+    TargetList *targetList = GetTargetList(ent->TargetName());
 
-    if (!targetname.length()) {
+    if (!targetList) {
         return;
     }
 
-    ConSimple *list = GetTargetList(targetname);
-
-    list->AddObject(ent);
+    targetList->AddEntity(ent);
 }
 
 void World::AddTargetEntityAt(SimpleEntity *ent, int index)
 {
-    str targetname = ent->TargetName();
+    TargetList *targetList = GetTargetList(ent->TargetName());
 
-    if (!targetname.length()) {
+    if (!targetList || !index) {
         return;
     }
 
-    ConSimple *list = GetTargetList(targetname);
-
-    list->AddObjectAt(index, ent);
+    targetList->AddEntityAt(ent, index);
 }
 
 int World::GetTargetnameIndex(SimpleEntity *ent)
 {
-    ConSimple *list = GetTargetList(ent->TargetName());
+    TargetList *targetList = GetTargetList(ent->TargetName());
 
-    return list->IndexOfObject(ent);
+    if (!targetList) {
+        return 0;
+    }
+
+    return targetList->GetEntityIndex(ent);
 }
 
 void World::RemoveTargetEntity(SimpleEntity *ent)
@@ -1099,53 +1127,72 @@ void World::RemoveTargetEntity(SimpleEntity *ent)
         return;
     }
 
-    const str targetname = ent->TargetName();
-
-    if (!targetname.length()) {
+    TargetList *targetList = GetExistingTargetList(ent->TargetName());
+    if (!targetList) {
         return;
     }
 
-    ConSimple *list = GetExistingTargetList(targetname);
-
-    if (list) {
-        list->RemoveObject(ent);
-
-        if (list->NumObjects() <= 0) {
-            m_targetList.remove(Director.AddString(targetname));
-        }
-    }
+    targetList->RemoveEntity(ent);
 }
 
 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 {
+    TargetList *targetList = GetExistingTargetList(targetname);
+    if (!targetList) {
         return NULL;
     }
+
+    return targetList->GetNextEntity(ent);
 }
 
 void World::FreeTargetList()
 {
-    m_targetList.clear();
+    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);
@@ -1197,3 +1244,57 @@ bool WithinFarplaneDistance(const Vector& org)
 
     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
index 3e1a05f9..b7ced3c8 100644
--- a/code/fgame/worldspawn.h
+++ b/code/fgame/worldspawn.h
@@ -39,10 +39,66 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 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
 {
-    con_set<const_str, ConSimple> m_targetList; // moh could have used con_set instead of TargetList
-    qboolean                      world_dying;
+    Container<TargetList*> m_targetListContainer;
+    qboolean world_dying;
 
 public:
     // farplane variables
@@ -80,6 +136,7 @@ public:
     CLASS_PROTOTYPE(World);
 
     World();
+    ~World();
 
     void AddTargetEntity(SimpleEntity *ent);
     void AddTargetEntityAt(SimpleEntity *ent, int index);
@@ -88,17 +145,12 @@ public:
     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);
+    Listener     *GetScriptTarget(str targetname);
+    Listener     *GetTarget(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);
+    TargetList *GetExistingTargetList(const str& targetname);
+    TargetList *GetTargetList(str& targetname);
 
     void SetFarClipOverride(Event *ev);
     void SetFarPlaneColorOverride(Event *ev);
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/common/gsPlatformUtil.c b/code/gamespy/common/gsPlatformUtil.c
index c341e94a..69c81e0c 100644
--- a/code/gamespy/common/gsPlatformUtil.c
+++ b/code/gamespy/common/gsPlatformUtil.c
@@ -439,7 +439,7 @@ void SocketStartUp()
 void SocketShutDown()
 {
 #if defined(_WIN32)
-//	WSACleanup();
+	WSACleanup();
 	#if defined(_X360)
 		XNetCleanup();
 	#endif
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 298f8338..b278af78 100644
--- a/code/gamespy/goaceng.h
+++ b/code/gamespy/goaceng.h
@@ -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 58a245a5..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,18 +22,24 @@ 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 qboolean gcdValid = qfalse;
+static char        gamemode[128];
+static qboolean    gcdInitialized = qfalse;
+static qboolean    gcdValid       = qfalse;
+static qboolean    gsRunning      = qfalse;
 extern GSIACResult __GSIACResult;
 
+cvar_t *net_ip           = NULL;
+cvar_t *net_gamespy_port = NULL;
+
 static const char *SECRET_GS_KEYS[] =
 {
     "M5Fdwc",
@@ -55,25 +61,35 @@ static const char *GS_GAME_NAME[] =
     "mohaab"
 };
 
+static const char *GS_GAME_NAME_DEMO[] =
+{
+    "mohaa",
+    "mohaas",
+    "mohaabd"
+};
+
 static const char *GS_GAME_VERSION[] =
 {
-    TARGET_GAME_VERSION_MOH,
-    TARGET_GAME_VERSION_MOHTA,
-    TARGET_GAME_VERSION_MOHTT,
+    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,
@@ -81,35 +97,51 @@ 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) {
-    return GS_GAME_VERSION[index];
+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() {
+const char *GS_GetCurrentGameVersion()
+{
     return GS_GetGameVersion(com_target_game->integer);
 }
 
@@ -130,7 +162,6 @@ static void basic_callback(char *outbuf, int maxlen, void *userdata)
 {
     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) {
@@ -191,42 +222,54 @@ 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];
+
+    outbuf[0] = 0;
 
     if (!svs.clients) {
         return;
     }
 
-    for (i = 0; i < svs.iNumClients; i++) {
-        if (svs.clients[i].state == CS_FREE) {
+    for (i = 0, index = 0; i < svs.iNumClients; i++) {
+        cl = &svs.clients[i];
+
+        if (cl->state == CS_FREE) {
             // ignore inactive clients
             continue;
         }
 
-        playerState_t *ps = SV_GameClientNum(i);
+        ps = SV_GameClientNum(i);
 
-        Com_sprintf(
+        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++;
     }
 }
 
@@ -263,6 +306,12 @@ void SV_ShutdownGamespy()
         return;
     }
 
+    if (!gsRunning) {
+        // Added in OPM
+        //  Gamespy is not running
+        return;
+    }
+
     strcpy(gamemode, "exiting");
 
     if (gcdInitialized) {
@@ -272,12 +321,12 @@ void SV_ShutdownGamespy()
 
     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;
@@ -339,10 +388,12 @@ qboolean SV_InitGamespy()
         gcdInitialized = qtrue;
     }
 
+    gsRunning = qtrue;
+
     return qtrue;
 }
 
-void SV_CreateGamespyChallenge(char* challenge)
+void SV_CreateGamespyChallenge(char *challenge)
 {
     int i;
 
@@ -352,10 +403,10 @@ void SV_CreateGamespyChallenge(char* challenge)
     challenge[i] = 0;
 }
 
-challenge_t* FindChallengeById(int gameid)
+challenge_t *FindChallengeById(int gameid)
 {
-    challenge_t* challenge;
-    int i;
+    challenge_t *challenge;
+    int          i;
 
     for (i = 0; i < MAX_CHALLENGES; i++) {
         challenge = &svs.challenges[i];
@@ -367,61 +418,63 @@ challenge_t* FindChallengeById(int gameid)
     return NULL;
 }
 
-void AuthenticateCallback(int gameid, int localid, int authenticated, char* errmsg, void* instance)
+void AuthenticateCallback(int gameid, int localid, int authenticated, char *errmsg, void *instance)
 {
-    challenge_t* challenge;
-    qboolean valid = qfalse;
+    challenge_t *challenge;
+    qboolean     valid = qfalse;
 
     if (localid || !Q_stricmp(errmsg, "CD Key in use")) {
         valid = qtrue;
     }
 
     challenge = FindChallengeById(gameid);
-    if (valid)
-    {
+    if (valid) {
         challenge->cdkeyState = 2;
-        challenge->pingTime = svs.time;
+        challenge->pingTime   = svs.time;
 
-        NET_OutOfBandPrint(NS_SERVER, challenge->adr, "challengeResponse %i", challenge->challenge);
-    }
-    else
-    {
+        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_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
-        NET_OutOfBandPrint(NS_SERVER, challenge->adr, "droperror\nServer rejected connection:\n%s", errmsg);
+        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 RefreshAuthCallback(int gameid, int localid, int hint, char *challenge, void *instance) {}
 
-void SV_GamespyAuthorize(netadr_t from, const char* response)
+void SV_GamespyAuthorize(netadr_t from, const char *response)
 {
-    char buf[64];
-    challenge_t* challenge = FindChallenge(from, qtrue);
+    char         buf[64];
+    challenge_t *challenge = FindChallenge(from, qtrue);
     if (!challenge) {
         return;
     }
 
-    switch (challenge->cdkeyState)
-    {
+    switch (challenge->cdkeyState) {
     case CDKS_NONE:
         challenge->cdkeyState = CDKS_AUTHENTICATING;
-        challenge->firstTime = svs.time;
+        challenge->firstTime  = svs.time;
 
         gcd_authenticate_user(
             GS_GetCurrentGameID(),
             challenge->gamespyId,
-            LittleLong(*(unsigned int*)from.ip),
+            LittleLong(*(unsigned int *)from.ip),
             challenge->gsChallenge,
             response,
             AuthenticateCallback,
@@ -432,25 +485,87 @@ void SV_GamespyAuthorize(netadr_t from, const char* response)
     case CDKS_AUTHENTICATING:
         // the server can't reach the authentication server
         // let the client connect
-        if (svs.time - challenge->firstTime > 5000)
-        {
+        if (svs.time - challenge->firstTime > 5000) {
             Com_DPrintf("authorize server timed out\n");
             challenge->cdkeyState = CDKS_AUTHENTICATED;
-            challenge->pingTime = svs.time;
-            NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+            challenge->pingTime   = svs.time;
+            SV_NET_OutOfBandPrint(&svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         }
         break;
     case CDKS_AUTHENTICATED:
-        NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+        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_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
-        NET_OutOfBandPrint(NS_SERVER, from, "droperror\nServer rejected connection:\nInvalid CD Key");
+        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 3ceb293a..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
@@ -13,6 +39,13 @@ 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
 }
diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 2e464d4b..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,335 +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 > MAX_HEARTBEAT_TIME || tc < qrec->lastheartbeat) {
-            send_heartbeat(qrec, 0);
-        } else if (qrec->no_query > 0 && tc - qrec->lastheartbeat > MIN_HEARTBEAT_TIME) {
-            send_heartbeat(qrec, 0);
-
-            qrec->no_query++;
-            if (qrec->no_query > 10) {
-                qrec->no_query = 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;
-    }
-
-    Com_sprintf(keyvalue, sizeof(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);
-
-    qrec->packetnumber++;
-
-    sendto((SOCKET)qrec->querysock, buffer, (int)strlen(buffer), 0, addr, sizeof(*addr));
-    *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) < MAX_INFO_STRING) {
+    if (strlen(buffer) + strlen(newdata) < MAX_DATA_SIZE - 50) {
         strcat(buffer, newdata);
-        return;
-    }
-
-    pos = newdata;
-    while (strlen(pos) > MAX_INFO_STRING) {
-        lastkey = pos;
-
-        for (i = 0; i < MAX_INFO_STRING; ++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) < MAX_INFO_STRING) {
-            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[MAX_KEYVALUES_LENGTH] = {0};
+    char keyvalue[BUF_SIZE] = "";
 
-    qrec->qr_basic_callback(keyvalue, MAX_KEYVALUES_LENGTH, 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[MAX_KEYVALUES_LENGTH] = {0};
+    char keyvalue[BUF_SIZE] = "";
 
-    qrec->qr_info_callback(keyvalue, MAX_KEYVALUES_LENGTH, 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[MAX_KEYVALUES_LENGTH] = {0};
+    char keyvalue[BUF_SIZE] = "";
 
-    qrec->qr_rules_callback(keyvalue, MAX_KEYVALUES_LENGTH, 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[MAX_KEYVALUES_LENGTH] = {0};
-
-    qrec->qr_players_callback(keyvalue, MAX_KEYVALUES_LENGTH, 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[MAX_KEYVALUES_LENGTH] = {0};
+    char keyvalue[MAX_DATA_SIZE];
 
-    if (strlen(echostr) > 50) {
+    if (strlen(echostr) > MAX_DATA_SIZE - 50)
         return;
-    }
-
-    Com_sprintf(keyvalue, sizeof(keyvalue), "\\echoresponse\\%s", echostr);
+    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 >= ARRAY_LEN(encrypted_val)) {
+        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);
-
-        Com_sprintf(keyvalue, sizeof(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);
     }
 
-    Com_sprintf(keyvalue, sizeof(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[MAX_KEYVALUES_LENGTH] = {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
-        if (qrec->qr_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 - 1]);
-        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);
@@ -369,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);
@@ -378,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, sizeof(qrec->master_saddr));
     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   = NULL;
-}
-
-#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 95f1a3f7..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,50 +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
 
-#define MAX_KEYVALUES_LENGTH 1400
+/********
+ERROR CONSTANTS
+---------------
+These constants are returned from qr_init to signal an error condition
+***************/
 
-static const unsigned int MIN_HEARTBEAT_TIME = 30000; // wait at least 30 seconds before new heartbeat can be sent
-static const unsigned int MAX_HEARTBEAT_TIME = 300000; // 5 minutes
+#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 void (*qr_querycallback_t)(char *outbuf, int maxlen, void *userdata);
-typedef void (*qr_custom_handler_t)(const char *query, struct sockaddr *sender);
+/********
+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
 
-typedef enum query_e {
-    qtunknown,
-    qtbasic,
-    qtinfo,
-    qtrules,
-    qtplayers,
-    qtstatus,
-    qtpackets,
-    qtecho,
-    qtsecure
-} query_t;
+/* 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];
 
-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;
+/**
+ * @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);
 
-#define MASTER_SERVER_HOST "master.x-null.net"
+/********
+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 01fde5e0..00000000
--- a/code/libmad-0.15.1b/CMakeLists.txt
+++ /dev/null
@@ -1,20 +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)
-target_compile_definitions(libmad PUBLIC NDEBUG) # otherwise assert() will call abort() and it fails to compile on clang-16 (call to undeclared library function 'abort')
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 6f3bb3d2..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,149 +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 == '\\' )
-		{
-			if( len == 1 )
-				break;
+    while (len) {
+        if (*str == '\\') {
+            if (len == 1) {
+                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++;
-			}
+            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++;
+            }
 
-			len -= 2;
-			str += 2;
-		}
-		else
-		{
-			*to = *str;
-			to++;
-			len--;
-			str++;
-		}
-	}
+            len -= 2;
+            str += 2;
+        } else {
+            *to = *str;
+            to++;
+            len--;
+            str++;
+        }
+    }
 
-	*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;                      \
+    }
 
 %}
 
@@ -188,174 +183,193 @@ static bool UseField( void )
 %x VARIABLES
 %x IDENTIFIER
 
-string		([^\\\"\r\n]|\\.)*
-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);
-								}
-								
-\"{string}\"					{ TextEscapeValue( yytext + 1, yyleng - 2 ); YYLEX( TOKEN_STRING ); }
+<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}\"{nonexpr}           {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
 
-"?"								{ YYLEX( TOKEN_TERNARY ); }
-"if"							{ YYLEX( TOKEN_IF ); }
-"else"							{ YYLEX( TOKEN_ELSE ); }
-"while"							{ YYLEX( TOKEN_WHILE ); }
-"for"							{ YYLEX( TOKEN_FOR ); }
-"do"							{ YYLEX( TOKEN_DO ); }
+\"{string}\"                    { TextEscapeValue(yytext + 1, yyleng - 2); YYLEX(TOKEN_STRING); }
 
-"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 ); }
+"?"                             { YYLEX(TOKEN_TERNARY); }
+"if"                            { YYLEX(TOKEN_IF); }
+"else"                          { YYLEX(TOKEN_ELSE); }
+"while"                         { YYLEX(TOKEN_WHILE); }
+"for"                           { YYLEX(TOKEN_FOR); }
+"do"                            { YYLEX(TOKEN_DO); }
 
-"{"								{ 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); }
+"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); }
 
-"="								{ YYLEX( TOKEN_ASSIGNMENT ); }
-":"								{ YYLEX( TOKEN_COLON ); }
-"::"							{ YYLEX( TOKEN_DOUBLE_COLON ); }
-";"								{ YYLEX( TOKEN_SEMICOLON ); }
+"{"                             { 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_EQUALITY ); }
-"||"							{ YYLEX( TOKEN_LOGICAL_OR ); }
-"&&"							{ YYLEX( TOKEN_LOGICAL_AND ); }
+"="                             { YYLEX(TOKEN_ASSIGNMENT); }
+":"                             { YYLEX(TOKEN_COLON); }
+"::"                            { YYLEX(TOKEN_DOUBLE_COLON); }
+";"                             { YYLEX(TOKEN_SEMICOLON); }
 
-"|"								{ 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_EQUALITY); }
+"ifequal"                       { YYLEX(TOKEN_EQUALITY); }
+"ifstrequal"                    { YYLEX(TOKEN_EQUALITY); }
+"||"                            { YYLEX(TOKEN_LOGICAL_OR); }
+"&&"                            { YYLEX(TOKEN_LOGICAL_AND); }
 
-"+"								{ 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_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_PERIOD ); }
+"+"                             { 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_COMMA ); }
-"#"								{ YYLEX( TOKEN_NUMBER ); }
+"."                             { YYLEX(TOKEN_PERIOD); }
 
-"NULL"							{ YYLEX( TOKEN_NULL ); }
-"NIL"							{ YYLEX( TOKEN_NIL ); }
+","                             { YYLEX(TOKEN_COMMA); }
 
-"try"							{ YYLEX( TOKEN_TRY ); }
-"catch"							{ YYLEX( TOKEN_CATCH ); }
-"switch"						{ YYLEX( TOKEN_SWITCH ); }
+"NULL"                          { YYLEX(TOKEN_NULL); }
+"NIL"                           { YYLEX(TOKEN_NIL); }
 
-"case"							{ YYLEX( TOKEN_CASE ); }
-"break"							{ YYLEX( TOKEN_BREAK ); }
-"continue"						{ YYLEX( TOKEN_CONTINUE ); }
+"try"                           { YYLEX(TOKEN_TRY); }
+"catch"                         { YYLEX(TOKEN_CATCH); }
+"switch"                        { YYLEX(TOKEN_SWITCH); }
 
-"makearray"|"makeArray"			{ YYLEX( TOKEN_MAKEARRAY ); }
-"endarray"|"endArray"			{ YYLEX( TOKEN_ENDARRAY ); }
+"case"                          { YYLEX(TOKEN_CASE); }
+"break"                         { YYLEX(TOKEN_BREAK); }
+"continue"                      { YYLEX(TOKEN_CONTINUE); }
 
-[\r\n]+							{ if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
-[ \t]							{ ; }
+"makearray"|"makeArray"         { YYLEX(TOKEN_MAKEARRAY); }
+"endarray"|"endArray"           { YYLEX(TOKEN_ENDARRAY); }
 
-[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);
-										}
+[\r\n]+                         { if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
+[ \t]                           { ; }
 
-<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]+                                  {
+                                            char* p = nullptr;
+                                            yylval.s.val.intValue = std::strtol(yytext, &p, 10);
+                                            YYLEX(TOKEN_INTEGER);
+                                        }
 
-{identifier}					{
-									BEGIN(IDENTIFIER);
-									yymore();
-								}
+[0-9\.]+{nonnumeric}                    {
+                                            BEGIN(IDENTIFIER);
+                                            yymore();
+                                        }
 
-[a-zA-Z0-9_]+					{
-									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);
+                                        }
 
-<SCRIPT>[a-zA-Z0-9]+			{ BEGIN(INITIAL); }
+<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);
+                                        }
 
-.								{ YY_FATAL_ERROR("bad token:\n"); }
+{identifier}                    {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
+
+[a-zA-Z0-9_]+                   {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
+
+<SCRIPT>[a-zA-Z0-9]+            { BEGIN(INITIAL); }
+
+.                               { YY_FATAL_ERROR("bad token:\n"); }
 
 %{
 
@@ -368,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 d4c0bb81..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,34 +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 INTERFACE)
-target_sources(qcommon INTERFACE ${SOURCES_SHARED})
+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 INTERFACE _DEBUG_MEMBLOCK=1)
+	target_compile_definitions(qcommon_uber INTERFACE _DEBUG_MEMBLOCK=1)
 endif()
 
-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)
+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_link_libraries(qcommon INTERFACE qcommon_shared qcommon_uber)
 
 # Source files for standalone executable
 set(SOURCES_COMMON
@@ -51,10 +63,11 @@ set(SOURCES_COMMON
 	"${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"
@@ -66,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")
@@ -83,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 0b11e7b6..56b20b01 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -121,7 +121,7 @@ void CMod_LoadShaders( gamelump_t *l, int **shaderSubdivisions ) {
 
 	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 );
@@ -678,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);
 	}
 
@@ -709,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;
@@ -743,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 ) ];
 	}
 }
 
@@ -766,7 +767,7 @@ unsigned CM_Checksum( dheader_t *header ) {
 
 	return LittleLong(Com_BlockChecksum(checksums, 11 * 4));
 	*/
-	return header->checksum;
+	return LittleLong(header->checksum);
 }
 
 /*
@@ -784,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." );
 		}
 
@@ -883,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++) {
@@ -899,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 );
@@ -921,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 );
@@ -943,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_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_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_trace.c b/code/qcommon/cm_trace.c
index 9fbc5f34..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;
+					}
 				}
 			}
 		}
@@ -1651,7 +1660,6 @@ qboolean CM_SightTraceThroughBrush( traceWork_t *tw, cbrush_t *brush )
 					}
 					if( f > enterFrac ) {
 						enterFrac = f;
-						leadside = side;
 					}
 				} else { // leave
 					f = ( d1 + SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
@@ -1745,12 +1753,12 @@ qboolean CM_SightTraceThroughBrush( traceWork_t *tw, cbrush_t *brush )
 					return qfalse;
 				}
 			}
-		}
 
-		if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
-			if( leaveFrac2 < tw->trace.fraction ) {
-				if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
-					return qfalse;
+			if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
+				if( leaveFrac2 < tw->trace.fraction ) {
+					if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
+						return qfalse;
+					}
 				}
 			}
 		}
diff --git a/code/qcommon/cm_trace_obfuscation.cpp b/code/qcommon/cm_trace_obfuscation.cpp
index 171e5a49..b2a954ca 100644
--- a/code/qcommon/cm_trace_obfuscation.cpp
+++ b/code/qcommon/cm_trace_obfuscation.cpp
@@ -22,14 +22,92 @@ 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) {
-	// FIXME: unimplemented
-	return NULL;
+    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;
-	int i;
+    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++) {
@@ -37,14 +115,122 @@ obfuscation_t* CM_SetupObfuscationMapping() {
 		list[i].heightDensity = 0;
 		list[i].widthDensity = 0;
 	}
-	// FIXME: unimplemented
+
+    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;
 
@@ -66,31 +252,21 @@ CM_ObfuscationTraceThroughBrush
 ================
 */
 float CM_ObfuscationTraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
-	int			i;
-	cplane_t	*plane, *clipplane, *clipplane2;
-	float		dist;
-	float		enterFrac, leaveFrac, leaveFrac2;
-	float		d1, d2;
-	qboolean	getout, startout;
-	float		f;
-	cbrushside_t	*side, *leadside, *leadside2;
-	float		t;
-	float		alpha;
+    int i;
+    cplane_t* plane;
+    float dist;
+    float enterFrac, leaveFrac;
+    float enterDensity, leaveDensity;
+    float delta;
+    float d1, d2;
+    float f;
+    cbrushside_t* side;
 
-	if( !brush->numsides ) {
-		return tw->radius * cm.shaders[brush->shaderNum].obfuscationHeightDensity;
-	}
-
-	enterFrac = -1.0;
+	enterFrac = 0;
+    enterDensity = 0;
 	leaveFrac = 1.0;
-	clipplane = NULL;
+    leaveDensity = 0;
 
-	c_brush_traces++;
-
-	getout = qfalse;
-	startout = qfalse;
-
-	leadside = NULL;
 	//
 	// compare the trace against all planes of the brush
 	// find the latest time the trace crosses a plane towards the interior
@@ -101,41 +277,38 @@ float CM_ObfuscationTraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
 		plane = side->plane;
 
 		// adjust the plane distance apropriately for mins/maxs
-		dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal );
+		//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 ) {
-			continue;
+            return 0;
 		}
 
-		// crosses face
-		if( d1 > d2 ) { // enter
-			f = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
-			if( f < 0 ) {
-				f = 0;
-			}
-			if( f > enterFrac ) {
-				enterFrac = f;
-				clipplane = plane;
-				leadside = side;
-			}
-		} else { // leave
-			f = ( d1 + SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
-			if( f > 1 ) {
-				f = 1;
-			}
-			if( f < leaveFrac ) {
-				leaveFrac = f;
-			}
-		}
+        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;
+        }
 	}
 
-	alpha = 1.f;
-	// FIXME: unimplemented
-	return alpha;
+    delta = leaveFrac - enterFrac;
+    if (delta <= 0) {
+        return 0;
+    }
+
+    return enterDensity + cm.shaders[brush->shaderNum].obfuscationHeightDensity * tw->radius * delta + leaveDensity;
 }
 
 /*
@@ -180,15 +353,13 @@ 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, offset;
+	float		t1, t2;
 	float		frac, frac2;
 	float		idist;
 	vec3_t		mid;
 	int			side;
 	float		midf;
 
-	// FIXME: unimplemented
-
 	// if < 0, we are in a leaf node
 	if (num < 0) {
 		return CM_ObfuscationTraceToLeaf( tw, &cm.leafs[-1-num] );
@@ -205,23 +376,16 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	if ( plane->type < 3 ) {
 		t1 = p1[plane->type] - plane->dist;
 		t2 = p2[plane->type] - plane->dist;
-		offset = tw->extents[plane->type];
 	} else {
 		t1 = DotProduct (plane->normal, p1) - plane->dist;
 		t2 = DotProduct (plane->normal, p2) - plane->dist;
-		if ( tw->isPoint ) {
-			offset = 0;
-		} else {
-			// this is silly
-			offset = 2048;
-		}
 	}
 
 	// see which sides we need to consider
-	if ( t1 >= offset + 1 && t2 >= offset + 1 ) {
+	if ( t1 >= SURFACE_CLIP_EPSILON && t2 >= SURFACE_CLIP_EPSILON) {
 		return CM_ObfuscationTraceThroughTree( tw, node->children[0], p1f, p2f, p1, p2 );
 	}
-	if ( t1 < -offset - 1 && t2 < -offset - 1 ) {
+	if ( t1 < -SURFACE_CLIP_EPSILON && t2 < -SURFACE_CLIP_EPSILON) {
 		return CM_ObfuscationTraceThroughTree( tw, node->children[1], p1f, p2f, p1, p2 );
 	}
 
@@ -229,13 +393,13 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	if ( t1 < t2 ) {
 		idist = 1.0/(t1-t2);
 		side = 1;
-		frac2 = (t1 + offset + SURFACE_CLIP_EPSILON)*idist;
-		frac = (t1 - offset + SURFACE_CLIP_EPSILON)*idist;
+		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 - offset - SURFACE_CLIP_EPSILON)*idist;
-		frac = (t1 + offset + SURFACE_CLIP_EPSILON)*idist;
+		frac2 = (t1 - SURFACE_CLIP_EPSILON)*idist;
+		frac = (t1 + SURFACE_CLIP_EPSILON)*idist;
 	} else {
 		side = 0;
 		frac = 1;
@@ -245,8 +409,7 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	// move up to the node
 	if ( frac < 0 ) {
 		frac = 0;
-	}
-	if ( frac > 1 ) {
+	} else if ( frac > 1 ) {
 		frac = 1;
 	}
 
@@ -262,8 +425,7 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	// go past the node
 	if ( frac2 < 0 ) {
 		frac2 = 0;
-	}
-	if ( frac2 > 1 ) {
+	} else if ( frac2 > 1 ) {
 		frac2 = 1;
 	}
 
@@ -276,11 +438,38 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	return CM_ObfuscationTraceThroughTree( tw, node->children[side^1], midf, p2f, mid, p2 );
 }
 
-float CM_ObfuscationTrace(const vec3_t start, const vec3_t end, clipHandle_t model) {
-	// FIXME: unimplemented
-	return 0.f;
+/*
+================
+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);
+    }
 }
 
-float CM_VisualObfuscation(const vec3_t start, const vec3_t end) {	// FIXME: unimplemented
-	return 0.f;
+/*
+================
+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 e6129e64..338456a1 100644
--- a/code/qcommon/cmd.c
+++ b/code/qcommon/cmd.c
@@ -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;
 			}
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.c
similarity index 79%
rename from code/qcommon/common.cpp
rename to code/qcommon/common.c
index cd18527d..e6018259 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.c
@@ -33,7 +33,11 @@ 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"
 
@@ -41,6 +45,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  include "../uilib/ui_public.h"
 #endif
 
+#include "../gamespy/q_gamespy.h"
+
 qboolean CL_FinishedIntro(void);
 
 #ifdef __cplusplus
@@ -56,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];
 
@@ -74,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
@@ -95,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;
@@ -130,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;
@@ -144,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];
 
@@ -158,6 +163,8 @@ void Com_WriteConfig_f( void );
 void CIN_CloseAllVideos(void);
 
 void Com_InitTargetGame();
+void Com_InitHunkMemory( void );
+void Z_InitMemory( void );
 
 //============================================================================
 
@@ -167,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];
@@ -214,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);
@@ -230,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;
 	}
 
@@ -254,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 )
 				{
@@ -273,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--;
 }
 
 
@@ -407,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 {
@@ -568,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] );
@@ -577,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);
 		}
 	}
 }
@@ -609,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" );
@@ -845,7 +936,7 @@ CopyString
 char *CopyString( const char *in ) {
 	char	*out;
 
-#ifndef _DEBUG_MEM
+#ifndef ZONE_DEBUG
 	if (!in[0]) {
 		return ( char * )Z_EmptyStringPointer();
 	}
@@ -943,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 ];
 
 /*
 ================
@@ -958,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 )
@@ -994,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;
 }
 
 /*
@@ -1037,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
@@ -1176,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
@@ -1197,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;
 		}
 
@@ -1336,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;
 }
 
 /*
@@ -1601,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
@@ -1611,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" );
 
@@ -1622,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 );
@@ -1644,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);
@@ -1664,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 );
@@ -1677,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() )
 	{
@@ -1769,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 );
@@ -1794,14 +1920,18 @@ void Com_Init( char *commandLine ) {
 		}
 	}
 
-	s = va( "%s %s (Medal of Honor: %s) %s %s", PRODUCT_NAME, PRODUCT_VERSION_FULL, Cvar_VariableString("com_target_extension"), PLATFORM_STRING, PRODUCT_VERSION_DATE);
+	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_gamename = Cvar_Get("com_gamename", "", CVAR_SERVERINFO | CVAR_INIT);
-	com_shortversion = Cvar_Get( "shortversion", PRODUCT_VERSION, CVAR_ROM );
+	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_SERVERINFO | CVAR_ROM);
@@ -1816,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;
@@ -1845,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 ) {
@@ -2017,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
@@ -2053,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();
@@ -2161,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();
 		}
 	}
 
@@ -2176,7 +2377,9 @@ void Com_Frame( void ) {
 		timeBeforeEvents = Sys_Milliseconds ();
 	}
 	Com_EventLoop();
-	Cbuf_Execute(msec);
+	if (CL_FinishedIntro()) {
+		Cbuf_Execute(msec);
+	}
 
 
 	//
@@ -2220,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
 	}
 
 	//
@@ -2252,8 +2471,9 @@ void Com_Frame( void ) {
 		c_pointcontents = 0;
 	}
 
-	// old net chan encryption key
-	key = lastTime * 0x87243987;
+	Com_ReadFromPipe();
+
+    Sys_ProcessBackgroundTasks();
 
 	com_frameNumber++;
 }
@@ -2276,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 )
@@ -2398,6 +2612,15 @@ qboolean COM_IsMapValid(const char* name) {
 	*/
 }
 
+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);
+}
+
 //------------------------------------------------------------------------
 
 
@@ -2591,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] &&
@@ -2611,6 +2835,7 @@ void Field_CompleteCommand(char* cmd,
 
         completionField->buffer[0] = '\\';
     }
+#endif
 #endif
 
     if (completionArgument > 1)
@@ -2619,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
@@ -2672,6 +2897,56 @@ void Field_AutoComplete(field_t* field)
     Field_CompleteCommand(completionField->buffer, qtrue, qtrue);
 }
 
+/*
+==================
+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
@@ -2846,39 +3121,71 @@ int QDECL Com_strCompare( const void *a, const void *b )
     return strcmp( *pa, *pb );
 }
 
-void Com_InitTargetGameWithType(target_game_e target_game)
+void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 {
-	const char* protocol;
-
     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("com_gamename", TARGET_GAME_NAME_MOHTA);
-        Cvar_Set("fs_basegame", "mainta");
+		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("com_gamename", TARGET_GAME_NAME_MOHTT);
-        Cvar_Set("fs_basegame", "maintt");
+		if (!bIsDemo) {
+			Cvar_Set("fs_basegame", "maintt");
+		} else {
+			// Targeting a demo
+			Cvar_Set("fs_basegame", "demott");
+		}
         break;
 
     default:
@@ -2895,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 2a0ac750..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_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();
@@ -87,7 +135,7 @@ public:
     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);
 };
@@ -96,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>
@@ -128,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>
@@ -161,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--) {
@@ -180,19 +229,18 @@ 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);
     }
 }
 
@@ -209,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++) {
@@ -223,7 +270,7 @@ void con_arrayset<key, value>::clear()
     }
 
     if (tableLength > 1) {
-        delete[] table;
+        DeleteTable(table);
     }
 
     tableLength = 1;
@@ -278,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) {
@@ -289,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;
 }
@@ -331,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;
         }
@@ -343,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.h b/code/qcommon/con_set.h
index 225b4561..d9a91b1b 100644
--- a/code/qcommon/con_set.h
+++ b/code/qcommon/con_set.h
@@ -26,6 +26,31 @@ 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;
 
@@ -116,6 +141,8 @@ protected:
 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();
@@ -156,6 +183,18 @@ void con_set<k, v>::DeleteEntry(void *entry)
     Entry_allocator.Free(entry);
 }
 
+template<typename k, typename v>
+void *con_set<k, v>::NewTable(size_t count)
+{
+    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);
 
@@ -193,7 +232,7 @@ void con_set<key, value>::clear()
     }
 
     if (tableLength > 1) {
-        delete[] table;
+        DeleteTable(table);
     }
 
     tableLength = 1;
@@ -229,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--) {
@@ -248,7 +286,7 @@ void con_set<key, value>::resize(int count)
 
     if (oldTableLength > 1) {
         // delete the previous table
-        delete[] oldTable;
+        DeleteTable(oldTable);
     }
 }
 
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 4f055cd3..43b3070c 100644
--- a/code/qcommon/const_str.h
+++ b/code/qcommon/const_str.h
@@ -306,14 +306,16 @@ enum {
     STRING_ANIM_NO_KILLED_SCR,
     STRING_MG42,
     STRING_MP40,
+    // Added in 2.0
     STRING_AUTO,
     STRING_BOTH,
+    // Added in 2.30
     STRING_RUNANDSHOOT,
-    //
-    // Openmohaa additions
-    //
+    // Added in OPM
     STRING_RESPAWN,
     STRING_VIEWMODELANIM_DONE,
+
+    // The number of strings
     STRING_LENGTH_
 };
 
diff --git a/code/qcommon/container.h b/code/qcommon/container.h
index 750ca6a4..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;
     }
 
@@ -183,53 +250,29 @@ Type *Container<Type>::AddressOfObjectAt(int index)
 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;
@@ -258,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;
     }
@@ -349,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>
@@ -380,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();
@@ -390,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;
 
@@ -400,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);
     }
 }
 
@@ -435,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);
 }
@@ -472,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 f05ae523..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 );
@@ -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 bbf734f5..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
 }
 
 
@@ -2424,6 +2367,9 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 	}
 
 	pathLength = strlen( path );
+	if ( path[pathLength-1] == '\\' || path[pathLength-1] == '/' ) {
+		pathLength--;
+	}
 	extensionLength = strlen( extension );
 	nfiles = 0;
 	FS_ReturnPath(path, zpath, &pathDepth);
@@ -2479,7 +2425,7 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 					//
 					if (filter) {
 						if (zpathLen) {
-							strcpy(zpath, name + pathLength + 1);
+							strcpy(zpath, name + zpathLen + 1);
 						}
 						else {
 							strcpy(zpath, name);
@@ -2502,13 +2448,18 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 						}
 						// unique the match
 
+						temp = pathLength;
+						if (pathLength) {
+							temp++; // include the '/'
+						}
+
 						if (bDirSearch) {
-							strcpy(zpath, name + pathLength);
-							zpath[length - pathLength - 1] = 0;
+							strcpy(zpath, name + temp);
+							zpath[length - temp - 1] = 0;
 							nfiles = FS_AddFileToList(zpath, list, nfiles);
 						}
 						else {
-							nfiles = FS_AddFileToList(name + pathLength, list, nfiles);
+							nfiles = FS_AddFileToList(name + temp, list, nfiles);
 						}
 					}
 				}
@@ -2882,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 == ':' ) {
@@ -3092,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 );
 }
 
@@ -3300,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;
 		}
 
@@ -3489,6 +3437,10 @@ static void FS_Startup(const char* gameName)
 	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 );
@@ -3580,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);
 		}
@@ -3776,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 ) );
 			}
 		}
@@ -3856,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 );
@@ -4060,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
@@ -4374,32 +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++;
     }
-}
-
-void FS_FileTime(const char* filename, char* date, char* size) {
-	const char* ospath;
-
-	date[0] = 0;
-	size[0] = 0;
-
-	ospath = FS_BuildOSPath(fs_homepath->string, fs_gamedir, filename);
-
-	// FIXME: unimplemented
+
+    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 c8bd448f..982b50bd 100644
--- a/code/qcommon/lightclass.cpp
+++ b/code/qcommon/lightclass.cpp
@@ -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 4f6f4152..d3631a6b 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -73,9 +73,8 @@ EventQueueNode Event::EventQueue;
 
 int DisableListenerNotify = 0;
 
-bool Listener::EventSystemStarted = 0;
-
-int Event::totalevents = 1;
+bool Listener::EventSystemStarted = false;
+bool Listener::ProcessingEvents = false;
 
 Event EV_Listener_CancelFor
 (
@@ -396,11 +395,17 @@ int HashCode<Event *>(Event *const& key)
 template<>
 int HashCode<command_t>(const command_t& key)
 {
-    const char* p;
+    const char *p;
     int         hash = 0;
 
-    for (p = key.command; *p; p++) {
-        hash = tolower(*p) + 31 * hash;
+    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;
@@ -447,7 +452,7 @@ void Event::Archive(Archiver& arc)
     }
 
     for (int i = dataSize; i > 0; i--) {
-        data[i].ArchiveInternal(arc);
+        data[i - 1].ArchiveInternal(arc);
     }
 }
 
@@ -571,6 +576,8 @@ void L_ProcessPendingEvents()
 {
     EventQueueNode *node;
 
+    Listener::ProcessingEvents = true;
+
     int t = EVENT_msec;
     while (!LL_Empty(&Event::EventQueue, next, prev)) {
         Listener *obj;
@@ -596,6 +603,8 @@ void L_ProcessPendingEvents()
 
         delete node;
     }
+
+    Listener::ProcessingEvents = false;
 }
 
 void L_ShutdownEvents(void)
@@ -608,6 +617,12 @@ void L_ShutdownEvents(void)
 
     Event::commandList.clear();
     Event::eventDefList.clear();
+#ifdef WITH_SCRIPT_ENGINE
+    Event::normalCommandList.clear();
+    Event::returnCommandList.clear();
+    Event::getterCommandList.clear();
+    Event::setterCommandList.clear();
+#endif
 
     Listener::EventSystemStarted = false;
 }
@@ -654,7 +669,7 @@ void EventArgDef::Setup(const char *eventName, const char *argName, const char *
             if (!endptr) {
                 assert(0);
                 EVENT_Printf(
-                    "Argument defintion %s, no matching ']' found for range spec in event %s.\n",
+                    "Argument definition %s, no matching ']' found for range spec in event %s.\n",
                     name.c_str(),
                     eventName
                 );
@@ -744,7 +759,7 @@ void EV_Print(FILE *stream, const char *format, ...)
 
     va_start(va, format);
 
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
 
     if (stream) {
         fprintf(stream, "%s", buffer);
@@ -859,7 +874,7 @@ void EventDef::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);
 
     EVENT_Printf("^~^~^ Game: '%s' : %s\n", command.c_str(), buffer);
@@ -1014,7 +1029,7 @@ void EventDef::SetupDocumentation(void)
             //
             // store off all the names
             //
-            strcpy(argumentNames, argument_names);
+            Q_strncpyz(argumentNames, argument_names, sizeof(argumentNames));
             namePtr = strtok(argumentNames, " ");
             while (namePtr != NULL) {
                 argNames.AddObject(str(namePtr));
@@ -1124,7 +1139,7 @@ Number of total events
 */
 int Event::NumEventCommands()
 {
-    return totalevents;
+    return commandList.size() + 1;
 }
 
 /*
@@ -1322,7 +1337,7 @@ void Event::PendingEvents(const char *mask)
     EVENT_Printf("%d pending events as of %.2f\n", num, EVENT_time);
 }
 
-bool Event::Exists(const char* command)
+bool Event::Exists(const char *command)
 {
     return FindEventNum(command) != 0;
 }
@@ -1424,7 +1439,6 @@ FindSetterEventNum
 */
 unsigned int Event::FindSetterEventNum(str s)
 {
-    s.tolower();
     return FindSetterEventNum(Director.AddString(s));
 }
 
@@ -1435,7 +1449,6 @@ FindGetterEventNum
 */
 unsigned int Event::FindGetterEventNum(str s)
 {
-    s.tolower();
     return FindGetterEventNum(Director.AddString(s));
 }
 
@@ -1452,8 +1465,10 @@ int Event::GetEventWithFlags(str name, int flags, uchar type)
     con_map<const_str, unsigned int> *cmdList;
 
     if (type == EV_NORMAL) {
+        name.tolower();
         cmdList = &normalCommandList;
     } else if (type == EV_RETURN) {
+        name.tolower();
         cmdList = &returnCommandList;
     } else if (type == EV_GETTER) {
         cmdList = &getterCommandList;
@@ -1463,8 +1478,6 @@ int Event::GetEventWithFlags(str name, int flags, uchar type)
         return 0;
     }
 
-    name.tolower();
-
     index = cmdList->find(Director.GetString(name));
 
     if (!index || !(GetEventFlags(*index) & flags)) {
@@ -1625,7 +1638,6 @@ void Event::LoadEvents()
 #endif
 
         delete DataNodeList;
-        totalevents++;
     }
 }
 
@@ -1641,6 +1653,10 @@ Event::Event()
     data        = NULL;
     dataSize    = 0;
     maxDataSize = 0;
+
+#ifdef _DEBUG
+    name = NULL;
+#endif
 }
 
 /*
@@ -1676,6 +1692,10 @@ Event::Event(
     maxDataSize = 0;
     data        = NULL;
     eventnum    = 0;
+
+#ifdef _DEBUG
+    name = NULL;
+#endif
 }
 
 /*
@@ -1691,7 +1711,7 @@ Event::Event(const Event& ev)
     maxDataSize = ev.maxDataSize;
 
     if (dataSize) {
-        data = new ScriptVariable[dataSize];
+        data = new ScriptVariable[maxDataSize];
 
         for (int i = 0; i < dataSize; i++) {
             data[i] = ev.data[i];
@@ -1713,7 +1733,7 @@ Event::Event(const Event& ev, int numArgs)
     maxDataSize = ev.maxDataSize;
 
     if (dataSize) {
-        data = new ScriptVariable[dataSize];
+        data = new ScriptVariable[maxDataSize];
 
         for (int i = 0; i < dataSize; i++) {
             data[i] = ev.data[i];
@@ -1737,10 +1757,18 @@ Event::Event(Event&& ev)
     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
 }
 
 /*
@@ -1881,11 +1909,19 @@ Event& Event::operator=(Event&& ev)
     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;
 }
 
@@ -2049,10 +2085,10 @@ void Event::AddVector(const Vector& vector)
 SetValue
 =======================
 */
-void Event::CopyValues(const ScriptVariable* values, size_t count)
+void Event::CopyValues(const ScriptVariable *values, size_t count)
 {
     assert(count <= maxDataSize);
-   
+
     for (size_t i = 0; i < count; i++) {
         data[i] = values[i];
     }
@@ -2081,7 +2117,7 @@ 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);
@@ -2093,7 +2129,7 @@ void Event::CheckPos(int pos)
 GetBoolean
 =======================
 */
-bool Event::GetBoolean(int pos)
+bool Event::GetBoolean(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2107,7 +2143,7 @@ bool Event::GetBoolean(int pos)
 GetConstString
 =======================
 */
-const_str Event::GetConstString(int pos)
+const_str Event::GetConstString(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2121,7 +2157,7 @@ const_str Event::GetConstString(int pos)
 GetEntity
 =======================
 */
-Entity *Event::GetEntity(int pos)
+Entity *Event::GetEntity(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2133,7 +2169,7 @@ Entity *Event::GetEntity(int pos)
 GetFloat
 =======================
 */
-float Event::GetFloat(int pos)
+float Event::GetFloat(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2145,7 +2181,7 @@ float Event::GetFloat(int pos)
 GetInteger
 =======================
 */
-int Event::GetInteger(int pos)
+int Event::GetInteger(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2157,7 +2193,7 @@ int Event::GetInteger(int pos)
 GetListener
 =======================
 */
-Listener *Event::GetListener(int pos)
+Listener *Event::GetListener(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2171,7 +2207,7 @@ Listener *Event::GetListener(int pos)
 GetSimpleEntity
 =======================
 */
-SimpleEntity *Event::GetSimpleEntity(int pos)
+SimpleEntity *Event::GetSimpleEntity(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2185,7 +2221,7 @@ SimpleEntity *Event::GetSimpleEntity(int pos)
 GetString
 =======================
 */
-str Event::GetString(int pos)
+str Event::GetString(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
     return variable.stringValue();
@@ -2196,7 +2232,7 @@ str Event::GetString(int pos)
 GetToken
 =======================
 */
-str Event::GetToken(int pos)
+str Event::GetToken(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
     return variable.stringValue();
@@ -2207,7 +2243,7 @@ str Event::GetToken(int pos)
 GetValue
 =======================
 */
-ScriptVariable& Event::GetValue(int pos)
+ScriptVariable& Event::GetValue(int pos) const
 {
     if (pos < 0) {
         pos = NumArgs() + pos + 1;
@@ -2227,16 +2263,16 @@ GetValue
 */
 ScriptVariable& Event::GetValue(void)
 {
-    ScriptVariable* tmp;
-    int i;
+    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;
+            data        = new ScriptVariable[1];
+            dataSize    = 1;
             maxDataSize = 1;
         }
         return data[0];
@@ -2267,7 +2303,7 @@ ScriptVariable& Event::GetValue(void)
 GetVector
 =======================
 */
-Vector Event::GetVector(int pos)
+Vector Event::GetVector(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2281,7 +2317,7 @@ Vector Event::GetVector(int pos)
 GetPathNode
 =======================
 */
-PathNode *Event::GetPathNode(int pos)
+PathNode *Event::GetPathNode(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2293,7 +2329,7 @@ PathNode *Event::GetPathNode(int pos)
 GetWaypoint
 =======================
 */
-Waypoint *Event::GetWaypoint(int pos)
+Waypoint *Event::GetWaypoint(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2307,7 +2343,7 @@ Waypoint *Event::GetWaypoint(int pos)
 IsEntityAt
 =======================
 */
-qboolean Event::IsEntityAt(int pos)
+qboolean Event::IsEntityAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2319,7 +2355,7 @@ qboolean Event::IsEntityAt(int pos)
 IsListenerAt
 =======================
 */
-qboolean Event::IsListenerAt(int pos)
+qboolean Event::IsListenerAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2331,7 +2367,7 @@ qboolean Event::IsListenerAt(int pos)
 IsNilAt
 =======================
 */
-qboolean Event::IsNilAt(int pos)
+qboolean Event::IsNilAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2343,7 +2379,7 @@ qboolean Event::IsNilAt(int pos)
 IsNumericAt
 =======================
 */
-qboolean Event::IsNumericAt(int pos)
+qboolean Event::IsNumericAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2357,7 +2393,7 @@ qboolean Event::IsNumericAt(int pos)
 IsSimpleEntityAt
 =======================
 */
-qboolean Event::IsSimpleEntityAt(int pos)
+qboolean Event::IsSimpleEntityAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2371,7 +2407,7 @@ qboolean Event::IsSimpleEntityAt(int pos)
 IsStringAt
 =======================
 */
-qboolean Event::IsStringAt(int pos)
+qboolean Event::IsStringAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2383,7 +2419,7 @@ qboolean Event::IsStringAt(int pos)
 IsVectorAt
 =======================
 */
-qboolean Event::IsVectorAt(int pos)
+qboolean Event::IsVectorAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2395,7 +2431,7 @@ qboolean Event::IsVectorAt(int pos)
 IsFromScript
 =======================
 */
-qboolean Event::IsFromScript()
+qboolean Event::IsFromScript() const
 {
     return fromScript;
 }
@@ -2405,7 +2441,7 @@ qboolean Event::IsFromScript()
 NumArgs
 =======================
 */
-int Event::NumArgs()
+int Event::NumArgs() const
 {
     return dataSize;
 }
@@ -2570,6 +2606,7 @@ void Listener::CancelEventsOfType(Event *ev)
         next = node->next;
         if ((node->GetSourceObject() == this) && (node->event->eventnum == eventnum)) {
             LL_Remove(node, next, prev);
+            delete node->event;
             delete node;
         }
         node = next;
@@ -2602,6 +2639,11 @@ void Listener::CancelFlaggedEvents(int flags)
         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;
@@ -2624,6 +2666,7 @@ void Listener::CancelPendingEvents(void)
         next = node->next;
         if (node->GetSourceObject() == this) {
             LL_Remove(node, next, prev);
+            delete node->event;
             delete node;
         }
         node = next;
@@ -2666,6 +2709,12 @@ EventQueueNode *Listener::PostEventInternal(Event *ev, float delay, int flags)
     EventQueueNode *i;
     int             inttime;
 
+#if defined(GAME_DLL)
+    if (LoadingSavegame) {
+        return NULL;
+    }
+#endif
+
     if (!classinfo()->responseLookup[ev->eventnum]) {
         if (!ev->eventnum) {
 #ifdef _DEBUG
@@ -2854,9 +2903,9 @@ ScriptVariable& Listener::ProcessEventReturn(Event *ev)
 
     if (!ev->eventnum) {
 #ifdef _DEBUG
-        EVENT_Printf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev->name, 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;
@@ -2866,7 +2915,7 @@ ScriptVariable& Listener::ProcessEventReturn(Event *ev)
     responses = c->responseLookup[ev->eventnum];
 
     if (responses == NULL) {
-        EVENT_Printf(
+        EVENT_DPrintf(
             "^~^~^ Failed execution of command '%s' for class '%s'\n", Event::GetEventName(ev->eventnum), c->classname
         );
         delete ev;
@@ -2916,9 +2965,9 @@ bool Listener::ProcessScriptEvent(Event& ev)
 
     if (!ev.eventnum) {
 #ifdef _DEBUG
-        EVENT_Printf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev.name, 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;
@@ -2963,6 +3012,8 @@ qboolean Listener::ProcessPendingEvents(void)
 
     t = EVENT_msec;
 
+    Listener::ProcessingEvents = true;
+
     event = Event::EventQueue.next;
     while (event != &Event::EventQueue) {
         Listener *obj;
@@ -2995,6 +3046,8 @@ qboolean Listener::ProcessPendingEvents(void)
         }
     }
 
+    Listener::ProcessingEvents = false;
+
     return processedEvents;
 }
 
@@ -3010,6 +3063,15 @@ Listener *Listener::GetScriptOwner(void)
     return NULL;
 }
 
+/*
+=======================
+SetScriptOwner
+=======================
+*/
+void Listener::SetScriptOwner(Listener* newOwner)
+{
+}
+
 #ifdef WITH_SCRIPT_ENGINE
 
 /*
@@ -3066,7 +3128,7 @@ BroadcastEvent
 */
 bool Listener::BroadcastEvent(const_str name, Event& event)
 {
-    ConList* listeners;
+    ConList *listeners;
 
     if (!m_NotifyList) {
         return false;
@@ -3090,10 +3152,10 @@ Broadcast an event to the notify list
 */
 bool Listener::BroadcastEvent(Event& event, ConList *listeners)
 {
-    Listener* listener;
-    int num = listeners->NumObjects();
-    int i;
-    bool found;
+    Listener *listener;
+    int       num = listeners->NumObjects();
+    int       i;
+    bool      found;
 
     if (!num) {
         return false;
@@ -3151,7 +3213,7 @@ CancelWaiting
 */
 void Listener::CancelWaiting(const_str name)
 {
-    ConList* list;
+    ConList *list;
 
     if (!m_WaitForList) {
         return;
@@ -3442,7 +3504,7 @@ void Listener::Unregister(const_str name)
     }
 
     for (int i = stoppedListeners.NumObjects(); i > 0; i--) {
-        Listener* listener = stoppedListeners.ObjectAt(i);
+        Listener *listener = stoppedListeners.ObjectAt(i);
 
         if (listener && !DisableListenerNotify) {
             listener->StoppedWaitFor(name, false);
@@ -3530,7 +3592,7 @@ UnregisterSource
 */
 bool Listener::UnregisterSource(const_str name, Listener *listener)
 {
-    ConList* list;
+    ConList *list;
 
     if (!m_NotifyList) {
         return false;
@@ -3568,7 +3630,7 @@ UnregisterTarget
 */
 bool Listener::UnregisterTarget(const_str name, Listener *listener)
 {
-    ConList* list;
+    ConList *list;
 
     if (!m_WaitForList) {
         return false;
@@ -4036,7 +4098,7 @@ ExecuteScriptInternal
 */
 void Listener::ExecuteScriptInternal(Event *ev, ScriptVariable& returnValue)
 {
-    ScriptThread* thread = CreateScriptInternal(ev->GetValue(1));
+    ScriptThread *thread = CreateScriptInternal(ev->GetValue(1));
 
     thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
@@ -4048,7 +4110,7 @@ ExecuteThreadInternal
 */
 void Listener::ExecuteThreadInternal(Event *ev, ScriptVariable& returnValue)
 {
-    ScriptThread* thread = CreateThreadInternal(ev->GetValue(1));
+    ScriptThread *thread = CreateThreadInternal(ev->GetValue(1));
 
     thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
@@ -4061,7 +4123,7 @@ WaitExecuteScriptInternal
 void Listener::WaitExecuteScriptInternal(Event *ev, ScriptVariable& returnValue)
 {
     ScriptThread *currentThread = Director.CurrentScriptThread();
-    ScriptThread *thread = CreateScriptInternal(ev->GetValue(1));
+    ScriptThread *thread        = CreateScriptInternal(ev->GetValue(1));
 
     thread->GetScriptClass()->Register(0, currentThread);
 
@@ -4076,7 +4138,7 @@ WaitExecuteThreadInternal
 void Listener::WaitExecuteThreadInternal(Event *ev, ScriptVariable& returnValue)
 {
     ScriptThread *currentThread = Director.CurrentScriptThread();
-    ScriptThread *thread = CreateThreadInternal(ev->GetValue(1));
+    ScriptThread *thread        = CreateThreadInternal(ev->GetValue(1));
 
     thread->Register(0, currentThread);
 
@@ -4131,11 +4193,11 @@ ScriptThread *Listener::CreateThreadInternal(const ScriptVariable& label)
 {
     GameScript   *scr;
     ScriptThread *thread = NULL;
-    ScriptClass* scriptClass;
+    ScriptClass  *scriptClass;
 
     if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
         scriptClass = Director.CurrentScriptClass();
-        scr = scriptClass->GetScript();
+        scr         = scriptClass->GetScript();
 
         if (label.GetType() == VARIABLE_CONSTSTRING) {
             thread = Director.CreateScriptThread(scr, this, label.constStringValue());
@@ -4328,3 +4390,24 @@ command_t::command_t(const char *name, byte t)
     : command(name)
     , type(t)
 {}
+
+bool operator==(const char* name, const command_t& command)
+{
+    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
+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 66d3d77e..c819bfda 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -90,7 +90,7 @@ class EventQueueNode;
 // are parsed.
 
 #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_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
@@ -242,23 +242,6 @@ public:
     friend bool operator==(const command_t& cmd1, const command_t& cmd2);
 };
 
-inline bool operator==(const char *name, const command_t& command)
-{
-    return !str::icmp(name, command.command);
-}
-
-#ifdef WITH_SCRIPT_ENGINE
-inline 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
-inline bool operator==(const command_t& cmd1, const command_t& cmd2)
-{
-    return (!str::icmp(cmd1.command, cmd2.command));
-}
-#endif
-
 class Event : public Class
 {
 public:
@@ -291,7 +274,6 @@ public:
 
     static EventQueueNode EventQueue;
 
-    static int totalevents;
     static int NumEventCommands();
 
     static void ListCommands(const char *mask = NULL);
@@ -310,7 +292,7 @@ public:
 
     virtual void ErrorInternal(Listener *l, str text) const;
 
-    static bool Exists(const char* command);
+    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);
@@ -378,55 +360,55 @@ public:
     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 CopyValues(const ScriptVariable *values, size_t count);
 
     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);
+    str             GetString(int pos) const;
+    str             GetToken(int pos) const;
+    ScriptVariable& GetValue(int pos) const;
     ScriptVariable& GetValue(void);
-    Vector          GetVector(int pos);
+    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;
 
-    int NumArgs();
+    int NumArgs() const;
 };
 
 #define NODE_CANCEL      1
 #define NODE_FIXED_EVENT 2
 
-class EventQueueNode
+class EventQueueNode : public LightClass
 {
 public:
     Event            *event;
@@ -438,13 +420,17 @@ public:
     EventQueueNode *next;
 
 #ifdef _DEBUG
-    str name;
+    const char *name;
 #endif
 
     EventQueueNode()
     {
         prev = this;
         next = this;
+
+#ifdef _DEBUG
+        name = NULL;
+#endif
     }
 
     Listener *GetSourceObject(void) { return m_sourceobject; }
@@ -471,6 +457,7 @@ public:
 #endif
 
     static bool EventSystemStarted;
+    static bool ProcessingEvents;
 
 private:
 #ifdef WITH_SCRIPT_ENGINE
@@ -495,6 +482,7 @@ public:
 #endif
 
     virtual Listener *GetScriptOwner(void);
+    virtual void SetScriptOwner(Listener *newOwner);
 
     Listener();
     virtual ~Listener();
@@ -514,9 +502,9 @@ public:
     qboolean PostponeAllEvents(float time);
     qboolean PostponeEvent(Event& ev, float time);
 
-    bool            ProcessEvent(const Event           &ev);
+    bool            ProcessEvent(const Event& ev);
     bool            ProcessEvent(Event *ev);
-    bool            ProcessEvent(Event           &ev);
+    bool            ProcessEvent(Event& ev);
     ScriptVariable& ProcessEventReturn(Event *ev);
 
     void ProcessContainerEvent(const Container<Event *>& conev);
@@ -650,7 +638,7 @@ extern MEM_BlockAlloc<Event> Event_allocator;
 // cgame dll specific defines
 //
 #    define EVENT_DebugPrintf cgi.DebugPrintf
-#    define EVENT_DPrintf     cgi.Printf
+#    define EVENT_DPrintf     cgi.DPrintf
 #    define EVENT_Printf      cgi.Printf
 #    define EVENT_time        (((float)cg.time / 1000.0f))
 #    define EVENT_msec        cg.time
@@ -662,7 +650,7 @@ extern MEM_BlockAlloc<Event> Event_allocator;
 #elif defined(UI_LIB)
 
 #    define EVENT_DebugPrintf Com_DebugPrintf
-#    define EVENT_DPrintf     Com_Printf
+#    define EVENT_DPrintf     Com_DPrintf
 #    define EVENT_Printf      Com_Printf
 #    define EVENT_time        (((float)cls.realtime / 1000.0f))
 #    define EVENT_msec        cls.realtime
@@ -676,7 +664,7 @@ extern MEM_BlockAlloc<Event> Event_allocator;
 // client specific defines
 //
 #    define EVENT_DebugPrintf Com_DebugPrintf
-#    define EVENT_DPrintf     Com_Printf
+#    define EVENT_DPrintf     Com_DPrintf
 #    define EVENT_Printf      Com_Printf
 #    define EVENT_time        (((float)cls.realtime / 1000.0f))
 #    define EVENT_msec        cls.realtime
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/memory.c b/code/qcommon/memory.c
index e28c3480..b1e0da47 100644
--- a/code/qcommon/memory.c
+++ b/code/qcommon/memory.c
@@ -25,15 +25,29 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "qcommon.h"
 
+#ifndef DEDICATED
+#  include "../client/client.h"
+#endif
+
 #define	ZONEID			0x7331
 #define ZONEID_CONST	0xC057
 
 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 {
@@ -44,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 ];
@@ -137,8 +151,12 @@ void Z_FreeTags( int tag )
 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 )
@@ -152,6 +170,10 @@ 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
@@ -166,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;
@@ -323,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
 }
 
 /*
@@ -364,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 );
@@ -400,8 +416,6 @@ void *Hunk_Alloc( int size, ha_pref preference) {
 	return ptr;
 }
 
-#endif
-
 /*
 =================
 Hunk_Clear
@@ -483,11 +497,21 @@ void Com_InitHunkMemory( void ) {
 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;
+#endif
+	void	*buf;
+	
+  //Z_CheckHeap ();	// DEBUG
 
-	ptr = Z_TagMalloc( size, TAG_GENERAL );
-	memset( ptr, 0, size );
+#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 ptr;
+	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 7376a01e..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
 	//
diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index f21b52fe..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,
@@ -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;
@@ -903,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
@@ -912,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;
@@ -944,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];
+	}
 }
 
 /*
@@ -1108,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;
 }
 
@@ -1121,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;
 }
 
 
@@ -1823,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;
@@ -2051,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 )
 	{
@@ -2066,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 )
@@ -2087,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 )
 	{
@@ -2103,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 )
 		{
@@ -2717,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;
 }
 
@@ -2726,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;
 }
 
@@ -2736,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;
 }
@@ -2917,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
@@ -2939,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)
 	{
@@ -2958,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?
 	{
@@ -2983,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;
@@ -3663,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
@@ -3818,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 )
@@ -3842,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 ] ) ) );
 }
@@ -3869,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;
 	}
@@ -4006,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
 	{
@@ -4054,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 )
 	{
@@ -4126,4 +4324,24 @@ float PointToSegmentDistanceSquared(const vec3_t origin, const vec3_t a, const v
 	}
 
     return VectorLengthSquared(final);
-}
\ No newline at end of file
+}
+
+/*
+=================
+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 50f18140..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,14 @@ 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
 
@@ -263,6 +298,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".dylib"
+#define EXE_EXT ""
 
 #endif
 
@@ -284,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
@@ -297,6 +353,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 
@@ -324,6 +381,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 
@@ -340,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
 
@@ -384,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);
@@ -392,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"
@@ -405,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 )
 
@@ -423,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 a435874b..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		"Allied Assault"
-#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"
@@ -79,6 +83,8 @@ extern "C" {
 
 #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
 
@@ -262,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;
 
@@ -421,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
@@ -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 );
@@ -1310,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.
@@ -1455,8 +1471,16 @@ typedef struct {
 
 #define SAVEGAME_STRUCT_VERSION 4
 
-typedef struct {
-	int version;
+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 ];
@@ -1632,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 )
 
@@ -1658,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
@@ -1695,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
@@ -1752,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;
@@ -1811,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 0c39924a..590d74e4 100644
--- a/code/qcommon/q_version.cmake
+++ b/code/qcommon/q_version.cmake
@@ -54,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 aceaafd7..7a4d720e 100644
--- a/code/qcommon/q_version.generated.h.in
+++ b/code/qcommon/q_version.generated.h.in
@@ -28,3 +28,4 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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 333a1d0a..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			61
+#define PRODUCT_VERSION_MINOR			82
 #define PRODUCT_VERSION_PATCH			0
-#define PRODUCT_VERSION_SUFFIX			"alpha"
+#define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 
 //
 // Generated version info
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 6fc4385a..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,    //
 };
 
 /*
@@ -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 );
@@ -937,6 +999,8 @@ 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
@@ -995,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;
@@ -1006,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;
@@ -1053,47 +1124,50 @@ temp file loading
 	#define ZONE_DEBUG
 #endif
 
-const char *Z_EmptyStringPointer( void );
-const char *Z_NumberStringPointer( int iNum );
-
-void *Z_TagMalloc(int size, int tag );
-void *Z_Malloc(int size );
+#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);
 
 
 /*
@@ -1113,8 +1187,10 @@ 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 );
@@ -1148,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
 
@@ -1209,6 +1288,7 @@ void Com_FakeUnpause();
 void Com_Pause_f();
 void SV_SoundCallback( int entnum, int channel_number, const char *name );
 
+int R_CountTextureMemory();
 /*
 ==============================================================
 
@@ -1382,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 */
@@ -1423,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 58ecb7f4..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.
 
@@ -90,9 +90,14 @@ public:
     str(const char ch);
     str(const int num);
     str(const float num);
-    str(const unsigned num);
-    str(const int64_t num);
-    str(const uint64_t 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;
@@ -291,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);
@@ -304,46 +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 int64_t num)
+inline str::str(const long num)
     : m_data(NULL)
 {
     char   text[64];
     size_t len;
 
-    sprintf(text, "%" PRId64 "", num);
+    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 uint64_t num)
+inline str::str(const unsigned long num)
     : m_data(NULL)
 {
     char   text[64];
     size_t len;
 
-    sprintf(text, "%" PRIu64 "", num);
+    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);
@@ -359,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;
@@ -377,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)
@@ -569,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);
@@ -609,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);
@@ -627,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);
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 c1b07304..194e9b13 100644
--- a/code/qcommon/tiki.h
+++ b/code/qcommon/tiki.h
@@ -33,6 +33,19 @@ class Archiver;
 #    include "../qcommon/str.h"
 #endif
 
+#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;
@@ -42,7 +55,7 @@ typedef struct {
 } tikiTriangle_t;
 
 typedef struct {
-    float st[2];
+    vec2_t st;
 } tikiSt_t;
 
 typedef struct {
@@ -51,8 +64,8 @@ typedef struct {
 } tikiXyzNormal_t;
 
 typedef struct {
-    float origin[3];
-    float axis[3][3];
+    vec3_t origin;
+    vec3_t axis[3];
 } tikiTagData_t;
 
 typedef struct {
@@ -81,7 +94,7 @@ typedef struct {
     int    frame_num;
     int    num_args;
     char **args;
-    char   location[256];
+    char   location[MAX_QPATH];
 } dloadframecmd_t;
 
 typedef struct {
@@ -90,8 +103,8 @@ typedef struct {
 } dloadinitcmd_t;
 
 typedef struct {
-    char  name[32];
-    char  shader[4][64];
+    char  name[MAX_NAME_LENGTH];
+    char  shader[MAX_TIKI_LOAD_SHADERS][MAX_RES_NAME];
     int   numskins;
     int   flags;
     float damage_multiplier;
@@ -99,15 +112,15 @@ typedef struct {
 
 typedef struct {
     char            *alias;
-    char             name[128];
-    char             location[256];
+    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[32];
-    dloadframecmd_t *loadclientcmds[128];
+    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;
@@ -120,23 +133,30 @@ typedef struct dloaddef_s {
     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 skelIndex_ld[MAX_TIKI_LOAD_SKEL_INDEX];
     int numanims;
     int numserverinitcmds;
     int numclientinitcmds;
 
-    char     headmodels[4096];
-    char     headskins[4096];
+    char     headmodels[MAX_TIKI_LOAD_HEADMODELS_LENGTH];
+    char     headskins[MAX_TIKI_LOAD_HEADSKINS_LENGTH];
     qboolean bIsCharacter;
 
     struct msg_s *modelBuf;
-    unsigned char modelData[8192];
+    unsigned char modelData[MAX_TIKI_LOAD_MODEL_BUFFER];
 
     qboolean bInIncludesSection;
+
+    // Added in 2.0
+    //====
+    char     idleSkel[MAX_QPATH];
+    int      numskels;
+    qboolean hasSkel;
+    //====
 } dloaddef_t;
 
 #endif
diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp
index 629866e4..f7589a57 100644
--- a/code/qcommon/tiki_main.cpp
+++ b/code/qcommon/tiki_main.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.
 
@@ -65,9 +65,9 @@ void TIKI_Message(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
-    Skel_DPrintf(msg);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -81,9 +81,9 @@ void TIKI_Warning(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
-    Skel_DPrintf(msg);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -97,9 +97,9 @@ void TIKI_Error(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
-    Skel_DPrintf(msg);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -220,3 +220,189 @@ dtikianim_t *TIKI_FillTIKIStructureSkel(dloaddef_t *ld)
 
     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 b0f63109..7230dad7 100644
--- a/code/qcommon/tiki_main.h
+++ b/code/qcommon/tiki_main.h
@@ -40,6 +40,7 @@ extern "C" {
     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
 }
diff --git a/code/qcommon/tiki_script.cpp b/code/qcommon/tiki_script.cpp
index 501ef5a7..ad865b9b 100644
--- a/code/qcommon/tiki_script.cpp
+++ b/code/qcommon/tiki_script.cpp
@@ -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/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 e4dfa120..49400ad3 100644
--- a/code/qcommon/vector.h
+++ b/code/qcommon/vector.h
@@ -604,17 +604,7 @@ inline float Vector::lengthXYSquared() const
 //----------------------------------------------------------------
 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);
 }
 
 //----------------------------------------------------------------
@@ -927,7 +917,7 @@ inline float Vector::toPitch(void) const
     float pitch;
 
     forward = (float)sqrt((x * x) + (y * y));
-    pitch = (float)((int)(atan2(z, forward) * 180.0f / M_PI));
+    pitch = (float)((int)(atan2(z, forward) * 180 / M_PI));
     if (pitch < 0.0f) {
         pitch += 360.0f;
     }
@@ -975,15 +965,15 @@ inline void Vector::AngleVectorsLeft(Vector *forward, Vector *left, Vector *up)
     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);
+    angle = yaw() * (M_PI * 2 / 360);
     sy    = sin(angle);
     cy    = cos(angle);
 
-    angle = pitch() * (M_PI * 2.0f / 360.0f);
+    angle = pitch() * (M_PI * 2 / 360);
     sp    = sin(angle);
     cp    = cos(angle);
 
-    angle = roll() * (M_PI * 2.0f / 360.0f);
+    angle = roll() * (M_PI * 2 / 360);
     sr    = sin(angle);
     cr    = cos(angle);
 
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 eb8c0e83..00000000
--- a/code/renderer/tr_backend.c
+++ /dev/null
@@ -1,1506 +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.05f);
-			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;
-		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);
-			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) || 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 );
-
-	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);
-}
-
-/*
-=============
-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 {
-		vec3_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;
-		GL_SetFogColor(vFogColor);
-
-		glState.externalSetState |= GLS_FOG;
-	}
-}
-
-/*
-=============
-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_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
-
-=============
-*/
-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 79cec179..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.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;
-}
-
-/*
-===============
-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];
-}
-
-/*
-===============
-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 ) {
-		lightmapNum = LIGHTMAP_BY_VERTEX;
-	}
-
-	if ( r_fullbright->integer || !tr.numLightmaps ) {
-		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 3333e12c..00000000
--- a/code/renderer/tr_image.c
+++ /dev/null
@@ -1,3195 +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 = GL_RGB;
-	}
-	// 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)
-	{
-		if ( textureFilterAnisotropic )
-			qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
-					(GLint)Com_Clamp( 1, maxAnisotropy, r_ext_max_anisotropy->integer ) );
-
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-	else
-	{
-		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 );
-	}
-
-	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;
-
-	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++) {
-		char filename[64];
-
-		Com_sprintf(filename, sizeof(filename), "*lightmapD%i", i);
-		tr.dlightImages[i] = R_CreateImage(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_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 963b302f..00000000
--- a/code/renderer/tr_init.c
+++ /dev/null
@@ -1,1573 +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;
-qboolean    textureFilterAnisotropic = qfalse;
-int         maxAnisotropy = 0;
-float       displayAspect = 0;
-qboolean    haveClampToEdge;
-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_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;
-
-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_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;
-
-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_ext_max_anisotropy = ri.Cvar_Get("r_ext_max_anisotropy", "2", 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_ARCHIVE | 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_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 = (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);
-    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);
-    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.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;
-
-	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 2e554c5f..00000000
--- a/code/renderer/tr_local.h
+++ /dev/null
@@ -1,2404 +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;
-    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;
-
-	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;
-	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;
-
-    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];
-	// added in 2.0
-	//==
-    qboolean skybox_farplane;
-    qboolean render_terrain;
-	//==
-
-} 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
-    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[5];
-	vec3_t		visBounds[2];
-	float		zFar;
-	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;
-
-
-/*
-==============================================================================
-
-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	21 // was 22, decreased in 2.0
-#define	QSORT_ENTITYNUM_SHIFT	8
-#define	QSORT_FOGNUM_SHIFT		2
-#define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.0
-
-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;
-
-	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;
-
-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_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;
-
-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_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;
-
-//====================================================================
-
-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_COLOR_MASK							0x00000200
-#define GLS_POLYMODE_LINE						0x00000400
-#define GLS_DEPTHTEST_DISABLE					0x00000800
-#define GLS_DEPTHFUNC_EQUAL						0x00001000
-
-#define GLS_CLAMP_EDGE							0x00002000
-#define GLS_MULTITEXTURE						0x00004000
-#define GLS_MULTITEXTURE_ENV					0x00008000
-#define GLS_FOG									0x00010000
-
-#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							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 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_ClearRealDlights();
-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_AddTerrainMarkSurfaces();
-void R_InitTerrain();
-void R_TerrainPrepareFrame();
-qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
-
-/*
-=============================================================
-
-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_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_PrintInfoWorldtris(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);
-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);
-
-/*
-=============================================================
-=============================================================
-*/
-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 R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
-void R_AddSpriteSurfCmd( drawSurf_t* drawSurfs, int numDrawSurfs );
-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 1fadb640..00000000
--- a/code/renderer/tr_main.c
+++ /dev/null
@@ -1,1929 +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.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
-=================
-*/
-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 (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 < 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.viewParms.isPortalSky)
-        {
-			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.viewParms.isPortalSky) {
-		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.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
-		);
-	}
-}
-
-/*
-================
-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 19a4514e..00000000
--- a/code/renderer/tr_model.cpp
+++ /dev/null
@@ -1,1701 +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;
-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), !(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) {
-	// FIXME: unimplemented
-#if 0
-	int i;
-	dtiki_t		*tiki;
-	skeletor_c	*skeletor;
-
-	tiki = R_Model_GetHandle( ent->e.hModel );
-	skeletor = ( skeletor_c * )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 < 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
-}
-
-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 );
-		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 ) + tiki->m_boneList.NumChannels() * 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 * )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;
-}
-
-/*
-=============
-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[1000];
-
-	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 = 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;
-
-    bones = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
-    morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
-
-	if (render_count == sf->numVerts)
-	{
-		for (i = 0; i < indexes; i++) {
-			tess.indexes[baseIndex + i] = baseVertex + triangles[i];
-		}
-
-		tess.numIndexes += indexes;
-	}
-	else
-    {
-        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)
-        {
-            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]];
-        }
-        tess.numIndexes += i;
-    }
-
-	//
-	// just copy the vertexes
-	//
-	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 );
-
-		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 );
-
-        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;
-}
-
-/*
-=============
-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) {
-    // FIXME: unimplemented
-#if 0
-	int i;
-	trRefEntity_t *ent;
-	model_t *model;
-
-	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_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 = 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 65134dcc..00000000
--- a/code/renderer/tr_scene.c
+++ /dev/null
@@ -1,546 +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_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/renderer/tr_shade.c b/code/renderer/tr_shade.c
deleted file mode 100644
index 24ca74b3..00000000
--- a/code/renderer/tr_shade.c
+++ /dev/null
@@ -1,1831 +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] );
-
-/*
-	// 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
-	//
-	GL_SelectTexture( 1 );
-	qglEnable( GL_TEXTURE_2D );
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	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( 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 | (tess.xstages[0]->stateBits & (GLS_ATEST_BITS | GLS_FOG_BITS)));
-	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 25fa315c..00000000
--- a/code/renderer/tr_shader.c
+++ /dev/null
@@ -1,3497 +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;
-	}
-	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;
-}
-
-
-/*
-===============
-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 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
-			{
-				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 );
-			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 ) {
-                    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++;
-				}
-			}
-		}
-		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_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, 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>
-		//
-		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[0].active || !stage[1].active) {
-			continue;
-		}
-
-		if (stage->multitextureEnv) {
-			continue;
-		}
-
-		// 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;
-			}
-		}
-
-		abits = stage[0].stateBits;
-		bbits = stage[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))
-            && (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;
-		}
-
-		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] = 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)--;
-	}
-}
-
-/*
-=============
-
-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;
-			}
-		}
-
-		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 = 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_WARNING, "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 58aab6b2..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 || tr.farclip ) {
-		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 66d88b98..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.viewParms.isPortalSky = qfalse;
-	tr.portalsky.numSurfs = 0;
-}
-
-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;
-}
-
-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];
-			}
-		}
-	}
-}
-
-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)
-	{
-		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.viewParms.isPortalSky = qtrue;
-    VectorCopy(newParms.ori.origin, newParms.pvsOrigin);
-
-    leaf = R_PointInLeaf(newParms.pvsOrigin);
-    if (leaf) {
-        R_RenderView(&newParms);
-    }
-
-    tr.viewParms = oldParms;
-
-	tr.viewParms.isPortalSky = 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_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
deleted file mode 100644
index 03ac0b85..00000000
--- a/code/renderer/tr_staticmodels.cpp
+++ /dev/null
@@ -1,644 +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]);
-
-
-	//
-	// 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];
-        }
-        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]];
-        }
-        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 e79816b8..00000000
--- a/code/renderer/tr_util.cpp
+++ /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_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;
-}
-
-/*
-===============
-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/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 275fd68b..47040bc3 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -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,7 +160,7 @@ 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);
@@ -172,6 +172,9 @@ typedef struct {
     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;
 
 //
@@ -263,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);
@@ -284,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 a76a2d7c..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)
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 93%
rename from code/renderer/tr_draw.c
rename to code/renderergl1/tr_draw.c
index 251dd227..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);
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/renderer/tr_sphere_shade.cpp b/code/renderergl1/tr_sphere_shade.cpp
similarity index 85%
rename from code/renderer/tr_sphere_shade.cpp
rename to code/renderergl1/tr_sphere_shade.cpp
index b0e0fdb3..baf1bec2 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderergl1/tr_sphere_shade.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.
 
@@ -72,22 +72,49 @@ static vec3_t offsets[26] = {
 
 int compare_light_intensities(const void *p1, const void *p2)
 {
-    return ((const reallightinfo_t *)p2)->fIntensity - ((const reallightinfo_t *)p1)->fIntensity;
+    return *(int *)&((const reallightinfo_t *)p2)->fIntensity - *(int *)&((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;
+    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,
@@ -110,6 +137,7 @@ static void RB_OptimizeLights()
             nCubeMapLights = 0;
         }
     }
+#endif
 
     backEnd.currentSphere->bUsesCubeMap = nCubeMapLights > 0;
     if (backEnd.currentSphere->bUsesCubeMap) {
@@ -134,7 +162,7 @@ static void RB_OptimizeLights()
                             float fDistSquared;
 
                             VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
-                            fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                            fProjSquared  = Square(DotProduct(v, pLight->vDirection));
                             fDistSquared  = VectorLengthSquared(v);
                             fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
                             if (fMaxIntensity > 0) {
@@ -180,20 +208,9 @@ static void RB_OptimizeLights()
                 }
             }
 
-            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;
-            }
+            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;
@@ -232,24 +249,24 @@ static void RB_OptimizeLights()
             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;
+            fDistPerp      = sqrt(fDistSquared - Square(fSlope));
+            fRadiusSquared = Square(backEnd.currentSphere->radius);
             fDistParallel  = fDistPerp + fSlope * (pLight->fSpotSlope * 0.9f);
-            if (fDistParallel * fDistParallel
-                >= fRadiusSquared + pLight->fSpotSlope * 0.9f * (pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
+            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->color[0] *= 1.f / pLight->fDist;
-                pLight->color[1] *= 1.f / pLight->fDist;
-                pLight->color[2] *= 1.f / pLight->fDist;
                 pLight->eType = LIGHT_DIRECTIONAL;
+
+                VectorScale(pLight->color, 1.0f / pLight->fDist, pLight->color);
                 VectorNormalize2(pLight->vOrigin, pLight->vDirection);
             }
             break;
+        default:
+            break;
         }
     }
 }
@@ -304,11 +321,11 @@ static void RB_Light_CubeMap(unsigned char *colors)
 
         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];
+            (*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[1] + (*cube)[1][2] * mapping[1] + (*cube)[1][3] * mapping[2];
+            (*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[1] + (*cube)[2][2] * mapping[1] + (*cube)[2][3] * mapping[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;
@@ -363,9 +380,10 @@ static void RB_Light_CubeMap(unsigned char *colors)
             }
         }
 
-        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);
+        color[0] = Q_min(colorout[0], 255);
+        color[1] = Q_min(colorout[1], 255);
+        color[2] = Q_min(colorout[2], 255);
+        color[3] = 0xff;
     }
 }
 
@@ -422,7 +440,7 @@ void RB_Light_Real(unsigned char *colors)
                     if (fDot > 0) {
                         VectorSubtract(pLight->vOrigin, xyz, v);
 
-                        fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                        fProjSquared  = Square(DotProduct(v, pLight->vDirection));
                         fDistSquared  = VectorLengthSquared(v);
                         fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
                         if (fMaxIntensity > 0) {
@@ -499,7 +517,7 @@ void RB_Light_Real(unsigned char *colors)
                 if (fDot > 0) {
                     VectorSubtract(pLight->vOrigin, xyz, v);
 
-                    fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                    fProjSquared  = Square(DotProduct(v, pLight->vDirection));
                     fDistSquared  = VectorLengthSquared(v);
                     fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
                     if (fMaxIntensity > 0) {
@@ -582,13 +600,13 @@ static void RB_Sphere_Light_Sun()
         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) {
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
                 break;
             }
 
-            leaf = backEnd.currentSphere->leaves[curleaf];
-            if (!leaf) {
+            if (leaf->numlights && leaf->lights[0] == &tr.sSunLight) {
                 break;
             }
         }
@@ -630,7 +648,9 @@ static void RB_Sphere_Light_Sun()
     }
 
     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);
+    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) {
@@ -680,10 +700,9 @@ static void RB_Sphere_Light_Sun()
 
         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;
+        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;
@@ -735,8 +754,9 @@ static bool RB_Sphere_SetupGlobals()
         backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
         return false;
     }
+
     if (backEnd.refdef.rdflags & RDF_HUD) {
-        if (backEnd.refdef.vieworg[0] == 0 && backEnd.refdef.vieworg[1] == 0 && backEnd.refdef.vieworg[2] == 0) {
+        if (!backEnd.refdef.vieworg[0] && !backEnd.refdef.vieworg[1] && !backEnd.refdef.vieworg[2]) {
             backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
             return false;
         }
@@ -785,27 +805,10 @@ static bool RB_Sphere_ResetPointColors()
         }
     }
 
-    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];
-    }
-
+    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;
@@ -924,43 +927,39 @@ static void RB_Sphere_AddSpotLight(const spherel_t *thislight)
         float            fRadByDistSquared;
 
         MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, newdir);
-        dot = DotProduct(newlight, 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)
+                Square(newlight[0] + newdir[0] * dot) + Square(newlight[1] + newdir[1] * dot)
+                + Square(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);
+            if (fMinDist < radiusByDistance * dot && backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
 
-                    sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
-                    if (sampleRadius > 0) {
-                        pLight->fIntensity /= (sampleRadius * sampleRadius);
-                    }
+                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);
 
-                    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++;
+                sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
+                if (sampleRadius > 0) {
+                    pLight->fIntensity /= (sampleRadius * sampleRadius);
                 }
 
-                RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+                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);
         }
     }
 }
@@ -1008,17 +1007,18 @@ static void RB_Sphere_AddLight(const spherel_t *thislight)
         MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
         VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
 
-        intensity = thislight->intensity * 7500.0;
+        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);
-                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;
+                fDist = VectorLength(newlight);
+                VectorScale(
+                    thislight->color, falloff * tr.overbrightMult * r_entlight_scale->value * fDist, pLight->color
+                );
 
                 VectorCopy(lightline, pLight->vOrigin);
                 pLight->fDist      = fDist;
@@ -1047,11 +1047,16 @@ static void RB_Sphere_BuildStaticLights()
     if (tr.world->vis) {
         int cntarea;
 
-        for (curleaf = 0, leaf = backEnd.currentSphere->leaves[curleaf]; curleaf < 8 && leaf; curleaf++, leaf++) {
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
             cntarea = leaf->numlights;
 
             if (cntarea) {
-                for (i = (*leaf->lights == &tr.sSunLight ? 1 : 0); i < cntarea; i++) {
+                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];
 
@@ -1168,13 +1173,18 @@ 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;
 
-    ents                 = ri.CM_EntityString();
-    bFlareDirSet         = qfalse;
     s_sun.szFlareName[0] = 0;
     s_sun.exists         = qfalse;
 
-    for (int i = 0; i < 128; i++) {
+    for (int i = 0; i < MAX_SPHERE_LIGHTS; i++) {
         backEnd.spheres[i].TessFunction = &RB_Light_Real;
     }
 
@@ -1191,7 +1201,27 @@ void R_Sphere_InitLights()
             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;
@@ -1200,6 +1230,11 @@ void R_Sphere_InitLights()
         } 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);
 
@@ -1212,14 +1247,30 @@ void R_Sphere_InitLights()
         } 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")) {
-            strcpy(s_sun.szFlareName, COM_Parse((char **)&ents));
+            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;
@@ -1230,10 +1281,8 @@ void R_Sphere_InitLights()
         }
     }
 
-    if (s_sun.exists) {
-        if (!s_sun.szFlareName[0]) {
-            strcpy(s_sun.szFlareName, "sun");
-        }
+    if (s_sun.exists && !s_sun.szFlareName[0]) {
+        Q_strncpyz(s_sun.szFlareName, "sun", sizeof(s_sun.szFlareName));
     }
 }
 
@@ -1367,18 +1416,16 @@ int R_GatherLightSources(const vec3_t vPos, vec3_t *pvLightPos, vec3_t *pvLightI
     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 (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;
-                }
+            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;
             }
         }
     }
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_image.c b/code/renderergl2/new/tr_image.c
deleted file mode 100644
index c8106ae3..00000000
--- a/code/renderergl2/new/tr_image.c
+++ /dev/null
@@ -1,23 +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"
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 e76d5aa5..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();
diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 49b80eea..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;
 }
@@ -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();
 }
 
@@ -252,7 +252,7 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
     unsigned int index;
     sval_t       listener_val;
     const char  *name = lhs.node[2].stringValue;
-    str name_lowered;
+    //str name_lowered;
 
     if (lhs.node[0].type != ENUM_field) {
         if (lhs.node[0].type == ENUM_array_expr) {
@@ -265,22 +265,22 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
         return;
     }
 
-    name_lowered = name;
-    name_lowered.tolower();
-    index    = Director.AddString(name_lowered);
-    eventnum = Event::FindSetterEventNum(name_lowered);
+    //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)
@@ -394,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)
@@ -477,7 +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;
-    str name_lowered;
+    const  char* name;
+    //str name_lowered;
 
     /*
     if (field_val.node[0].stringValue) {
@@ -494,24 +495,25 @@ void ScriptCompiler::EmitField(sval_t listener_val, sval_t field_val, unsigned i
     }
     */
 
-    name_lowered = field_val.stringValue;
-    name_lowered.tolower();
-    index    = Director.AddString(name_lowered);
-    eventnum = Event::FindGetterEventNum(name_lowered);
+    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);
     }
 }
@@ -643,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));
     }
 }
 
@@ -797,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)
@@ -905,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));
     }
 }
 
@@ -952,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) {
@@ -964,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)
@@ -989,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)
@@ -1119,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;
         }
 
@@ -1159,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;
         }
 
@@ -1206,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;
 
@@ -1255,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:
@@ -1444,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;
@@ -1490,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();
 
@@ -1508,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();
 
@@ -1524,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");
@@ -1563,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)
@@ -1611,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)
 {
diff --git a/code/script/scriptcompiler.h b/code/script/scriptcompiler.h
index 0dce5227..42203b01 100644
--- a/code/script/scriptcompiler.h
+++ b/code/script/scriptcompiler.h
@@ -32,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;
@@ -89,7 +77,7 @@ public:
     void Reset();
 
     unsigned char PrevOpcode();
-    char          PrevVarStackOffset();
+    signed char   PrevVarStackOffset();
     void          AbsorbPrevOpcode();
     void          ClearPrevOpcode();
     void          AccumulatePrevOpcode(int opcode, int iVarStackOffset);
@@ -163,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);
 
@@ -172,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);
 
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 3d67715f..b48aa931 100644
--- a/code/script/scriptexception.h
+++ b/code/script/scriptexception.h
@@ -48,4 +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
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 f079cae7..943f2832 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.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.
 
@@ -104,7 +104,7 @@ void ScriptArrayHolder::Archive(Archiver& arc, ScriptArrayHolder *& arrayValue)
         arrayValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&arrayValue);
+        arc.ArchiveObjectPointer((LightClass **)&arrayValue);
     }
 }
 
@@ -114,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);
     }
 }
@@ -142,7 +142,7 @@ void ScriptConstArrayHolder::Archive(Archiver& arc, ScriptConstArrayHolder *& co
         constArrayValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&constArrayValue);
+        arc.ArchiveObjectPointer((LightClass **)&constArrayValue);
     }
 }
 
@@ -171,7 +171,7 @@ void ScriptPointer::Archive(Archiver& arc, ScriptPointer *& pointerValue)
         pointerValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&pointerValue);
+        arc.ArchiveObjectPointer((LightClass **)&pointerValue);
     }
 }
 
@@ -194,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)
@@ -254,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:
@@ -281,6 +281,21 @@ 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()
@@ -292,9 +307,9 @@ ScriptConstArrayHolder::ScriptConstArrayHolder(ScriptVariable *pVar, unsigned in
     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];
     }
 }
@@ -304,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()
@@ -317,8 +332,7 @@ ScriptConstArrayHolder::ScriptConstArrayHolder()
 ScriptConstArrayHolder::~ScriptConstArrayHolder()
 {
     if (constArrayValue) {
-        ScriptVariable *const offset = constArrayValue + 1;
-        delete[] offset;
+        delete[] constArrayValue;
     }
 }
 
@@ -436,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;
@@ -449,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;
 
@@ -460,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);
@@ -469,7 +482,7 @@ void ScriptVariable::CastConstArrayValue(void)
 
     default:
         constArrayValue                     = new ScriptConstArrayHolder(1);
-        constArrayValue->constArrayValue[1] = *this;
+        constArrayValue->constArrayValue[0] = *this;
 
         break;
     }
@@ -581,7 +594,7 @@ void ScriptVariable::ClearPointerInternal() const
 
 const char *ScriptVariable::GetTypeName() const
 {
-    return typenames[type];
+    return typenames[GetType()];
 }
 
 variabletype ScriptVariable::GetType() const
@@ -591,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)
@@ -623,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
@@ -890,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
@@ -952,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:
@@ -1007,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()]);
     }
 }
 
@@ -1031,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()]);
     }
 }
 
@@ -1050,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;
@@ -1060,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);
@@ -1070,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()]);
     }
 }
 
@@ -1297,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;
@@ -1350,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;
@@ -1439,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;
@@ -1500,9 +1546,10 @@ void ScriptVariable::operator+=(const ScriptVariable& value)
     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 )
-    case VARIABLE_CONSTSTRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		+		( vector )
+        + VARIABLE_LISTENER                *VARIABLE_MAX: // ( const string )		+		( listener )
+    case VARIABLE_STRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( string )			+		( vector )
+    case VARIABLE_CONSTSTRING
+        + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		+		( vector )
         setStringValue(stringValue() + value.stringValue());
         break;
 
@@ -1514,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;
@@ -1548,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;
@@ -1598,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;
@@ -1694,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;
@@ -1807,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;
@@ -1827,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;
@@ -1847,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;
@@ -1867,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;
@@ -1887,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;
@@ -1912,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();
@@ -1943,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 )
@@ -1960,8 +2018,9 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
         + VARIABLE_STRING                 *VARIABLE_MAX: // ( int )				==		( string )
     case VARIABLE_FLOAT + VARIABLE_STRING *VARIABLE_MAX: // ( float )			==		( string )
     case VARIABLE_CHAR
-        + VARIABLE_STRING                       *VARIABLE_MAX: // ( char )				==		( string )
-    case VARIABLE_CONSTSTRING + VARIABLE_STRING *VARIABLE_MAX: // ( const string )		==		( string )
+        + 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 )
@@ -1985,9 +2044,10 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
     case VARIABLE_CONSTSTRING + VARIABLE_CHAR    *VARIABLE_MAX: // ( const string )		==		( char )
     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 )
-    case VARIABLE_CONSTSTRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		==		( vector )
+        + VARIABLE_LISTENER                *VARIABLE_MAX: // ( const string )		==		( listener )
+    case VARIABLE_STRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( string )			==		( vector )
+    case VARIABLE_CONSTSTRING
+        + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		==		( vector )
         {
             str lval = stringValue();
             str rval = value.stringValue();
@@ -1999,7 +2059,7 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
         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;
     }
 }
 
@@ -2181,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()]);
@@ -2190,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*()
@@ -2212,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()]
         );
 
@@ -2242,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()]
         );
 
@@ -2290,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()]
         );
 
@@ -2329,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()]
         );
 
@@ -2568,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 92d349c7..49056942 100644
--- a/code/script/scriptvariable.h
+++ b/code/script/scriptvariable.h
@@ -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);
@@ -235,6 +231,12 @@ public:
 
     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 : public LightClass
@@ -293,6 +295,8 @@ class con_set_Entry<short3, ScriptVariable>
 
 private:
     con_set_Entry *next;
+
+public:
     ScriptVariable value;
 
 public:
@@ -318,8 +322,6 @@ public:
 
     ScriptVariableList();
 
-    void Archive(Archiver& arc) override;
-
     void ClearList(void);
 
     ScriptVariable *GetOrCreateVariable(str name);
@@ -338,6 +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
diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index ce0e0247..4d923640 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -79,6 +79,7 @@ ScriptVMStack::ScriptVMStack()
     : localStack(nullptr)
     , stackBottom(nullptr)
     , pTop(nullptr)
+    , m_bMarkStack(false)
 {}
 
 ScriptVMStack::ScriptVMStack(size_t stackSize)
@@ -157,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);
 }
 
@@ -210,23 +213,27 @@ 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;
 }
@@ -305,7 +312,6 @@ ScriptVM::ScriptVM()
     m_pOldData    = NULL;
     m_OldDataSize = 0;
 
-    m_bMarkStack = false;
     m_StackPos   = NULL;
 }
 
@@ -333,7 +339,6 @@ ScriptVM::ScriptVM(ScriptClass *scriptClass, unsigned char *pCodePos, ScriptThre
     m_pOldData    = NULL;
     m_OldDataSize = 0;
 
-    m_bMarkStack = false;
     m_StackPos   = NULL;
 
     m_ScriptClass->AddThread(this);
@@ -412,10 +417,10 @@ 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");
 }
 
@@ -536,6 +541,8 @@ void ScriptVM::executeCommandInternal<false>(
 )
 {
     transferVarsToEvent(ev, fromVar, iParamCount);
+
+    checkValidEvent(ev, listener);
     listener->ProcessScriptEvent(ev);
 }
 
@@ -547,6 +554,7 @@ void ScriptVM::executeCommandInternal<true>(
     transferVarsToEvent(ev, fromVar, iParamCount);
 
     try {
+        checkValidEvent(ev, listener);
         listener->ProcessScriptEvent(ev);
     } catch (...) {
         m_VMStack.GetTop().Clear();
@@ -590,6 +598,20 @@ void ScriptVM::transferVarsToEvent(Event& ev, ScriptVariable *fromVar, op_parmNu
     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);
+        }
+    }
+}
+
 bool ScriptVM::executeGetter(Listener *listener, op_evName_t eventName)
 {
     int eventNum = Event::FindGetterEventNum(eventName);
@@ -682,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);
                 }
@@ -1002,7 +1024,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
     Event           ev;
     ScriptVariable *var = NULL;
 
-    ConSimple *targetList;
+    TargetList *targetList;
 
     if (Director.stackCount >= MAX_STACK_DEPTH) {
         state = STATE_EXECUTION;
@@ -1035,9 +1057,6 @@ 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) {
@@ -1054,34 +1073,8 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
         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();
-
-                    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");
-                }
-
-                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)
@@ -1541,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");
                 }
 
@@ -1549,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:
@@ -1564,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:
@@ -1590,6 +1584,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                         }
                     } catch (...) {
                         skipField();
+                        m_VMStack.GetTop().Clear();
                         throw;
                     }
 
@@ -1616,6 +1611,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                     }
                 } catch (...) {
                     skipField();
+                    m_VMStack.GetTop().Clear();
                     throw;
                 }
 
@@ -1670,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");
                 }
@@ -1690,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");
                 }
@@ -1719,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");
                 }
 
@@ -1791,22 +1787,29 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_UN_TARGETNAME:
                 // retrieve the target name
-                targetList = world->GetExistingTargetList(m_VMStack.GetTop().constStringValue());
+                if (world) {
+                    targetList = world->GetExistingTargetList(m_VMStack.GetTop().stringValue());
+                } else {
+                    // Added in OPM
+                    //  don't use the target list if the world is NULL
+                    targetList = NULL;
+                }
 
-                if (!targetList || !targetList->NumObjects()) {
+                if (!targetList || !targetList->list.NumObjects()) {
+                    str targetname = m_VMStack.GetTop().stringValue();
                     // the target name was not found
                     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.", m_VMStack.GetTop().stringValue().c_str());
+                    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->NumObjects() == 1) {
+                } else if (targetList->list.NumObjects() == 1) {
                     // single listener
-                    m_VMStack.GetTop().setListenerValue(targetList->ObjectAt(1));
-                } else if (targetList->NumObjects() > 1) {
+                    m_VMStack.GetTop().setListenerValue(targetList->list.ObjectAt(1));
+                } else if (targetList->list.NumObjects() > 1) {
                     // multiple listeners
-                    m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)targetList);
+                    m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)&targetList->list);
                 }
                 break;
 
@@ -1824,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);
         }
@@ -1869,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) {
diff --git a/code/script/scriptvm.h b/code/script/scriptvm.h
index 2d74153a..ece0af2f 100644
--- a/code/script/scriptvm.h
+++ b/code/script/scriptvm.h
@@ -123,7 +123,12 @@ private:
     /** 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
@@ -159,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:
@@ -172,6 +177,7 @@ 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);
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 464ecb04..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,13 @@ 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				challenge;
     int				serverIdAcknowledge;
 
 	usercmd_t		lastUsercmd;
@@ -151,21 +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				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,8 +202,17 @@ 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;
@@ -198,7 +227,7 @@ typedef struct client_s {
     int lastVisCheckTime[MAX_CLIENTS];
 
 #ifdef LEGACY_PROTOCOL
-    qboolean		compat;
+	qboolean		compat;
 #endif
 } client_t;
 
@@ -208,7 +237,11 @@ 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
 
@@ -227,117 +260,130 @@ typedef enum {
 
 typedef struct {
 	netadr_t	adr;
-    int				challenge;
-    int				clientChallenge;		// challenge number coming from the client
-    int				time;				// time the last packet was sent to the autherize server
-    int				pingTime;			// time the challenge response was sent to client
-    int				firstTime;			// time the adr was first used, for authorize timeout checks
-    qboolean		wasrefused;
-    qboolean		connected;
+	int			challenge;
+	int			clientChallenge;		// challenge number coming from the client
+	int			time;				// time the last packet was sent to the autherize server
+	int			pingTime;			// time the challenge response was sent to client
+	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
-{
+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_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	*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	*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_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
@@ -351,6 +397,7 @@ extern	cvar_t	*sv_voip;
 extern	cvar_t	*sv_voipProtocol;
 #endif
 
+
 //===========================================================
 
 //
@@ -378,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);
@@ -391,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 );
@@ -439,13 +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
 //
-challenge_t* FindChallenge(netadr_t from, qboolean connecting);
-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 );
 
@@ -455,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
 //
@@ -472,6 +526,7 @@ 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);
@@ -524,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
 
@@ -573,17 +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();
-void SV_ProcessGamespyQueries();
-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 5913d2c5..a5f978f2 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -23,11 +23,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "server.h"
 
 #ifndef DEDICATED
-#  include "../client/client.h"
-#  include "../client/snd_local.h"
-#  include "../uilib/ui_public.h"
+#    include "../client/client.h"
+#    include "../client/snd_local.h"
+#    include "../uilib/ui_public.h"
 #endif
 
+#include "../sys/win_localization.h"
+
 /*
 ===============================================================================
 
@@ -186,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;
@@ -235,9 +242,9 @@ static void SV_Map_f( void ) {
 
 	Cvar_SaveGameRestart_f();
 
-    //
-    // in 2.0 and above, ignore training / mohaa mission maps
-    //
+	//
+	// 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) {
@@ -284,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;
@@ -296,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;
 	}
 }
@@ -335,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 ) {
@@ -342,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") ) {
@@ -380,7 +393,25 @@ 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
 }
 /*
@@ -418,11 +449,12 @@ static void SV_KickAll_f( void ) {
 ==================
 SV_KickNum_f
 
-Kick a user off of the server
+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 ) {
@@ -430,8 +462,8 @@ static void SV_KickNum_f( void ) {
 		return;
 	}
 
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf ("Usage: %s <client number>\n", Cmd_Argv(0));
+	if ( Cmd_Argc() < 2 ) {
+		Com_Printf ("Usage: %s <client number> [reason]\n", Cmd_Argv(0));
 		return;
 	}
 
@@ -444,7 +476,30 @@ static void SV_KickNum_f( void ) {
 		return;
 	}
 
-	SV_DropClient( cl, "was kicked" );
+	// 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
 }
 
@@ -500,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);
@@ -554,7 +609,7 @@ 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);
@@ -573,7 +628,7 @@ static void SV_RehashBans_f(void)
 {
 	int index, filelen;
 	fileHandle_t readfrom;
-	char *textbuf, *curpos, *maskpos, *newlinepos, *endpos;
+	char *textbuf, *curpos, *maskpos, *newlinepos, *endpos, *reasonpos;
 	char filepath[MAX_QPATH];
 	
 	// make sure server is running
@@ -616,12 +671,29 @@ static void SV_RehashBans_f(void)
 			maskpos++;
 			
 			// find the end of the subnet specifier
-			for(newlinepos = maskpos; newlinepos < endpos && *newlinepos != '\n'; newlinepos++);
+			for(newlinepos = maskpos; newlinepos < endpos && *newlinepos != '\n' && *newlinepos != ':'; newlinepos++);
 			
 			if(newlinepos >= endpos)
 				break;
 			
-			*newlinepos = '\0';
+			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))
 			{
@@ -669,15 +741,21 @@ static void SV_WriteBans(void)
 
 	if((writeto = FS_SV_FOpenFileWrite(filepath)))
 	{
-		char writebuf[128];
+		char writebuf[128 + MAX_REASON_LENGTH];
 		serverBan_t *curban;
 		
 		for(index = 0; index < serverBansCount; index++)
 		{
 			curban = &serverBans[index];
 			
-			Com_sprintf(writebuf, sizeof(writebuf), "%d %s %d\n",
-				    curban->isexception, NET_AdrToString(curban->ip), curban->subnet);
+			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);
 		}
 
@@ -764,11 +842,14 @@ 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" );
@@ -777,9 +858,9 @@ static void SV_AddBanToList(qboolean isexception)
 
 	argc = Cmd_Argc();
 	
-	if(argc < 2 || argc > 3)
+	if ( argc < 2 )
 	{
-		Com_Printf ("Usage: %s (ip[/subnet] | clientnum [subnet])\n", Cmd_Argv(0));
+		Com_Printf ("Usage: %s (ip[/subnet] | clientnum [subnet] [reason])\n", Cmd_Argv(0));
 		return;
 	}
 
@@ -791,10 +872,14 @@ static void SV_AddBanToList(qboolean isexception)
 
 	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, ':'))
 	{
-		// This is an ip address, not a client num.
-		
+		// IP address ban 
+		if(argc >= 3) {
+			reason = Cmd_ArgsFrom(2);
+		}
+
 		if(SV_ParseCIDRNotation(&ip, &mask, banstring))
 		{
 			Com_Printf("Error: Invalid address %s\n", banstring);
@@ -803,13 +888,10 @@ static void SV_AddBanToList(qboolean isexception)
 	}
 	else
 	{
-		client_t *cl;
-		
-		// client num.
-		
+		// client num ban
 		cl = SV_GetPlayerByNum();
 
-		if(!cl)
+		if ( !cl )
 		{
 			Com_Printf("Error: Playernum %s does not exist.\n", Cmd_Argv(1));
 			return;
@@ -817,23 +899,45 @@ static void SV_AddBanToList(qboolean isexception)
 		
 		ip = cl->netchan.remoteAddress;
 		
-		if(argc == 3)
+		if(argc >= 3)
 		{
-			mask = atoi(Cmd_Argv(2));
-			
-			if(ip.type == NA_IP)
-			{
-				if(mask < 1 || mask > 32)
-					mask = 32;
+			// 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;
+				}
 			}
-			else
-			{
-				if(mask < 1 || mask > 128)
-					mask = 128;
+			
+			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
+		else {
 			mask = (ip.type == NA_IP6) ? 128 : 32;
+		}
 	}
 
 	if(ip.type != NA_IP && ip.type != NA_IP6)
@@ -889,12 +993,47 @@ static void SV_AddBanToList(qboolean isexception)
 	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();
 
-	Com_Printf("Added %s: %s/%d\n", isexception ? "ban exception" : "ban",
-		   NET_AdrToString(ip), mask);
+	// 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 : "");
 }
 
 /*
@@ -1016,8 +1155,14 @@ static void SV_ListBans_f(void)
 		{
 			count++;
 
-			Com_Printf("Ban #%d: %s/%d\n", count,
-				    NET_AdrToString(ban->ip), ban->subnet);
+			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
@@ -1028,8 +1173,14 @@ static void SV_ListBans_f(void)
 		{
 			count++;
 
-			Com_Printf("Except #%d: %s/%d\n", count,
-				    NET_AdrToString(ban->ip), ban->subnet);
+			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");
 		}
 	}
 }
@@ -1086,12 +1237,12 @@ static int SV_Strlen( const char *str ) {
 	int count = 0;
 
 	while ( *s ) {
-		if ( Q_IsColorString( s ) ) {
-			s += 2;
-		} else {
+		//if ( Q_IsColorString( s ) ) {
+		//	s += 2;
+		//} else {
 			count++;
 			s++;
-		}
+		//}
 	}
 
 	return count;
@@ -1103,69 +1254,156 @@ SV_Status_f
 ================
 */
 static void SV_Status_f(void) {
-    int			i;
-    size_t		j, l;
-    client_t* cl;
-    playerState_t* ps;
-    const char* s;
-    int			ping;
+	int				i;
+	size_t			j, l;
+	client_t		*cl;
+	playerState_t	*ps;
+	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");
-        return;
-    }
+	// make sure server is running
+	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++)
-    {
-        if (!cl->state)
-            continue;
-        Com_Printf("%3i ", i);
-        ps = SV_GameClientNum(i);
-        // su44: ps->persistant is not avaible in mohaa
-        //Com_Printf ("%5i ", ps->persistant[PERS_SCORE]);
-        Com_Printf("%5i ", ps->stats[STAT_KILLS]);
+	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;
 
-        if (cl->state == CS_CONNECTED)
-            Com_Printf("CNCT ");
-        else if (cl->state == CS_ZOMBIE)
-            Com_Printf("ZMBI ");
-        else
-        {
-            ping = cl->ping < 9999 ? cl->ping : 9999;
-            Com_Printf("%4i ", ping);
-        }
+	//
+	// Find IPv6 clients and adjust the IP address column size
+	//
 
-        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 = SV_Strlen(cl->name);
-		if (l <= 16) {
-			l = 16 - l;
-			for (j = 0; j < l; j++)
-				Com_Printf(" ");
+	for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
+	{
+		if (cl->state == CS_FREE) {
+			continue;
 		}
 
-        Com_Printf("%7i ", svs.time - cl->lastPacketTime);
+		if (cl->netchan.remoteAddress.type == NA_IP6) {
+			colSize[5] = 38;
+			break;
+		}
+	}
 
-        s = NET_AdrToString(cl->netchan.remoteAddress);
-        Com_Printf("%s", s);
-        l = 39 - strlen(s);
-        for (j = 0; j < l; j++)
-            Com_Printf(" ");
+	Com_Printf("map: %s\n", sv_mapname->string);
 
-        Com_Printf("%5i", cl->netchan.qport);
+	//
+	// Print column header name
+	//
 
-        Com_Printf(" %5i", cl->rate);
+	for (i = 0; i < 8; i++) {
+		// Column name
+		len = strlen(colName[i]);
+		Com_Printf("%s", colName[i]);
 
-        Com_Printf("\n");
-    }
-    Com_Printf("\n");
+		// 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("%*i ", colSize[1], ps->stats[STAT_KILLS]);
+
+		if (cl->state == CS_CONNECTED)
+			Com_Printf("CNCT ");
+		else if (cl->state == CS_ZOMBIE)
+			Com_Printf("ZMBI ");
+		else
+		{
+			ping = cl->ping < 9999 ? cl->ping : 9999;
+			Com_Printf("%*u ", colSize[2], ping);
+		}
+
+		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("%*u ", colSize[4], svs.time - cl->lastPacketTime);
+
+		s = NET_AdrToStringwPort(cl->netchan.remoteAddress);
+		Com_Printf("%s ", s);
+
+		len = strlen(s);
+		if (len < colSize[5]) {
+			l = colSize[5] - strlen(s);
+			for (j = 0; j < l; j++) {
+				Com_Printf(" ");
+			}
+		}
+
+		Com_Printf( "%*u", colSize[6], cl->netchan.qport );
+
+		Com_Printf(" %*u", colSize[7], cl->rate);
+
+		Com_Printf("\n");
+	}
+	Com_Printf("\n");
 }
 
 /*
@@ -1187,7 +1425,7 @@ static void SV_ConSay_f(void) {
 		return;
 	}
 
-	strcpy (text, "console: ");
+	Q_strncpyz (text, "console: ", sizeof(text));
 	p = Cmd_Args();
 
 	if ( *p == '"' ) {
@@ -1227,7 +1465,7 @@ static void SV_ConTell_f(void) {
 		return;
 	}
 
-	strcpy (text, "(private) console: ");
+	Q_strncpyz(text, "(private) console: ", sizeof(text));
 	p = Cmd_ArgsFrom(2);
 
 	if ( *p == '"' ) {
@@ -1293,7 +1531,7 @@ static void SV_ConSayto_f(void) {
 		return;
 	}
 
-	strcpy (text, "(private) console: ");
+	Q_strncpyz(text, "(private) console: ", sizeof(text));
 	p = Cmd_ArgsFrom(2);
 
 	if ( *p == '"' ) {
@@ -1303,8 +1541,8 @@ static void SV_ConSayto_f(void) {
 
 	strcat(text, p);
 
-    Com_Printf("%s\n", text);
-    SV_SendServerCommand(saytocl, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\n\"", text);
+	Com_Printf("%s\n", text);
+	SV_SendServerCommand(saytocl, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\n\"", text);
 }
 
 
@@ -1484,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
 
 /*
@@ -1497,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);
 	}
 }
@@ -1519,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;
@@ -1550,51 +1941,53 @@ SV_AddOperatorCommands
 ==================
 */
 void SV_AddOperatorCommands(void) {
-    static qboolean	initialized;
+	static qboolean	initialized;
 
-    if (initialized) {
-        return;
-    }
-    initialized = qtrue;
+	if (initialized) {
+		return;
+	}
+	initialized = qtrue;
 
-    Cmd_AddCommand("heartbeat", SV_Heartbeat_f);
-    Cmd_AddCommand("kick", SV_Kick_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);
-    }
+	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("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("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("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);
+	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) {
+	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", SV_CompletePlayerName);
-    }
+		Cmd_SetCommandCompletionFunc("sayto", (completionFunc_t)SV_CompletePlayerName);
+	}
 
 	Cmd_AddCommand("rehashbans", SV_RehashBans_f);
 	Cmd_AddCommand("listbans", SV_ListBans_f);
@@ -1604,15 +1997,18 @@ void SV_AddOperatorCommands(void) {
 	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);
+	Cmd_AddCommand("difficultyEasy", SV_EasyMode_f);
+	Cmd_AddCommand("difficultyMedium", SV_MediumMode_f);
+	Cmd_AddCommand("difficultyHard", SV_HardMode_f);
 
-    if (developer->integer) {
-        SV_MediumMode_f();
-    } else {
-        SV_EasyMode_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();
 }
 
 /*
@@ -1620,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
 }
 
@@ -1642,34 +2038,33 @@ 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
 }
 
@@ -1678,16 +2073,16 @@ void SV_ArchiveHudDrawElements( qboolean loading )
 SV_HudDrawShader
 ==================
 */
-void SV_HudDrawShader( int iInfo, char *name )
+void SV_HudDrawShader(int iInfo, const char *name)
 {
 #ifndef DEDICATED
-	strcpy( cls.HudDrawElements[ iInfo ].shaderName, name );
-	cls.HudDrawElements[ iInfo ].string[ 0 ] = 0;
-	cls.HudDrawElements[ iInfo ].pFont = NULL;
-	cls.HudDrawElements[ iInfo ].fontName[ 0 ] = 0;
+	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
 }
@@ -1697,11 +2092,11 @@ 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)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].iHorizontalAlign = iHorizontalAlign;
-	cls.HudDrawElements[ iInfo ].iVerticalAlign = iVerticalAlign;
+	cls.HudDrawElements[iInfo].iHorizontalAlign = iHorizontalAlign;
+	cls.HudDrawElements[iInfo].iVerticalAlign   = iVerticalAlign;
 #endif
 }
 
@@ -1710,13 +2105,13 @@ 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)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].iX = iX;
-	cls.HudDrawElements[ iInfo ].iY = iY;
-	cls.HudDrawElements[ iInfo ].iWidth = iWidth;
-	cls.HudDrawElements[ iInfo ].iHeight = iHeight;
+	cls.HudDrawElements[iInfo].iX      = iX;
+	cls.HudDrawElements[iInfo].iY      = iY;
+	cls.HudDrawElements[iInfo].iWidth  = iWidth;
+	cls.HudDrawElements[iInfo].iHeight = iHeight;
 #endif
 }
 
@@ -1725,10 +2120,10 @@ 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)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].bVirtualScreen = bVirtualScreen;
+	cls.HudDrawElements[iInfo].bVirtualScreen = bVirtualScreen;
 #endif
 }
 
@@ -1737,10 +2132,10 @@ 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)
 {
 #ifndef DEDICATED
-	VectorCopy( vColor, cls.HudDrawElements[ iInfo ].vColor );
+	VectorCopy(vColor, cls.HudDrawElements[iInfo].vColor);
 #endif
 }
 
@@ -1749,10 +2144,10 @@ void SV_HudDrawColor( int iInfo, vec3_t vColor )
 SV_HudDrawAlpha
 ==================
 */
-void SV_HudDrawAlpha( int iInfo, float alpha )
+void SV_HudDrawAlpha(int iInfo, float alpha)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].vColor[ 3 ] = alpha;
+	cls.HudDrawElements[iInfo].vColor[3] = alpha;
 #endif
 }
 
@@ -1761,11 +2156,11 @@ 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)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].hShader = 0;
-	strcpy( cls.HudDrawElements[ iInfo ].string, string );
+	cls.HudDrawElements[iInfo].hShader = 0;
+	Q_strncpyz(cls.HudDrawElements[iInfo].string, string, sizeof(cls.HudDrawElements[iInfo].string));
 #endif
 }
 
@@ -1774,15 +2169,15 @@ 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)
 {
 #ifndef DEDICATED
-	strcpy( cls.HudDrawElements[ iInfo ].fontName, name );
-	cls.HudDrawElements[ iInfo ].hShader = 0;
-	cls.HudDrawElements[ iInfo ].shaderName[ 0 ] = 0;
+	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
 }
@@ -1792,29 +2187,28 @@ void SV_HudDrawFont( int iInfo, const char *name )
 SV_ArchiveViewModelAnimation
 ==================
 */
-void SV_ArchiveViewModelAnimation( qboolean loading )
+void SV_ArchiveViewModelAnimation(qboolean loading)
 {
 #ifndef DEDICATED
-    int i;
+	int i;
 
-    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);
-    }
+	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.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]);
+	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
 }
 
@@ -1823,11 +2217,11 @@ void SV_ArchiveViewModelAnimation( qboolean loading )
 SV_ArchiveStopwatch
 ==================
 */
-void SV_ArchiveStopwatch( qboolean loading )
+void SV_ArchiveStopwatch(qboolean loading)
 {
 #ifndef DEDICATED
-	ge->ArchiveSvsTime( &cls.stopwatch.iStartTime );
-	ge->ArchiveSvsTime( &cls.stopwatch.iEndTime );
+	ge->ArchiveSvsTime(&cls.stopwatch.iStartTime);
+	ge->ArchiveSvsTime(&cls.stopwatch.iEndTime);
 #endif
 }
 
@@ -1836,14 +2230,14 @@ 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
 }
 
@@ -1852,12 +2246,12 @@ void SV_ArchivePersistantFile( qboolean loading )
 SV_ArchiveLevel
 ==================
 */
-void SV_ArchiveLevel( qboolean loading )
+void SV_ArchiveLevel(qboolean loading)
 {
 #ifndef DEDICATED
-	SV_ArchiveHudDrawElements( loading );
-	SV_ArchiveViewModelAnimation( loading );
-	SV_ArchiveStopwatch( loading );
+	SV_ArchiveHudDrawElements(loading);
+	SV_ArchiveViewModelAnimation(loading);
+	SV_ArchiveStopwatch(loading);
 #endif
 }
 
@@ -1869,44 +2263,40 @@ SV_ArchiveLevelFile
 qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
 {
 #ifndef DEDICATED
-    const char* name;
-    fileHandle_t f;
-    savegamestruct_t save;
-    soundsystemsavegame_t SSsave;
+	const char           *name;
+	fileHandle_t          f;
+	savegamestruct_t      save;
+	soundsystemsavegame_t SSsave;
 
-    Com_DPrintf("SV_ArchiveLevelFile()\n");
-    name = Com_GetArchiveFileName(svs.gameName, "sav");
-    if (loading)
-    {
-		if (!ge->ReadLevel(name)) {
+	Com_DPrintf("SV_ArchiveLevelFile()\n");
+	name = Com_GetArchiveFileName(svs.gameName, "sav");
+	if (loading) {
+		if (!ge->ReadLevel(name, (byte **)&cls.savedCgameState, &cls.savedCgameStateSize)) {
 			return qfalse;
-        }
+		}
 
-        name = Com_GetArchiveFileName(svs.gameName, "ssv");
-        FS_FOpenFileRead(name, &f, qfalse, qtrue);
-        if (f)
-        {
-            FS_Read(&save, sizeof(savegamestruct_t), f);
-            if (save.version != SAVEGAME_STRUCT_VERSION)
-            {
-                FS_FCloseFile(f);
-                return qfalse;
-            }
+		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
-    {
+			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);
+		ge->WriteLevel(name, autosave, (byte **)&cls.savedCgameState, &cls.savedCgameStateSize);
 		Z_Free(cls.savedCgameState);
 		cls.savedCgameState = NULL;
-    }
+	}
 
-    return qtrue;
+	return qtrue;
 #else
 	return qfalse;
 #endif
@@ -1917,12 +2307,12 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
 S_Save
 ==================
 */
-void S_Save( fileHandle_t f )
+void S_Save(fileHandle_t f)
 {
 #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
 }
 
@@ -1931,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
 }
@@ -1944,91 +2334,103 @@ void S_Load( fileHandle_t f )
 SV_ArchiveServerFile
 ==================
 */
-qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
+qboolean SV_ArchiveServerFile(qboolean loading, qboolean autosave)
 {
 #ifndef DEDICATED
-	fileHandle_t f;
-	const char *name;
-	char comment[ 64 ];
+	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, comment );
+			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.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 != SAVEGAME_STRUCT_VERSION)
-		{
+		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;
 		}
 
-		S_StopAllSounds2( qtrue );
-		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;
@@ -2042,81 +2444,70 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 SV_Loadgame_f
 ==================
 */
-void SV_Loadgame_f( void )
+void SV_Loadgame_f(void)
 {
 #ifndef DEDICATED
-	int length;
+	int         length;
 	const char *name;
 	const char *archive_name;
-	qboolean bStartedGame;
+	qboolean    bStartedGame;
 
-	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" );
+	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
@@ -2127,27 +2518,26 @@ 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)
 {
 #ifndef DEDICATED
-	int num;
+	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;
 		}
 	}
@@ -2159,42 +2549,30 @@ void SV_SavegameFilename( const char *name, char *fileName, int length )
 SV_AllowSaveGame
 ==================
 */
-qboolean SV_AllowSaveGame( void )
+qboolean SV_AllowSaveGame(void)
 {
 #ifndef DEDICATED
-	if( !com_sv_running || !com_sv_running->integer )
-	{
-		Com_DPrintf( "You must be in a game with a server to save.\n" );
+	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;
-	}
-	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;
-	}
-	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;
 	}
 
@@ -2214,9 +2592,8 @@ static qboolean bSavegame;
 qboolean SV_DoSaveGame()
 {
 #ifndef DEDICATED
-	if( bSavegame )
-	{
-		if( SV_AllowSaveGame() ) {
+	if (bSavegame) {
+		if (SV_AllowSaveGame()) {
 			return qtrue;
 		}
 		bSavegame = qfalse;
@@ -2232,49 +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));
+
+	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
 }
 
@@ -2283,30 +2664,26 @@ 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;
@@ -2318,25 +2695,24 @@ void SV_Savegame_f( void )
 SV_CheckSaveGame
 ==================
 */
-void SV_CheckSaveGame( void )
+void SV_CheckSaveGame(void)
 {
 #ifndef DEDICATED
-	if( !SV_DoSaveGame() ) {
+	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 );
+		SV_SaveGame(savegame_name[0] ? savegame_name : NULL, qfalse);
 		UI_SetupFiles();
 	}
 #endif
 }
 
-void SV_Autosavegame_f( void )
+void SV_Autosavegame_f(void)
 {
 #ifndef DEDICATED
-	SV_SaveGame( NULL, qtrue );
+	SV_SaveGame(NULL, qtrue);
 #endif
 }
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index 81006431..d56484f2 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -46,25 +46,50 @@ 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 ) {
+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 ) {
+	// 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;
 	}
 
-	challenge = FindChallenge(from, qtrue);
+	// 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 they are on a lan address, send the challengeResponse immediately
+    challenge = FindChallenge(from, qtrue);
+
+    // 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 ) ) {
 		challenge->pingTime = svs.time;
-		NET_OutOfBandPrint( NS_SERVER, from, "challengeResponse %i", challenge->challenge );
+		SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge );
 		return;
 	}
 
@@ -72,7 +97,7 @@ void SV_GetChallenge( netadr_t from ) {
 		// mohaa below 2.0 doesn't handle gamespy key
         // so send the challenge response directly
         challenge->pingTime = svs.time;
-        NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+        SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         return;
 	}
 
@@ -81,14 +106,16 @@ void SV_GetChallenge( netadr_t from ) {
 		// however, it could be an useful feature for a far future
 		// where players could be authenticated
         challenge->pingTime = svs.time;
-        NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+        SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         return;
 	}
 
 	// check client's cd key
-	NET_OutOfBandPrint(NS_SERVER, from, "getKey %s", challenge->gsChallenge);
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "getKey %s", challenge->gsChallenge);
+	challenge->pingTime = svs.time;
 }
 
+#ifndef STANDALONE
 /*
 ====================
 SV_AuthorizeIpPacket
@@ -96,8 +123,6 @@ SV_AuthorizeIpPacket
 A packet has been returned from the authorize server.
 If we have a challenge adr for that ip, send the
 challengeResponse to it
-
-NOTE: This function is deprecated, SV_GamespyAuthorize must be used instead.
 ====================
 */
 void SV_AuthorizeIpPacket( netadr_t from ) {
@@ -105,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" );
@@ -122,63 +148,71 @@ 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)
+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))
+		if(SV_IsBanned(from, qtrue, NULL, 0))
 			return qfalse;
 	}
 	
@@ -188,8 +222,13 @@ static qboolean SV_IsBanned(netadr_t *from, qboolean isexception)
 		
 		if(curban->isexception == isexception)
 		{
-			if(NET_CompareBaseAdrMask(curban->ip, *from, curban->subnet))
+			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;
+			}
 		}
 	}
 	
@@ -255,6 +294,28 @@ challenge_t* FindChallenge(netadr_t from, qboolean connecting) {
 	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;
+}
+
 /*
 ==================
 SV_DirectConnect
@@ -263,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;
@@ -287,19 +343,49 @@ void SV_DirectConnect( netadr_t from ) {
 	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))
+	if(SV_IsBanned(&from, qfalse, banReason, sizeof(banReason)))
 	{
-		NET_OutOfBandPrint(NS_SERVER, from, "droperror\nYou are banned from this server.\n");
+		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;
@@ -308,7 +394,7 @@ void SV_DirectConnect( netadr_t from ) {
 	{
 		if(version != com_protocol->integer)
 		{
-			NET_OutOfBandPrint(NS_SERVER, from, "droperror\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;
@@ -341,7 +427,7 @@ 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,
+		SV_NET_OutOfBandPrint( &svs.netprofile, from,
 			"droperror\nUserinfo string length exceeded.  "
 			"Try removing setu cvars from your config.\n" );
 		return;
@@ -349,42 +435,54 @@ void SV_DirectConnect( netadr_t from ) {
 	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, "droperror\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, "droperror\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, "droperror\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;
@@ -423,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
@@ -459,7 +557,7 @@ void SV_DirectConnect( netadr_t from ) {
 			}
 		}
 		else {
-			NET_OutOfBandPrint( NS_SERVER, from, "droperror\nServer is full.\n" );
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nServer is full.\n" );
 			Com_DPrintf ("Rejected a connection.\n");
 			return;
 		}
@@ -496,11 +594,10 @@ 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, "droperror\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;
 	}
 
@@ -511,8 +608,12 @@ gotnewcl:
 
 	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 );
 
@@ -552,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);
 }
 
 /*
@@ -583,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 ) );
@@ -619,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
@@ -650,7 +765,7 @@ 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;
@@ -688,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
@@ -717,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);
@@ -752,13 +867,20 @@ void SV_ClientEnterWorld( client_t *client, usercmd_t *cmd ) {
 	client->deltaMessage = -1;
 	client->lastSnapshotTime = 0;	// generate a snapshot immediately
 
-	if (cmd)
+	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();
+	}
 }
 
 /*
@@ -789,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;
 		}
 	}
@@ -803,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 );
 
@@ -817,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);
@@ -831,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) );
 
@@ -860,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 );
@@ -875,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;
@@ -891,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)
 		{
@@ -918,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;
 					}
@@ -927,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)
 			{
@@ -940,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 "
@@ -974,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;
 		}
  
@@ -992,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 );
 
@@ -1019,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;
 }
@@ -1366,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) );
@@ -1463,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[] = {
@@ -1486,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}
 };
 
@@ -1511,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);
 			}
 		}
 	}
@@ -1557,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 );
 	}
 
@@ -1573,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
@@ -1600,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
 }
 
 
@@ -1615,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;
@@ -1677,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 );
 
@@ -1704,7 +1848,7 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 			SV_SendClientGameState( cl );
 		}
 		return;
-	}	
+	}			
 	
 	// if this is the first usercmd we have received
 	// this gamestate, put the client into the world
@@ -1712,9 +1856,9 @@ 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 (g_gametype->integer != GT_SINGLE_PLAYER && sv_pure->integer != 0 && !com_sv_running->integer && cl->pureAuthentic == 0) {
+	
+	// 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;
 	}
@@ -1741,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
+
+
+
 /*
 ===========================================================================
 
@@ -1768,7 +2022,7 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 
 	MSG_Bitstream(msg);
 
-	serverId = MSG_ReadLong(msg);
+	serverId = MSG_ReadLong( msg );
 	cl->serverIdAcknowledge = serverId;
 	cl->messageAcknowledge = MSG_ReadLong( msg );
 
@@ -1786,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
@@ -1807,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;
 		}
@@ -1836,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 3c2f0c4c..a87df2ad 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -30,9 +30,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/crc.h"
 #include "../qcommon/alias.h"
 
-// alloca
-#include <malloc.h>
-
 debugline_t *DebugLines;
 int numDebugLines;
 debugstring_t *DebugStrings;
@@ -113,7 +110,8 @@ void SV_ClearCGMessage (int iClient)
 		g_CGMessages[iClient].datatypes = 0;
 	}
 	g_CGMRecieve[iClient] = 0;
-} 
+}
+
 void SV_ClearAllCGMessages ()
 {
 	cgm_t *pCGM;
@@ -133,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;
@@ -200,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;
@@ -234,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;
@@ -247,6 +249,7 @@ void PF_MSG_WriteByte (int c)
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
 }
+
 void PF_MSG_WriteSVC (int c)
 {
 	cgm_t *pCGM;
@@ -258,6 +261,7 @@ void PF_MSG_WriteSVC (int c)
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
 }
+
 void PF_MSG_WriteShort (int c)
 {
 	cgm_t *pCGM;
@@ -269,6 +273,7 @@ void PF_MSG_WriteShort (int c)
 		MSG_WriteCGMBits(pCGM,c,16);
 	}
 }
+
 void PF_MSG_WriteLong (int c)
 {
  	cgm_t *pCGM;
@@ -280,6 +285,7 @@ void PF_MSG_WriteLong (int c)
 		MSG_WriteCGMBits(pCGM,c,32);
 	}
 }
+
 void PF_MSG_WriteFloat (float f)
 {
 	union {
@@ -296,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;
@@ -312,6 +319,7 @@ void PF_MSG_WriteString (const char *s)
 		}
 	}
 }
+
 void PF_MSG_WriteAngle8 (float f)
 {
  	cgm_t *pCGM;
@@ -323,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;
@@ -334,6 +343,7 @@ void PF_MSG_WriteAngle16 (float f)
 		MSG_WriteCGMBits(pCGM,ANGLE2SHORT(f),16);
 	}
 }
+
 void PF_MSG_WriteCoord (float f)
 {
  	cgm_t *pCGM;
@@ -354,6 +364,7 @@ void PF_MSG_WriteCoord (float f)
 		MSG_WriteCGMBits(pCGM, write, 19);
 	}
 }
+
 void PF_MSG_WriteDir (vec_t *dir)
 {
  	cgm_t *pCGM;
@@ -367,6 +378,7 @@ void PF_MSG_WriteDir (vec_t *dir)
 		MSG_WriteCGMBits(pCGM,b,8);
 	}
 }
+
 void PF_MSG_StartCGM (int type)
 {
     cgm_t *pCGM;
@@ -387,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));
@@ -400,7 +414,7 @@ void PF_MSG_SetClient (int iClient)
 	}
 }
 
-void MSG_SetBroadcastAll ()
+void MSG_SetBroadcastAll()
 {
 	cgm_t *pCGM;
 	client_t* client;
@@ -410,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;
@@ -435,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)
 {
@@ -593,6 +616,10 @@ PF_NumAnims
 */
 int PF_NumAnims( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumAnims( tiki );
 }
 
@@ -603,6 +630,10 @@ PF_NumSurfaces
 */
 int PF_NumSurfaces( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumSurfaces( tiki );
 }
 
@@ -613,6 +644,10 @@ PF_NumTags
 */
 int PF_NumTags( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumTags( tiki );
 }
 
@@ -623,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 );
 }
 
@@ -633,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 );
 }
 
@@ -643,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 );
 }
 
@@ -653,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 );
 }
 
@@ -663,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 );
 }
 
@@ -673,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 );
 }
 
@@ -683,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 );
 }
 
@@ -693,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 );
 }
 
@@ -703,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
@@ -713,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 );
 }
 
@@ -723,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 );
 }
 
@@ -733,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);
 }
 
@@ -743,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 );
 }
 
@@ -753,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 );
 }
 
@@ -763,6 +868,10 @@ PF_Anim_HasCommands
 */
 qboolean PF_Anim_HasCommands( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
 	return TIKI_Anim_HasServerCommands( tiki, animnum );
 }
 
@@ -773,6 +882,10 @@ PF_Anim_HasCommands
 */
 qboolean PF_Anim_HasCommands_Client(dtiki_t* tiki, int animnum)
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
     return TIKI_Anim_HasClientCommands(tiki, animnum);
 }
 
@@ -991,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 );
 }
 
@@ -1014,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;
 	}
 }
@@ -1035,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);
+    }
 }
 
 /*
@@ -1051,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);
+    }
 }
 
 /*
@@ -1077,6 +1197,10 @@ PF_NameForNum
 */
 const char *PF_NameForNum( dtiki_t *tiki )
 {
+	if (!tiki) {
+		return NULL;
+	}
+
 	return TIKI_Name( tiki );
 }
 
@@ -1181,6 +1305,10 @@ PF_GetSkeletor
 */
 void *PF_GetSkeletor( dtiki_t *tiki, int entnum )
 {
+	if (!tiki) {
+		return NULL;
+	}
+
 	return TIKI_GetSkeletor( tiki, entnum );
 }
 
@@ -1386,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 ) {
@@ -1412,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 ) {
@@ -1644,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;
@@ -1658,6 +1787,7 @@ void SV_InitGameProgs( void ) {
 	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;
@@ -1692,6 +1822,7 @@ 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;
@@ -1778,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 1d883a3d..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 );
 }
@@ -316,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;
@@ -421,9 +420,9 @@ void SV_ClientsAlloc( void )
 	svs.clients = Z_Malloc( svs.iNumClients * sizeof( client_t ) );
 	Com_Memset( svs.clients, 0, svs.iNumClients * sizeof( client_t ) );
 	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
-		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * 64;
+		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * MAX_CLIENTS;
 	} else {
-		svs.numSnapshotEntities = 1 * 32 * 64;
+		svs.numSnapshotEntities = 1 * PACKET_BACKUP * MAX_CLIENTS;
 	}
 
 	SV_InitAllCGMessages();
@@ -452,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();
 }
 
 /*
@@ -478,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;
@@ -515,9 +517,9 @@ void SV_ChangeMaxClients( void ) {
 	Z_Free( oldClients );
 
 	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
-		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * 64;
+		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * MAX_CLIENTS;
 	} else {
-		svs.numSnapshotEntities = 1 * 32 * 64;
+		svs.numSnapshotEntities = 1 * PACKET_BACKUP * MAX_CLIENTS;
 	}
 }
 
@@ -538,6 +540,20 @@ void SV_ClearServer(void) {
 	sv.frameTime = 1.0 / sv_fps->value;
 }
 
+/*
+================
+SV_TouchFile
+================
+*/
+static void SV_TouchFile( const char *filename ) {
+	fileHandle_t	f;
+
+	FS_FOpenFileRead( filename, &f, qfalse, qtrue );
+	if ( f ) {
+		FS_FCloseFile( f );
+	}
+}
+
 /*
 ================
 SV_SpawnServer
@@ -573,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, '$' );
@@ -583,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 ) );
@@ -594,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();
 		}
 	}
@@ -604,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 ) );
 
@@ -668,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
@@ -775,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 )
@@ -805,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 )
@@ -846,15 +881,25 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 			Cvar_Set( "sv_paks", "" );
 			Cvar_Set( "sv_pakNames", "" );
 		}
-		// 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 );
+
+		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 );
 
@@ -872,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();
 		}
 	}
@@ -887,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 )
@@ -908,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();
 	}
 }
@@ -939,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;
 	}
 
@@ -976,15 +1021,16 @@ 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 );
@@ -999,7 +1045,10 @@ void SV_Init( void ) {
 	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 );
 
 	// systeminfo
@@ -1009,12 +1058,11 @@ void SV_Init( void ) {
     // 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
+#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 );
@@ -1053,7 +1101,7 @@ void SV_Init( void ) {
 #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 );
@@ -1062,6 +1110,12 @@ void SV_Init( void ) {
 	
 	// Load saved bans
 	Cbuf_AddText("rehashbans\n");
+
+    if (com_gotOriginalConfig) {
+        // Added in OPM
+        //  Apply config tweaks after loading the original config
+		SV_ApplyOriginalConfigTweaks();
+	}
 }
 
 
@@ -1125,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 ) );
 
@@ -1140,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 3aa43ae3..c2ffbbd7 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -24,7 +24,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../gamespy/sv_gamespy.h"
 #include "../gamespy/sv_gqueryreporting.h"
 
-cvar_t			*sv_mapname;
+#ifdef USE_VOIP
+cvar_t *sv_voip;
+cvar_t *sv_voipProtocol;
+#endif
+
 serverStatic_t	svs;				// persistant server info
 server_t		sv;					// local server
 //vm_t			*gvm = NULL;				// game virtual machine
@@ -45,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;
@@ -69,10 +74,6 @@ 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;
@@ -159,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 )
@@ -173,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) ] );
@@ -227,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 );
 	}
@@ -260,7 +267,7 @@ void SV_MasterHeartbeat( void ) {
 
 	if (svs.time >= svs.nextHeartbeatTime)
 	{
-		svs.nextHeartbeatTime = svs.time + MAX_HEARTBEAT_TIME;
+		svs.nextHeartbeatTime = svs.time + HB_TIME;
 		SV_GamespyHeartbeat();
 	}
 }
@@ -294,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
@@ -318,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;
 
@@ -339,12 +533,12 @@ void SVC_Status( netadr_t from ) {
 			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 );
 }
 
 /*
@@ -365,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.
@@ -398,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) );
 	}
@@ -409,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", va("%i", com_target_game->integer));
+    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 );
 }
 
 /*
@@ -421,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 );
 }
 
 /*
@@ -434,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 {
@@ -508,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
 
@@ -524,11 +755,11 @@ 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  );
-	} else if (!Q_stricmp(c, "getinfo")) {
+		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, "authorizeThis")) {
@@ -540,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);
 	}
 }
 
@@ -566,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
@@ -597,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 );
 			}
 		}
@@ -606,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" );
 }
 
 
@@ -617,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;
@@ -677,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;
@@ -803,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;
@@ -815,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.
@@ -848,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;
 	}
 
@@ -904,6 +1142,10 @@ void SV_Frame( int msec ) {
 	// process all gamespy queries
 	SV_ProcessGamespyQueries();
 
+	// Added in OPM
+	//  Handle non-pvs sounds
+	SV_HandleNonPVSSound();
+
 	svs.lastTime = svs.time;
 }
 
@@ -1020,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;
 }
 
 /*
@@ -1070,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 b319f97e..d87c689e 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -91,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++;
@@ -222,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 );
@@ -293,25 +294,88 @@ 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,
-            ent->r.nonpvs_sounds[i].index,
-            ent->r.nonpvs_sounds[i].volume,
-            ent->r.nonpvs_sounds[i].minDist,
-            ent->r.nonpvs_sounds[i].pitch,
-            ent->r.nonpvs_sounds[i].maxDist,
+            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
@@ -322,7 +386,12 @@ 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);
-    return trace.fraction == 1;
+	if (trace.fraction != 1) {
+		return qfalse;
+	}
+
+	// Also test against brush models
+	return SV_ClipMoveToBSPEntities(start, end, mask);
 }
 
 /*
@@ -443,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;
@@ -452,6 +523,14 @@ 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++;
@@ -581,12 +660,16 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 			}
 		}
 		// 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) {
@@ -618,7 +701,7 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 		// 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, NULL, qfalse);
+			SV_AddEntToSnapshot( svEnt, ent, eNums, portalEnt, portalsky);
 			continue;
 		}
 
@@ -637,12 +720,12 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 			svCheckEnt = svEnt;
 		}
 
-		if (!(ent->r.svFlags & SVF_PORTAL) && !ent->s.modelindex && !ent->s.loopSound) {
+		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 == 10000) || ent->s.renderfx & RF_VIEWMODEL) {
+		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;
@@ -716,7 +799,7 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 		}
 
 		// 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 && svEnt != portalEnt ) {
@@ -1029,8 +1112,9 @@ 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) {
-			client->lastRadarTime[ent->s.number + 1] = svs.time;
+		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];
@@ -1047,6 +1131,53 @@ static void SV_BuildClientSnapshot( client_t *client ) {
     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
@@ -1054,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;
@@ -1086,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 ) {
@@ -1121,22 +1261,24 @@ void SV_SendClientSnapshot( client_t *client ) {
 	SV_SendMessageToClient( &msg, client );
 }
 
-
 /*
 =======================
 SV_SendClientMessages
 =======================
 */
-void SV_SendClientMessages( void ) {
-	int			i;
-	int			rate;
-	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->lastSnapshotTime < c->snapshotMsec * com_timescale->value)
 			continue;		// It's not time yet
@@ -1168,15 +1310,10 @@ void SV_SendClientMessages( void ) {
 		}
 
 		// generate and send a new message
-        SV_SendClientSnapshot(c);
-        c->lastSnapshotTime = svs.time;
+		SV_SendClientSnapshot(c);
+		c->lastSnapshotTime = svs.time;
 		c->rateDelayed = qfalse;
     }
-
-    for (i = 0; i < sv.num_entities; i++) {
-        gentity_t* ent = SV_GentityNum(i);
-		ent->r.num_nonpvs_sounds = 0;
-    }
 }
 
 qboolean SV_IsValidSnapshotClient(client_t* client) {
diff --git a/code/server/sv_snd.c b/code/server/sv_snd.c
index 8dab16dc..e51060f2 100644
--- a/code/server/sv_snd.c
+++ b/code/server/sv_snd.c
@@ -70,9 +70,17 @@ void SV_Sound( vec3_t *org, int entnum, int channel, const char *sound_name, flo
 {
     int i;
 
-    for (i = 0; i < sv_maxclients->integer; i++)
+    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) {
+			continue;
+		}
+
         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 7f19d1c1..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
 			}
 		}
 
@@ -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/SkelVec3.h b/code/skeletor/SkelVec3.h
index a678a90b..2755de97 100644
--- a/code/skeletor/SkelVec3.h
+++ b/code/skeletor/SkelVec3.h
@@ -117,8 +117,7 @@ inline bool SkelVec3::IsZero() const
 
 inline bool SkelVec3::IsUnit() const
 {
-    // FIXME: stub
-    return false;
+    return VectorLength(*this) == 1;
 }
 
 inline void SkelVec3::set(float x, float y, float z)
diff --git a/code/skeletor/bonetable.cpp b/code/skeletor/bonetable.cpp
index 02c8594a..0b9b7a50 100644
--- a/code/skeletor/bonetable.cpp
+++ b/code/skeletor/bonetable.cpp
@@ -32,7 +32,7 @@ void ChannelNameTable::CopyChannel(ChannelName_t *dest, const ChannelName_t *sou
 
 void ChannelNameTable::SetChannelName(ChannelName_t *channel, const char *newName)
 {
-    strcpy(channel->name, newName);
+    Q_strncpyz(channel->name, newName, sizeof(channel->name));
 }
 
 ChannelNameTable::ChannelNameTable()
@@ -241,46 +241,36 @@ bool IsBogusChannelName(const char *name)
     return false;
 }
 
-int GetChannelTypeFromName(const char *name)
+channelType_t GetBoneChannelType(const char* name)
 {
-    int    i;
     size_t len;
 
     if (!name) {
-        return 2;
+        return CHANNEL_NONE;
     }
 
-    for (i = 0; i < sizeof(bogusNameTable) / sizeof(bogusNameTable[0]); i++) {
-        if (!Q_stricmp(name, bogusNameTable[i])) {
-            return 2;
-        }
-    }
-
-    if (strstr(name, "Bip0") && !strstr(name, "Bip01") && !strstr(name, "Footsteps")) {
-        return 2;
+    if (IsBogusChannelName(name)) {
+        return CHANNEL_NONE;
     }
 
     len = strlen(name);
-
-    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 (len < 4) {
+        return CHANNEL_VALUE;
     }
 
-    return false;
+    if (!strcmp(name + len - 4, " rot")) {
+        return CHANNEL_ROTATION;
+    }
+
+    if (!strcmp(name + len - 4, " pos")) {
+        return CHANNEL_POSITION;
+    }
+
+    if (len >= 6 && !strcmp(name + len - 6, " rotFK")) {
+        return CHANNEL_NONE;
+    }
+
+    return CHANNEL_VALUE;
 }
 
 int ChannelNameTable::RegisterChannel(const char *name)
@@ -316,9 +306,9 @@ int ChannelNameTable::RegisterChannel(const char *name)
 
 const char *ChannelNameTable::FindNameFromLookup(int index)
 {
-    if (index < m_iNumChannels) {
-        return m_Channels[index].name;
-    } else {
+    if (index >= m_iNumChannels) {
         return NULL;
     }
+
+    return m_Channels[index].name;
 }
diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 13c395d1..c2dea715 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.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.
 
@@ -29,6 +29,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define EPSILON 0.000000000001f
 
+ChannelNameTable* skeletor_c::ChannelNames()
+{
+    return &m_channelNames;
+}
+
 int skelAnimDataGameHeader_s::GetFrameNums(
     float timeSeconds, float timeTolerance, int *beforeFrame, int *afterFrame, float *beforeWeight, float *afterWeight
 )
@@ -97,26 +102,30 @@ SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
 
     deltaWeight1 = time1 / frameTime;
     deltaWeight2 = time2 / frameTime;
-    frameNum1    = (int)(deltaWeight1 + 1.0);
-    frameNum2    = (int)(deltaWeight2 + 1.0);
+    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;
     }
 
-    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;
     }
@@ -142,25 +151,26 @@ float skelAnimDataGameHeader_s::GetAngularDeltaOverTime(float time1, float time2
 
     deltaWeight1 = time1 / frameTime;
     deltaWeight2 = time2 / frameTime;
-    frameNum1    = (int)(deltaWeight1 + 1.0);
-    frameNum2    = (int)(deltaWeight2 + 1.0);
+    frameNum1    = ceil(deltaWeight1);
+    frameNum2    = ceil(deltaWeight2);
 
     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;
         }
+
+        delta += m_frame[frameNum2 % numFrames].angleDelta * s;
     } else {
         s = s - (1.0 - d);
+        delta = m_frame[frameNum2 % numFrames].angleDelta;
     }
 
-    delta += m_frame[frameNum2 % numFrames].angleDelta * s;
-
     if (delta > -0.001f && delta < 0.001f) {
         delta = 0;
     }
@@ -255,15 +265,17 @@ void skelAnimDataGameHeader_s::DeallocAnimData(skelAnimDataGameHeader_t *data)
 {
     skanChannelHdr *pChannel;
     int             i;
+    int             channelType;
 
-    if (!data || data == (skelAnimDataGameHeader_t *)-476) {
+    if (!data) {
         return;
     }
 
     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) {
+        if (channelType != 2) {
             Skel_Free(pChannel->ary_frames);
         }
     }
@@ -331,7 +343,7 @@ void AddToBounds(SkelVec3 *bounds, SkelVec3 *newBounds)
             bounds[0][i] = newBounds[0][i];
         }
 
-        if (bounds[1][i] > newBounds[1][i]) {
+        if (bounds[1][i] < newBounds[1][i]) {
             bounds[1][i] = newBounds[1][i];
         }
     }
@@ -389,7 +401,7 @@ void skeletor_c::SetPose(
     m_frameRadius      = 2.0f;
     animWeight         = 0.0f;
     movementBlendFrame = 0;
-    actionBlendFrame   = 32;
+    actionBlendFrame   = MAX_SKEL_BLEND_MOVEMENT_FRAMES;
     aliases            = m_Tiki->a->m_aliases;
 
     for (blendNum = 0; blendNum < MAX_FRAMEINFOS; blendNum++) {
@@ -441,7 +453,7 @@ void skeletor_c::SetPose(
         afterFrame   = 0.0;
 
         numFramesAdded =
-            animData->GetFrameNums(currentFrame.time, 0.01f, &beforeFrame, &afterFrame, &beforeWeight, &afterWeight);
+            animData->GetFrameNums(currentFrame.time, 0.001f, &beforeFrame, &afterFrame, &beforeWeight, &afterWeight);
 
         frame1                 = &m_frameList.m_blendInfo[blendFrame];
         frame1->frame          = beforeFrame;
@@ -479,8 +491,11 @@ void skeletor_c::SetPose(
     }
 
     m_frameList.numMovementFrames = movementBlendFrame;
-    m_frameList.numActionFrames   = actionBlendFrame - 32;
+    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);
 }
 
 static SkelMat4 GetGlobalDefaultPosition(skelBone_Base *bone)
@@ -680,9 +695,10 @@ void SkeletorGetAnimFrame(
         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;
+
+            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;
@@ -895,9 +911,10 @@ void TIKI_GetSkelAnimFrameInternal(
     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;
+
+        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;
@@ -1046,31 +1063,39 @@ int skeletor_c::GetMorphWeightFrame(int index, float time, int *data)
     return GetMorphWeightFrame(data);
 }
 
-vec4_t *DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
+float DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
     skanGameFrame *foundFrame;
+    size_t         frameSize;
     int            i;
 
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
+
     foundFrame = channelFrames->ary_frames;
 
     for (i = 0; i < channelFrames->nFramesInChannel; i++) {
-        if (channelFrames->ary_frames[i].nFrameNum >= desiredFrameNum) {
-            foundFrame = &channelFrames->ary_frames[i];
+        if (foundFrame->nFrameNum >= desiredFrameNum) {
             break;
         }
+
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
     }
 
-    return &foundFrame->pChannelData;
+    if (foundFrame->nFrameNum > desiredFrameNum) {
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
+    }
+
+    return foundFrame->pChannelData[0];
 }
 
 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();
 
@@ -1081,38 +1106,34 @@ int skeletor_c::GetMorphWeightFrame(int *data)
     memset(data, 0, sizeof(*data) * numTargets);
 
     for (blendNum = 0; blendNum < m_frameList.numMovementFrames; blendNum++) {
-        weight = m_frameList.m_blendInfo[blendNum].weight;
+        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);
+            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);
+                    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);
+            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);
+                    channelData = DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
+                    data[modelChannelNum] += (int)(channelData * weight);
                 }
             }
         }
@@ -1242,5 +1263,5 @@ int dtiki_s::GetBoneNumFromName(const char *name)
         return -1;
     }
 
-    return m_boneList.GetLocalFromGlobal(iGlobalChannel);
+    return m_boneList.LocalChannel(iGlobalChannel);
 }
diff --git a/code/skeletor/skeletor.h b/code/skeletor/skeletor.h
index a6cf90e8..a126df25 100644
--- a/code/skeletor/skeletor.h
+++ b/code/skeletor/skeletor.h
@@ -35,6 +35,10 @@ 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];
@@ -70,7 +74,7 @@ public:
     short int     numMovementFrames;
     short int     numActionFrames;
     float         actionWeight;
-    skanBlendInfo m_blendInfo[64];
+    skanBlendInfo m_blendInfo[MAX_SKEL_BLEND_FRAMES];
 
 public:
     SkelQuat GetSlerpValue(int globalChannelNum) const;
@@ -130,10 +134,10 @@ public:
     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]);
 };
 
diff --git a/code/skeletor/skeletor_animation_file_format.h b/code/skeletor/skeletor_animation_file_format.h
index 58db9451..5a679f50 100644
--- a/code/skeletor/skeletor_animation_file_format.h
+++ b/code/skeletor/skeletor_animation_file_format.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.
 
@@ -59,7 +59,7 @@ typedef struct {
 typedef struct {
     short int nFrameNum;
     short int nPrevFrameIndex;
-    vec4_t    pChannelData;
+    float     pChannelData[1];
 } skanGameFrame;
 
 typedef struct {
@@ -79,7 +79,7 @@ typedef struct skelAnimDataGameHeader_s skelAnimDataGameHeader_t;
 
 typedef struct skelAnimDataGameHeader_s {
     int                  flags;
-    int                  nBytesUsed;
+    size_t               nBytesUsed;
     bool                 bHasDelta;
     bool                 bHasMorph;
     bool                 bHasUpper;
diff --git a/code/skeletor/skeletor_imports.cpp b/code/skeletor/skeletor_imports.cpp
index e79d9742..a415b713 100644
--- a/code/skeletor/skeletor_imports.cpp
+++ b/code/skeletor/skeletor_imports.cpp
@@ -32,7 +32,7 @@ void Skel_DPrintf(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
 
     Com_DPrintf("%s", msg);
diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index 612bb083..d2bdfe59 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.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,52 +26,29 @@ 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;
+    int   i;
 
     // 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;
-    }
-
-    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;
+    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;
+            }
+        }
     }
 
     return true;
@@ -92,7 +69,9 @@ skelAnimDataGameHeader_t *EncodeFrames(
     skelAnimGameFrame_t *pCurrFrame;
     skelAnimGameFrame_t *pLastFrame;
     skanGameFrame       *pFrame;
+    size_t               frameSize;
     int                  indexLastFrameAdded;
+    channelType_t        channelType;
 
     pChannel    = enAnim->ary_channels;
     endFrameCap = enAnim->numFrames - 2;
@@ -101,45 +80,138 @@ skelAnimDataGameHeader_t *EncodeFrames(
         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;
-            }
-
-            pCurrFrame++;
-        }
-
-        pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameCnt * sizeof(skanGameFrame));
-        pChannel->nFramesInChannel = frameCnt;
-        enAnim->nBytesUsed += frameCnt * sizeof(skanGameFrame);
-
-        pLastFrame          = NULL;
-        indexLastFrameAdded = 0;
-
-        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;
-
-                if (j > 0) {
-                    indexLastFrameAdded++;
+        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;
                 }
 
-                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++;
-
-                pLastFrame = pCurrFrame;
+                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, 4) || 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];
+                    pFrame->pChannelData[3] = pCurrFrame->pChannels[i][3];
+
+                    pLastFrame = 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;
+                }
+
+                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;
         }
     }
 
@@ -149,7 +221,7 @@ skelAnimDataGameHeader_t *EncodeFrames(
 skelAnimDataGameHeader_t *
 skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLength, const char *path)
 {
-    int                       i;
+    int                       i, j;
     skelAnimFileFrame_t      *pFileFrame;
     skelAnimGameFrame_t      *pGameFrame;
     skelChannelName_t        *pChannelNames;
@@ -158,6 +230,9 @@ skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLe
     skelAnimGameFrame_t      *newFrame;
     int                       channelIndex;
 
+    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!");
+
     if (pHeader->numFrames <= 0) {
         return NULL;
     }
@@ -167,17 +242,31 @@ skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLe
     newFrame   = pGameFrame;
 
     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;
+        vec4_t* pChannels;
+
+        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];
-        memcpy(
-            newFrame->pChannels,
-            (char *)pHeader
-                + (sizeof(vec4_t) * (3 * pHeader->numFrames - 3) + sizeof(vec4_t) * pHeader->numChannels * i + 96),
-            pHeader->numChannels * sizeof(vec4_t)
-        );
+        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]);
+        }
+
         AddToBounds(newFrame->bounds, pFileFrame->bounds);
 
         pFileFrame++;
@@ -304,10 +393,17 @@ void WriteEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         MSG_WriteShort(msg, pChannel->nFramesInChannel);
 
         for (j = 0; j < pChannel->nFramesInChannel; j++) {
+            vec4_t channelData;
+
             pFrame = &pChannel->ary_frames[i];
             MSG_WriteShort(msg, pFrame->nFrameNum);
             MSG_WriteShort(msg, pFrame->nPrevFrameIndex);
-            MSG_WriteData(msg, pFrame->pChannelData, sizeof(vec4_t));
+
+            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));
         }
     }
 
@@ -335,25 +431,83 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 {
     skanChannelHdr *pChannel;
     skanGameFrame  *pFrame;
+    size_t          frameSize;
     int             frameCnt;
     int             i, j;
-
-    enAnim->numFrames      = MSG_ReadLong(msg);
-    enAnim->nTotalChannels = MSG_ReadShort(msg);
+    channelType_t   channelType;
+    vec4_t          channelData;
 
     for (i = 0; i < enAnim->nTotalChannels; i++) {
         pChannel = &enAnim->ary_channels[i];
-        frameCnt = MSG_ReadShort(msg);
 
-        pFrame                     = (skanGameFrame *)Skel_Alloc(frameCnt * sizeof(skanGameFrame));
-        pChannel->ary_frames       = pFrame;
-        pChannel->nFramesInChannel = frameCnt;
+        channelType = GetBoneChannelType(enAnim->channelList.ChannelName(&skeletor_c::m_channelNames, i));
+        frameCnt    = MSG_ReadShort(msg);
 
-        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));
+        switch (channelType) {
+        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;
+
+            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;
         }
     }
 
@@ -364,47 +518,31 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 {
     skanChannelHdr *pChannel;
     skanGameFrame  *pFrame;
+    size_t          frameSize;
     int             frameCnt;
     int             i, j;
     const char     *name;
-    int             type;
+    channelType_t   type;
 
     for (i = 0; i < enAnim->nTotalChannels; i++) {
         pChannel = &enAnim->ary_channels[i];
 
         name     = enAnim->channelList.ChannelName(&skeletor_c::m_channelNames, i);
-        type     = GetChannelTypeFromName(name);
+        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                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
                 pFrame->nFrameNum       = MSG_ReadShort(msg);
                 pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
                 pFrame->pChannelData[0] = MSG_ReadFloat(msg);
@@ -412,6 +550,44 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 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;
         }
     }
 }
@@ -419,8 +595,9 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnim(const char *path, void *buffer, int len, const char *name)
 {
     skelAnimDataGameHeader_t *enAnim;
-    int                       i;
+    int                       i, j;
     msg_t                     msg;
+    msg_t                     msgForAnim;
     int                       numChannels;
     skelAnimGameFrame_t      *newFrame;
 
@@ -467,15 +644,37 @@ skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnim(const char *path, void *
     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->numFrames      = MSG_ReadLong(&msg);
+    enAnim->nTotalChannels = MSG_ReadShort(&msg);
+
+    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++) {
-        enAnim->channelList.AddChannel(m_channelNames.RegisterChannel(MSG_ReadString(&msg)));
+        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);
+        }
     }
 
-    enAnim->channelList.PackChannels();
+    ReadEncodedFrames(&msg, enAnim);
     return enAnim;
 }
 
@@ -509,8 +708,6 @@ skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnimEx(const char *path, void
         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;
 
diff --git a/code/skeletor/skeletor_model_files.cpp b/code/skeletor/skeletor_model_files.cpp
index a7b6d543..db5a359a 100644
--- a/code/skeletor/skeletor_model_files.cpp
+++ b/code/skeletor/skeletor_model_files.cpp
@@ -209,7 +209,7 @@ void skeletor_c::LoadMorphTargetNames(skelHeaderGame_t *modelHeader)
             m_targetLookLeft = morphTargetIndex;
         } else if (!strncmp(newTargetName, "EYES_right", 10)) {
             m_targetLookRight = morphTargetIndex;
-        } else if (!strncmp(newTargetName, "EYES_up", 70)) {
+        } else if (!strncmp(newTargetName, "EYES_up", 7)) {
             m_targetLookUp = morphTargetIndex;
         } else if (!strncmp(newTargetName, "EYES_down", 9)) {
             m_targetLookDown = morphTargetIndex;
@@ -217,6 +217,6 @@ void skeletor_c::LoadMorphTargetNames(skelHeaderGame_t *modelHeader)
             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 c26f1ccd..71d2fdd7 100644
--- a/code/skeletor/skeletor_name_lists.h
+++ b/code/skeletor/skeletor_name_lists.h
@@ -24,7 +24,7 @@ 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 {
@@ -57,7 +57,14 @@ private:
     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
 
diff --git a/code/skeletor/skeletor_utilities.cpp b/code/skeletor/skeletor_utilities.cpp
index 8dc6f80b..173694cf 100644
--- a/code/skeletor/skeletor_utilities.cpp
+++ b/code/skeletor/skeletor_utilities.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,7 +31,7 @@ void SKEL_Message(const char *fmt, ...)
     va_list     va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
@@ -42,7 +42,7 @@ void SKEL_Warning(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
@@ -53,7 +53,7 @@ void SKEL_Error(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
@@ -71,13 +71,35 @@ int FileLength(FILE *pFile)
     return iEnd;
 }
 
+
+int skelChannelList_s::GlobalChannel(int localchannel) const
+{
+    assert(localchannel < MAX_GLOBAL_FROM_LOCAL);
+    return m_chanGlobalFromLocal[localchannel];
+}
+
+int skelChannelList_s::LocalChannel(int channel) const
+{
+    return GetLocalFromGlobal(channel);
+}
+
 int skelChannelList_s::GetLocalFromGlobal(int globalChannel) const
 {
-    if (m_chanLocalFromGlobal && globalChannel < m_numLocalFromGlobal) {
-        return m_chanLocalFromGlobal[globalChannel];
-    } else {
+    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
@@ -101,26 +123,31 @@ void skelChannelList_s::ZeroChannels()
 void skelChannelList_s::PackChannels()
 {
     m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS - 1;
-
-    if (m_chanLocalFromGlobal[m_numLocalFromGlobal] == -1) {
-        do {
-            m_numLocalFromGlobal--;
-        } while (m_chanLocalFromGlobal[m_numLocalFromGlobal] == -1 && m_numLocalFromGlobal >= 0);
+    for (m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS - 1; m_numLocalFromGlobal >= 0; m_numLocalFromGlobal--) {
+        if (m_chanLocalFromGlobal[m_numLocalFromGlobal] != -1) {
+            break;
+        }
     }
 
     if (m_numLocalFromGlobal < MAX_SKELETOR_CHANNELS) {
         m_numLocalFromGlobal++;
     }
 
-    if (m_numLocalFromGlobal <= 0) {
+    if (m_numLocalFromGlobal > 0) {
+        short *old_array      = m_chanLocalFromGlobal;
+        int    i;
+
+        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;
-    } 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);
     }
 }
 
@@ -154,9 +181,10 @@ int skelChannelList_s::AddChannel(int newGlobalChannelNum)
     iLocalChannel = GetLocalFromGlobal(newGlobalChannelNum);
 
     if (iLocalChannel < 0) {
-        iLocalChannel                              = m_numChannels++;
-        m_chanGlobalFromLocal[iLocalChannel]       = newGlobalChannelNum;
-        m_chanLocalFromGlobal[newGlobalChannelNum] = iLocalChannel;
+        iLocalChannel = m_numChannels++;
+
+        m_chanGlobalFromLocal[iLocalChannel] = newGlobalChannelNum;
+        SetLocalFromGlobal(newGlobalChannelNum, iLocalChannel);
     }
 
     return iLocalChannel;
@@ -166,24 +194,20 @@ qboolean skelChannelList_s::HasChannel(ChannelNameTable *nameTable, const char *
 {
     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
 {
-    if (localChannelNum >= 0 && localChannelNum < m_numChannels) {
-        return nameTable->FindName(m_chanGlobalFromLocal[localChannelNum]);
-    } else {
+    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)
diff --git a/code/skeletor/skeletorbones.cpp b/code/skeletor/skeletorbones.cpp
index 4f454d3a..a3b8d25d 100644
--- a/code/skeletor/skeletorbones.cpp
+++ b/code/skeletor/skeletorbones.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.
 
@@ -163,21 +163,47 @@ void SkeletorLoadBonesFromBuffer(skelChannelList_c *boneList, skelHeaderGame_t *
     }
 }
 
-float *DecodeRLEValue(skanChannelHdr *channelFrames, int desiredFrameNum)
+float *DecodeRLEPosValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
     skanGameFrame *foundFrame = channelFrames->ary_frames;
+    size_t         frameSize;
     int            i;
 
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+
     for (i = 0; i < channelFrames->nFramesInChannel; i++) {
         if (foundFrame->nFrameNum >= desiredFrameNum) {
             break;
         }
 
-        foundFrame++;
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
     }
 
     if (foundFrame->nFrameNum > desiredFrameNum) {
-        foundFrame = &channelFrames->ary_frames[foundFrame->nPrevFrameIndex];
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
+    }
+
+    return foundFrame->pChannelData;
+}
+
+float *DecodeRLERotValue(skanChannelHdr *channelFrames, int desiredFrameNum)
+{
+    skanGameFrame *foundFrame = channelFrames->ary_frames;
+    size_t         frameSize;
+    int            i;
+
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
+
+    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;
@@ -206,7 +232,7 @@ SkelQuat skelAnimStoreFrameList_c::GetSlerpValue(int globalChannelNum) const
 
     if (actionWeight > 0.001) {
         for (i = 0; i < numActionFrames; i++) {
-            pFrame = &m_blendInfo[i + 32];
+            pFrame = &m_blendInfo[i + MAX_SKEL_BLEND_MOVEMENT_FRAMES];
 
             localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
             if (localChannelNum >= 0) {
@@ -214,8 +240,9 @@ SkelQuat skelAnimStoreFrameList_c::GetSlerpValue(int globalChannelNum) const
                 if (incomingWeight == 0.0) {
                     continue;
                 }
-                pIncomingQuat =
-                    (SkelQuat *)DecodeRLEValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+                pIncomingQuat = (SkelQuat *)DecodeRLERotValue(
+                    &pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame
+                );
                 totalWeight += incomingWeight;
                 nTotal++;
 
@@ -263,8 +290,9 @@ SkelQuat skelAnimStoreFrameList_c::GetSlerpValue(int globalChannelNum) const
                 if (incomingWeight == 0.0) {
                     continue;
                 }
-                pIncomingQuat =
-                    (SkelQuat *)DecodeRLEValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+                pIncomingQuat = (SkelQuat *)DecodeRLERotValue(
+                    &pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame
+                );
                 totalWeight += incomingWeight;
                 nTotal++;
 
@@ -353,12 +381,12 @@ void skelAnimStoreFrameList_c::GetLerpValue3(int globalChannelNum, SkelVec3 *out
         VectorClear(result);
 
         for (i = 0; i < numActionFrames; i++) {
-            pFrame = &m_blendInfo[i + 32];
+            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);
+                incomingVec = DecodeRLEPosValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
                 totalWeight += incomingWeight;
                 result[0] += incomingVec[0] * incomingWeight;
                 result[1] += incomingVec[1] * incomingWeight;
@@ -389,7 +417,7 @@ void skelAnimStoreFrameList_c::GetLerpValue3(int globalChannelNum, SkelVec3 *out
         localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
         if (localChannelNum >= 0) {
             incomingWeight = pFrame->weight;
-            incomingVec    = DecodeRLEValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+            incomingVec    = DecodeRLEPosValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
             totalWeight += incomingWeight;
             result[0] += incomingVec[0] * incomingWeight;
             result[1] += incomingVec[1] * incomingWeight;
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 e85f5501..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;
@@ -56,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;
 }
 
@@ -124,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
 }
 
 /*
@@ -132,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
 }
 
 /*
@@ -180,7 +237,7 @@ Sys_GetGameAPI
 void* Sys_GetGameAPI(void* parms)
 {
     void* (*GetGameAPI) (void*);
-    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");
@@ -229,7 +286,7 @@ Sys_GetCGameAPI
 void* Sys_GetCGameAPI(void* parms)
 {
     void* (*GetCGameAPI) (void*);
-    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");
@@ -263,4 +320,15 @@ void VM_Forced_Unload_Done(void) {
 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 6146f477..3939fd30 100644
--- a/code/sys/new/sys_unix_new.c
+++ b/code/sys/new/sys_unix_new.c
@@ -49,14 +49,18 @@ Sys_PrintBackTrace
 ==================
 */
 void Sys_PrintBackTrace() {
-    void* backtrace_arr[20];
+    void* backtrace_arr[128];
+    char** backtrace_symbols_arr;
     size_t backtrace_size;
+    size_t i;
 
-    printf("----\nBacktrace:\n");
-    // get void*'s for all entries on the stack
-    backtrace_size = backtrace(backtrace_arr, sizeof(backtrace_arr) / sizeof(backtrace_arr[0]));
-    backtrace_symbols_fd(backtrace_arr, backtrace_size, STDERR_FILENO);
-    printf("----\n");
+    // 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]);
+    }
 }
 
 /*
diff --git a/code/sys/new/sys_win32_new.c b/code/sys/new/sys_win32_new.c
index afdc01dd..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,34 @@ 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);
 }
 
 /*
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 c92f19a2..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,28 +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;
-		Sys_PrintBackTrace();
+
+        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 );
@@ -834,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 ), " " );
 	}
@@ -859,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 );
@@ -868,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 02eb35ee..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				6
+#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 774336a9..42f2c20a 100644
--- a/code/tiki/tiki_anim.cpp
+++ b/code/tiki/tiki_anim.cpp
@@ -108,11 +108,7 @@ int TIKI_Anim_NumForName(dtiki_t *pmdl, const char *name)
         iMiddle = (iBottom + iTop) / 2;
 
         panimdef = pmdl->a->animdefs[iMiddle];
-        if (!panimdef) {
-            iComp = -1;
-        } else {
-            iComp = stricmp(panimdef->alias, name);
-        }
+        iComp = stricmp(panimdef->alias, name);
 
         if (!iComp) {
             if (!(panimdef->flags & TAF_RANDOM)) {
@@ -310,10 +306,12 @@ TIKI_Anim_Delta
 void TIKI_Anim_Delta(dtiki_t *pmdl, int animnum, float *delta)
 {
     if (!pmdl) {
+        VectorClear(delta);
         return;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
+        VectorClear(delta);
         return;
     }
 
@@ -321,6 +319,29 @@ void TIKI_Anim_Delta(dtiki_t *pmdl, int animnum, float *delta)
     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;
+}
+
 /*
 ===============
 TIKI_Anim_HasDelta
diff --git a/code/tiki/tiki_anim.h b/code/tiki/tiki_anim.h
index 368d5a40..7c10c0e5 100644
--- a/code/tiki/tiki_anim.h
+++ b/code/tiki/tiki_anim.h
@@ -36,6 +36,7 @@ extern "C" {
     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);
diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index 6dea190b..34ba05a2 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.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.
 
@@ -42,7 +42,7 @@ struct pchar {
 
 con_map<pchar, dtikianim_t *> *tikianimcache;
 con_map<pchar, dtiki_t *>     *tikicache;
-static skeletor_c             *skel_entity_cache[1024];
+static skeletor_c             *skel_entity_cache[TIKI_MAX_ENTITY_CACHE];
 
 template<>
 int HashCode<pchar>(const pchar& key)
@@ -83,6 +83,9 @@ dtiki_t *TIKI_FindTiki(const char *path)
     if (tikicache) {
         dtiki_t **t;
 
+        Q_strncpyz(filename, path, sizeof(filename));
+        FS_CanonicalFilename(filename);
+
         t = tikicache->find(filename);
         if (t) {
             return *t;
@@ -102,7 +105,7 @@ dtikianim_t *TIKI_RegisterTikiAnimFlags(const char *path, qboolean use)
     dtikianim_t *tiki;
     char         filename[1024];
 
-    strcpy(filename, path);
+    Q_strncpyz(filename, path, sizeof(filename));
     FS_CanonicalFilename(filename);
 
     if (tikianimcache) {
@@ -119,8 +122,8 @@ dtikianim_t *TIKI_RegisterTikiAnimFlags(const char *path, qboolean use)
     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);
+            Com_DPrintf("^~^~^ Add the following line to the *_precache.scr map script:\n");
+            Com_DPrintf("cache %s\n", filename);
         }
 
         (*tikianimcache)[tiki->name] = tiki;
@@ -182,9 +185,9 @@ dtiki_t *TIKI_RegisterTikiFlags(const char *path, qboolean use)
         strcat(full_filename, "|");
     }
 
-    strcpy(filename, name);
+    Q_strncpyz(filename, name, sizeof(filename));
     FS_CanonicalFilename(filename);
-    strcat(full_filename, filename);
+    Q_strcat(full_filename, sizeof(full_filename), filename);
 
     if (!tikicache) {
         tikicache = new con_map<pchar, dtiki_t *>;
@@ -245,14 +248,15 @@ void TIKI_FreeAll()
             }
 
             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;
-			}
-			*/
+            if (tiki->a->m_aliases) {
+                TIKI_Free(tiki->a->m_aliases);
+                tiki->a->m_aliases = NULL;
+                tiki->a->num_anims = 0;
+            }
+            */
 
             TIKI_Free(tiki);
         }
@@ -268,6 +272,8 @@ void TIKI_FreeAll()
 
             TIKI_RemoveTiki(tikianim);
 
+            // Fixed in OPM
+            //  Each tikianim should free their aliases
             if (tikianim->m_aliases) {
                 TIKI_Free(tikianim->m_aliases);
                 tikianim->m_aliases = NULL;
@@ -281,11 +287,10 @@ void TIKI_FreeAll()
     }
 
     tiki_loading = true;
-    if (skelcache) {
-        for (i = 0; i < cache_maxskel; i++) {
-            if (skelcache->skel) {
-                TIKI_FreeSkel(i);
-            }
+
+    for (i = 0; i < cache_maxskel; i++) {
+        if (skelcache[i].skel) {
+            TIKI_FreeSkel(i);
         }
     }
 }
@@ -300,6 +305,8 @@ static qboolean tiki_started;
 void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
 {
     skeletor_c *skel;
+    int         i;
+    int         index;
 
     if (entnum == ENTITYNUM_NONE) {
         if (!tiki->skeletor) {
@@ -307,17 +314,34 @@ void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
         }
         skel = (skeletor_c *)tiki->skeletor;
     } else {
-        skel = skel_entity_cache[entnum];
-        if (skel) {
-            if (skel->m_Tiki == tiki) {
-                return skel_entity_cache[entnum];
+        // 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;
+
+            skel = skel_entity_cache[index];
+            if (!skel) {
+                break;
             }
 
+            if (skel->m_Tiki == tiki) {
+                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[entnum] = skel;
+        skel                     = new skeletor_c(tiki);
+        skel_entity_cache[index] = skel;
     }
 
     return skel;
@@ -331,15 +355,17 @@ TIKI_DeleteSkeletor
 static void TIKI_DeleteSkeletor(int entnum)
 {
     skeletor_c *skel;
+    int         i;
 
     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;
+        }
     }
 }
 
@@ -352,7 +378,7 @@ void TIKI_Begin(void)
 {
     int i;
 
-    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+    for (i = 0; i < TIKI_MAX_ENTITY_CACHE; i++) {
         skel_entity_cache[i] = 0;
     }
 
@@ -368,7 +394,7 @@ void TIKI_End(void)
 {
     int i;
 
-    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+    for (i = 0; i < MAX_GENTITIES; i++) {
         TIKI_DeleteSkeletor(i);
     }
 
diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 71a50f0d..8e217113 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.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.
 
@@ -93,6 +93,54 @@ void *TIKI_AllocateLoadData(size_t 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");
+}
+
 /*
 ===============
 TIKI_CopyString
@@ -121,14 +169,20 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
     msg_t        modelBuf;
     str          s;
     char         tempName[257];
+    const char  *ext;
 
     memset(&loaddef, 0, sizeof(dloaddef_t));
     loaddef.modelBuf = &modelBuf;
 
     TIKI_InitSetup(&loaddef);
 
+    loaddef.path              = path;
+    loaddef.numanims          = 0;
+    loaddef.numserverinitcmds = 0;
+    loaddef.numclientinitcmds = 0;
+
     if (loaddef.tikiFile.LoadFile(path, qfalse)) {
-        loaddef.path = path;
+        loaddef.bInIncludesSection = false;
 
         token = loaddef.tikiFile.GetToken(true);
         if (strcmp(token, "TIKI")) {
@@ -141,24 +195,19 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
             return NULL;
         }
 
-        loaddef.numanims           = 0;
-        loaddef.numserverinitcmds  = 0;
-        loaddef.numclientinitcmds  = 0;
-        loaddef.bInIncludesSection = false;
-
         while (loaddef.tikiFile.TokenAvailable(true)) {
             token = loaddef.tikiFile.GetToken(true);
 
-            if (!stricmp(token, "setup")) {
+            if (!Q_stricmp(token, "setup")) {
                 if (!TIKI_ParseSetup(&loaddef)) {
                     TIKI_FreeStorage(&loaddef);
                     return NULL;
                 }
-            } else if (!stricmp(token, "init")) {
+            } else if (!Q_stricmp(token, "init")) {
                 TIKI_ParseInit(&loaddef);
-            } else if (!stricmp(token, "animations")) {
+            } else if (!Q_stricmp(token, "animations")) {
                 TIKI_ParseAnimations(&loaddef);
-            } else if (!stricmp(token, "includes")) {
+            } else if (!Q_stricmp(token, "includes")) {
                 if (!loaddef.bInIncludesSection) {
                     loaddef.bInIncludesSection = TIKI_ParseIncludes(&loaddef);
                 } else {
@@ -169,7 +218,7 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
                         loaddef.tikiFile.Filename()
                     );
                 }
-            } else if (!stricmp(token, "}") && loaddef.bInIncludesSection) {
+            } else if (!Q_stricmp(token, "}") && loaddef.bInIncludesSection) {
                 loaddef.bInIncludesSection = false;
             } else {
                 TIKI_Error(
@@ -189,36 +238,49 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
         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);
+        ext = strstr(path, ".");
+        if (!ext) {
+            return NULL;
+        }
+
+        Q_strncpyz(tempName, path, ext - path + 1);
+        tempName[ext - path] = 0;
+        Q_strcat(tempName, sizeof(tempName), ".skd");
+        WriteSkelmodel(&loaddef, tempName);
+
+        loaddef.hasSkel = true;
+    }
+
+    TIKI_AddDefaultIdleAnim(&loaddef);
+    if (loaddef.numanims) {
+        Com_sprintf(tempName, sizeof(tempName), "a%s", path);
+        UI_LoadResource(tempName);
+
+        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);
 
-            tiki = TIKI_FillTIKIStructureSkel(&loaddef);
-            if (tiki) {
-                sprintf(tempName, "b%s", path);
-                UI_LoadResource(tempName);
-                sprintf(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);
-                sprintf(tempName, "d%s", path);
-                UI_LoadResource(tempName);
-            } else {
-                TIKI_FreeStorage(&loaddef);
+            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_Error("TIKI_LoadTIKIfile: No valid animations found in %s.\n", loaddef.tikiFile.Filename());
             TIKI_FreeStorage(&loaddef);
         }
     } else {
-        loaddef.tikiFile.Close();
+        TIKI_Error("TIKI_LoadTIKIfile: No valid animations found in %s.\n", loaddef.tikiFile.Filename());
+        TIKI_FreeStorage(&loaddef);
     }
 
     return tiki;
@@ -240,8 +302,9 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
 
     struct {
         dtiki_t   tiki;
-        short int buffer[1000];
+        short int buffer[32];
     } temp;
+    dtiki_t* temp_tiki;
 
     //int skel;
     dloadsurface_t     loadsurfaces[24];
@@ -255,8 +318,12 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
     qboolean           found;
     byte              *start_ptr, *max_ptr, *ptr;
 
+    // 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;
+
     TIKI_LoadSetup(
-        &temp.tiki,
+        temp_tiki,
         tikianim->name,
         loadsurfaces,
         &numSurfacesSetUp,
@@ -264,33 +331,33 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
         tikianim->modelDataSize,
         keyValues
     );
-    if (!temp.tiki.numMeshes) {
-        Com_Printf("^~^~^ Model '%s' has no skelmodel\n", tikianim->name);
+    if (!temp_tiki->numMeshes) {
+        Com_DPrintf("^~^~^ Model '%s' has no skelmodel\n", tikianim->name);
         return NULL;
     }
 
     defsize = sizeof(dtiki_t) - sizeof(tiki->mesh);
-    defsize += temp.tiki.numMeshes * sizeof(short);
+    defsize += temp_tiki->numMeshes * sizeof(short);
     defsize += strlen(name) + 1;
     defsize = PAD(defsize, sizeof(void *));
-    defsize += temp.tiki.num_surfaces * sizeof(dtikisurface_t);
+    defsize += temp_tiki->num_surfaces * sizeof(dtikisurface_t);
 
     tiki = (dtiki_t *)TIKI_Alloc(defsize);
     memset(tiki, 0, defsize);
 
     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]);
+    ptr       = start_ptr + sizeof(dtiki_t) - sizeof(tiki->mesh) + temp_tiki->numMeshes * sizeof(tiki->mesh[0]);
 
     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->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;
@@ -298,12 +365,13 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
     tikiSurf = (dtikisurface_t *)ptr;
     tiki->m_boneList.ZeroChannels();
 
-    assert((byte *)(tikiSurf + temp.tiki.num_surfaces) <= max_ptr);
+    assert((byte *)(tikiSurf + temp_tiki->num_surfaces) <= max_ptr);
 
-    for (i = 0; i < temp.tiki.numMeshes; i++) {
-        mesh          = temp.tiki.mesh[i];
+    for (i = 0; i < temp_tiki->numMeshes; i++) {
+        mesh          = temp_tiki->mesh[i];
         tiki->mesh[i] = mesh;
-        skelmodel     = skelcache[mesh].skel;
+
+        skelmodel = skelcache[mesh].skel;
         skelcache[mesh].numuses++;
 
         for (j = 0; j < skelmodel->numBones; j++) {
@@ -312,8 +380,8 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
     }
 
     tiki->m_boneList.PackChannels();
-    VectorCopy(temp.tiki.light_offset, tiki->light_offset);
-    VectorCopy(temp.tiki.load_origin, tiki->load_origin);
+    VectorCopy(temp_tiki->light_offset, tiki->light_offset);
+    VectorCopy(temp_tiki->load_origin, tiki->load_origin);
     tiki->surfaces = tikiSurf;
 
     for (i = 0; i < numSurfacesSetUp; i++) {
@@ -323,9 +391,9 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
 
         surfOffset = 0;
 
-        if (strptr || !stricmp(loadsurf->name, "all")) {
-            for (j = 0; j < temp.tiki.numMeshes; j++) {
-                mesh      = temp.tiki.mesh[j];
+        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;
 
@@ -334,7 +402,7 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
 
                     if ((strptr && strptr != loadsurf->name
                          && !strnicmp(loadsurf->name, surf->name, strptr - loadsurf->name))
-                        || !stricmp(loadsurf->name, "all")) {
+                        || !Q_stricmp(loadsurf->name, "all")) {
                         TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
                         found = true;
                     }
@@ -345,15 +413,15 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
                 surfOffset += skelmodel->numSurfaces;
             }
         } else {
-            for (j = 0; j < temp.tiki.numMeshes; j++) {
-                mesh      = temp.tiki.mesh[j];
+            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++) {
-                    if (!stricmp(loadsurf->name, surf->name)) {
+                    if (!Q_stricmp(loadsurf->name, surf->name)) {
                         TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
                         if (!tikiSurf->name[0]) {
                             TIKI_Warning(
@@ -384,6 +452,33 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
         }
     }
 
+    // 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);
     }
@@ -441,11 +536,11 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
     Skel_ExtractFileExtension(path, extension);
 
     if (strcmp(extension, "skc")) {
-        Com_Printf("Skeletor CacheAnimSkel: %s: File extension unknown.  Attempting to open as skc file\n", path);
+        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) {
@@ -454,7 +549,7 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
     } else {
         iBuffLength = TIKI_ReadFileEx(path, (void **)&pHeader, qtrue);
         if (iBuffLength <= 0) {
-            Com_Printf("Skeletor CacheAnimSkel: Could not open binary file %s\n", path);
+            Com_DPrintf("Skeletor CacheAnimSkel: Could not open binary file %s\n", path);
             return NULL;
         }
 
@@ -462,7 +557,7 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
         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(
+            Com_DPrintf(
                 "Skeletor CacheAnimSkel: anim %s has wrong header ([ident,version] = [%i,%i] should be [%i,%i])\n",
                 path,
                 ident,
@@ -475,7 +570,22 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
         }
 
         if (version == TIKI_SKC_HEADER_OLD_VERSION) {
-            Com_Printf("WARNING- DOWNGRADING TO OLD ANIMATION FORMAT FOR FILE: %s\n", path);
+            Com_DPrintf("WARNING- DOWNGRADING TO OLD ANIMATION FORMAT FOR FILE: %s\n", path);
+
+            //
+            // 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);
+
             finishedHeader = skeletor_c::ConvertSkelFileToGame(pHeader, iBuffLength, path);
             if (convertAnims && convertAnims->integer) {
                 skeletor_c::SaveProcessedAnim(finishedHeader, path, pHeader);
@@ -540,7 +650,7 @@ bool SkeletorCacheFindFilename(const char *path, int *indexPtr)
     upperBound = m_numInCache - 1;
     while (lowerBound <= upperBound) {
         index     = (lowerBound + upperBound) / 2;
-        sortValue = stricmp(path, m_cachedData[m_cachedDataLookup[index]].path);
+        sortValue = Q_stricmp(path, m_cachedData[m_cachedDataLookup[index]].path);
         if (!sortValue) {
             if (indexPtr) {
                 *indexPtr = index;
@@ -604,7 +714,7 @@ bool SkeletorCacheLoadData(const char *path, bool precache, int newIndex)
     m_cachedDataLookup[newIndex] = lookup;
     m_cachedData[lookup].lookup  = newIndex;
     m_cachedData[lookup].data    = data;
-    strcpy(m_cachedData[lookup].path, path);
+    Q_strncpyz(m_cachedData[lookup].path, path, sizeof(m_cachedData[lookup].path));
     m_cachedData[lookup].numusers = 0;
     m_numInCache++;
 
@@ -632,9 +742,10 @@ void SkeletorCacheUnloadData(int index)
     }
 
     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;
+
+    for (i = index; i < m_numInCache; i++) {
+        m_cachedDataLookup[i] = m_cachedDataLookup[i + 1];
+        m_cachedData[m_cachedDataLookup[i]].lookup = i;
     }
 }
 
@@ -647,9 +758,12 @@ void SkeletorCacheCleanCache()
 {
     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);
         }
     }
 }
@@ -766,6 +880,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
     byte       *max_ptr;
     dtikicmd_t *pcmds;
     int         i, k;
+    int         numLoadedAnims;
     size_t      j;
     size_t      size;
     //int anim_index;
@@ -853,6 +968,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
     assert(ptr <= max_ptr);
 
     // Process anim commands
+    numLoadedAnims = 0;
     for (i = 0; i < ld->numanims; i++) {
         anim = ld->loadanims[order[i]];
         if (!SkeletorCacheFindFilename(anim->name, &index)) {
@@ -863,8 +979,15 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
             }
 
             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;
+                }
+
                 TIKI_Error("TIKI_InitTiki: Failed to load animation '%s' at %s\n", anim->name, anim->location);
-                panim->m_aliases[i] = -1;
                 continue;
             }
         }
@@ -873,9 +996,9 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         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);
+        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;
 
@@ -957,15 +1080,17 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         }
 
         assert(ptr <= max_ptr);
+
+        numLoadedAnims++;
     }
 
     panim->m_aliases = NULL;
-    if (i) {
+    if (numLoadedAnims) {
         if (!bModelBoundsSet) {
             TIKI_DPrintf("TIKI_InitTiki: no 'idle' animation found, model bounds not set for %s\n", ld->path);
         }
 
-        panim->num_anims = i;
+        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;
@@ -983,7 +1108,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         memcpy(panim->headskins, ld->headskins, size);
         ptr += size;
 
-        sprintf(tempName, "h%s", ld->path);
+        Com_sprintf(tempName, sizeof(tempName), "h%s", ld->path);
         UI_LoadResource(tempName);
 
         if (low_anim_memory && (!low_anim_memory->integer || !tiki_loading)) {
@@ -991,6 +1116,9 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         }
     } 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;
     }
 
diff --git a/code/tiki/tiki_files.h b/code/tiki/tiki_files.h
index 7126f80a..518d0f88 100644
--- a/code/tiki/tiki_files.h
+++ b/code/tiki/tiki_files.h
@@ -41,6 +41,8 @@ extern "C" {
 
     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);
 
diff --git a/code/tiki/tiki_imports.cpp b/code/tiki/tiki_imports.cpp
index 33b1bf44..2a7b975f 100644
--- a/code/tiki/tiki_imports.cpp
+++ b/code/tiki/tiki_imports.cpp
@@ -32,7 +32,7 @@ void TIKI_DPrintf(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
 
     Com_DPrintf("%s", msg);
diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index e11b2ad1..1b977811 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -28,6 +28,26 @@ 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
@@ -71,7 +91,7 @@ void TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxc
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "}")) {
+        if (!Q_stricmp(token, "}")) {
             break;
         }
 
@@ -90,22 +110,22 @@ void TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxc
             cmds->num_args = 0;
             (*numcmds)++;
 
-            if (!stricmp(token, "start") || !stricmp(token, "first")) {
+            if (!Q_stricmp(token, "start") || !Q_stricmp(token, "first")) {
                 framenum = TIKI_FRAME_FIRST;
-            } else if (!stricmp(token, "end")) {
+            } else if (!Q_stricmp(token, "end")) {
                 framenum = TIKI_FRAME_END;
-            } else if (!stricmp(token, "last")) {
+            } else if (!Q_stricmp(token, "last")) {
                 framenum = TIKI_FRAME_LAST;
-            } else if (!stricmp(token, "every")) {
+            } else if (!Q_stricmp(token, "every")) {
                 framenum = TIKI_FRAME_EVERY;
-            } else if (!stricmp(token, "exit")) {
+            } else if (!Q_stricmp(token, "exit")) {
                 framenum = TIKI_FRAME_EXIT;
-            } else if (!stricmp(token, "entry") || !stricmp(token, "enter")) {
+            } else if (!Q_stricmp(token, "entry") || !Q_stricmp(token, "enter")) {
                 framenum = TIKI_FRAME_ENTRY;
-            } else if (!stricmp(token, "(")) {
+            } else if (!Q_stricmp(token, "(")) {
                 usecurrentframe = true;
                 ld->tikiFile.UnGetToken();
-            } else if (!stricmp(token, ")")) {
+            } else if (!Q_stricmp(token, ")")) {
                 usecurrentframe = false;
                 ld->tikiFile.UnGetToken();
             } else if (!usecurrentframe) {
@@ -130,7 +150,7 @@ void TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxc
 
             cmds->frame_num = framenum;
             if (ld->tikiFile.currentScript) {
-                sprintf(cmds->location, "%s, line: %d", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber());
+                Com_sprintf(cmds->location, sizeof(cmds->location), "%s, line: %d", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber());
             }
 
             while (ld->tikiFile.TokenAvailable(false)) {
@@ -175,21 +195,21 @@ void TIKI_ParseAnimationCommands(dloaddef_t *ld, dloadanim_t *anim)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "client")) {
+        if (!Q_stricmp(token, "client")) {
             TIKI_ParseFrameCommands(
                 ld,
                 anim->loadclientcmds,
                 sizeof(anim->loadclientcmds) / sizeof(anim->loadclientcmds[0]),
                 &anim->num_client_cmds
             );
-        } else if (!stricmp(token, "server")) {
+        } else if (!Q_stricmp(token, "server")) {
             TIKI_ParseFrameCommands(
                 ld,
                 anim->loadservercmds,
                 sizeof(anim->loadservercmds) / sizeof(anim->loadservercmds[0]),
                 &anim->num_server_cmds
             );
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             break;
         } else {
             TIKI_Error(
@@ -221,26 +241,26 @@ void TIKI_ParseAnimationFlags(dloaddef_t *ld, dloadanim_t *anim)
     while (ld->tikiFile.TokenAvailable(false)) {
         token = ld->tikiFile.GetToken(false);
 
-        if (!stricmp(token, "weight")) {
+        if (!Q_stricmp(token, "weight")) {
             anim->weight = ld->tikiFile.GetFloat(false);
             anim->flags |= TAF_RANDOM;
-        } else if (!stricmp(token, "deltadriven")) {
+        } else if (!Q_stricmp(token, "deltadriven")) {
             anim->flags |= TAF_DELTADRIVEN;
-        } else if (!stricmp(token, "default_angles")) {
+        } else if (!Q_stricmp(token, "default_angles")) {
             anim->flags |= TAF_DEFAULT_ANGLES;
-        } else if (!stricmp(token, "notimecheck")) {
+        } else if (!Q_stricmp(token, "notimecheck")) {
             anim->flags |= TAF_NOTIMECHECK;
-        } else if (!stricmp(token, "crossblend")) {
+        } else if (!Q_stricmp(token, "crossblend")) {
             anim->blendtime = ld->tikiFile.GetFloat(false);
-        } else if (!stricmp(token, "dontrepeate")) {
+        } else if (!Q_stricmp(token, "dontrepeate")) {
             anim->flags |= TAF_NOREPEAT;
-        } else if (!stricmp(token, "random")) {
+        } else if (!Q_stricmp(token, "random")) {
             anim->flags |= TAF_RANDOM;
-        } else if (!stricmp(token, "autosteps_run")) {
+        } else if (!Q_stricmp(token, "autosteps_run")) {
             anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_RUNNING | TAF_AUTOSTEPS_EQUIPMENT;
-        } else if (!stricmp(token, "autosteps_walk")) {
+        } else if (!Q_stricmp(token, "autosteps_walk")) {
             anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_EQUIPMENT;
-        } else if (!stricmp(token, "autosteps_dog")) {
+        } else if (!Q_stricmp(token, "autosteps_dog")) {
             anim->flags |= TAF_AUTOSTEPS;
         } else {
             TIKI_Error(
@@ -272,7 +292,7 @@ void TIKI_ParseAnimationsFail(dloaddef_t *ld)
     }
 
     token = ld->tikiFile.GetToken(true);
-    if (stricmp(token, "{")) {
+    if (Q_stricmp(token, "{")) {
         ld->tikiFile.UnGetToken();
         return;
     }
@@ -281,9 +301,9 @@ void TIKI_ParseAnimationsFail(dloaddef_t *ld)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "{")) {
+        if (!Q_stricmp(token, "{")) {
             nestcount++;
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             nestcount--;
             if (!nestcount) {
                 break;
@@ -322,9 +342,9 @@ qboolean TIKI_ParseIncludes(dloaddef_t *ld)
     }
 
     while (1) {
-        if (!strncmp(token, mapname, strlen(token)) || !strncmp(token, servertype, strlen(token))) {
+        if (!Q_stricmpn(token, mapname, strlen(token)) || !Q_stricmpn(token, servertype, strlen(token))) {
             b_incl = true;
-        } else if ((!stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true))) {
+        } else if (!Q_stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true)) {
             break;
         }
 
@@ -353,6 +373,22 @@ qboolean TIKI_ParseIncludes(dloaddef_t *ld)
     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;
+}
+
 /*
 ===============
 TIKI_ParseAnimations
@@ -370,9 +406,13 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "}")) {
-            return;
-        } else if (!stricmp(token, "$mapspec")) {
+        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;
@@ -381,9 +421,9 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
             }
 
             while (ld->tikiFile.TokenAvailable(true)) {
-                if (!strncmp(token, mapname, strlen(token))) {
+                if (!Q_stricmpn(token, mapname, strlen(token))) {
                     b_mapspec = true;
-                } else if (!stricmp(token, "{")) {
+                } else if (!Q_stricmp(token, "{")) {
                     break;
                 }
 
@@ -407,7 +447,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
                 }
             }
         } else {
-            if (ld->numanims > 4094) {
+            if (ld->numanims >= MAX_TIKI_LOAD_ANIMS) {
                 TIKI_Error("TIKI_ParseAnimations: Too many animations in '%s'.\n", ld->path);
                 continue;
             }
@@ -424,18 +464,18 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
                 continue;
             }
 
-            depth = strlen(token);
-            if (depth < 48) {
+            if (strlen(token) < 48) {
                 anim->alias = (char *)TIKI_CopyString(token);
 
                 token = ld->tikiFile.GetToken(false);
-                strcpy(anim->name, TikiScript::currentScript->path);
-                strcat(anim->name, token);
+                Q_strncpyz(anim->name, TikiScript::currentScript->path, sizeof(anim->name));
+                Q_strcat(anim->name, sizeof(anim->name), token);
 
                 anim->location[0] = 0;
                 if (ld->tikiFile.currentScript) {
-                    sprintf(
+                    Com_sprintf(
                         anim->location,
+                        sizeof(anim->location),
                         "%s, line: %d",
                         ld->tikiFile.currentScript->Filename(),
                         ld->tikiFile.currentScript->GetLineNumber()
@@ -449,7 +489,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
 
                 if (ld->tikiFile.TokenAvailable(true)) {
                     token = ld->tikiFile.GetToken(true);
-                    if (!stricmp(token, "{")) {
+                    if (!Q_stricmp(token, "{")) {
                         TIKI_ParseAnimationCommands(ld, anim);
                     } else {
                         ld->tikiFile.UnGetToken();
@@ -474,21 +514,21 @@ int TIKI_ParseSurfaceFlag(const char *token)
 {
     int flags = 0;
 
-    if (!stricmp(token, "skin1")) {
+    if (!Q_stricmp(token, "skin1")) {
         flags = TIKI_SURF_SKIN1;
-    } else if (!stricmp(token, "skin2")) {
+    } else if (!Q_stricmp(token, "skin2")) {
         flags = TIKI_SURF_SKIN2;
-    } else if (!stricmp(token, "skin3")) {
+    } else if (!Q_stricmp(token, "skin3")) {
         flags = TIKI_SURF_SKIN3;
-    } else if (!stricmp(token, "nodraw")) {
+    } else if (!Q_stricmp(token, "nodraw")) {
         flags = TIKI_SURF_NODRAW;
-    } else if (!stricmp(token, "nodamage")) {
+    } else if (!Q_stricmp(token, "nodamage")) {
         flags = TIKI_SURF_NODAMAGE;
-    } else if (!stricmp(token, "crossfade")) {
+    } else if (!Q_stricmp(token, "crossfade")) {
         flags = TIKI_SURF_CROSSFADE;
-    } else if (!stricmp(token, "nomipmaps")) {
+    } else if (!Q_stricmp(token, "nomipmaps")) {
         flags = TIKI_SURF_NOMIPMAPS;
-    } else if (!stricmp(token, "nopicmip")) {
+    } else if (!Q_stricmp(token, "nopicmip")) {
         flags = TIKI_SURF_NOPICMIP;
     } else {
         TIKI_Error("Unknown surface flag %s\n", token);
@@ -504,7 +544,7 @@ WriteScale
 */
 static void WriteScale(dloaddef_t *ld, float scale)
 {
-    MSG_WriteByte(ld->modelBuf, 0);
+    MSG_WriteByte(ld->modelBuf, SETUP_LOAD_SCALE);
     MSG_WriteFloat(ld->modelBuf, scale);
 }
 
@@ -515,7 +555,7 @@ WriteLoadScale
 */
 static void WriteLoadScale(dloaddef_t *ld, float lod_scale)
 {
-    MSG_WriteByte(ld->modelBuf, 1);
+    MSG_WriteByte(ld->modelBuf, SETUP_LOD_SCALE);
     MSG_WriteFloat(ld->modelBuf, lod_scale);
 }
 
@@ -526,7 +566,7 @@ WriteLodBias
 */
 static void WriteLodBias(dloaddef_t *ld, float lod_bias)
 {
-    MSG_WriteByte(ld->modelBuf, 2);
+    MSG_WriteByte(ld->modelBuf, SETUP_LOD_BIAS);
     MSG_WriteFloat(ld->modelBuf, lod_bias);
 }
 
@@ -535,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_WriteByte(ld->modelBuf, SETUP_SKELMODEL);
     MSG_WriteString(ld->modelBuf, name);
+
+    Q_strncpyz(ld->idleSkel, name, sizeof(ld->idleSkel));
+    ld->numskels++;
 }
 
 /*
@@ -548,7 +591,7 @@ WriteOrigin
 */
 static void WriteOrigin(dloaddef_t *ld, float origin_x, float origin_y, float origin_z)
 {
-    MSG_WriteByte(ld->modelBuf, 4);
+    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);
@@ -561,7 +604,7 @@ WriteLightOffset
 */
 static void WriteLightOffset(dloaddef_t *ld, float light_offset_x, float light_offset_y, float light_offset_z)
 {
-    MSG_WriteByte(ld->modelBuf, 5);
+    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);
@@ -574,7 +617,7 @@ WriteRadius
 */
 static void WriteRadius(dloaddef_t *ld, float radius)
 {
-    MSG_WriteByte(ld->modelBuf, 6);
+    MSG_WriteByte(ld->modelBuf, SETUP_RADIUS);
     MSG_WriteFloat(ld->modelBuf, radius);
 }
 
@@ -585,7 +628,7 @@ WriteSurface
 */
 static void WriteSurface(dloaddef_t *ld, const char *surface)
 {
-    MSG_WriteByte(ld->modelBuf, 7);
+    MSG_WriteByte(ld->modelBuf, SETUP_SURFACE);
     MSG_WriteString(ld->modelBuf, surface);
 }
 
@@ -596,7 +639,7 @@ WriteFlags
 */
 static void WriteFlags(dloaddef_t *ld, int flags)
 {
-    MSG_WriteByte(ld->modelBuf, 8);
+    MSG_WriteByte(ld->modelBuf, SETUP_FLAGS);
     MSG_WriteLong(ld->modelBuf, flags);
 }
 
@@ -607,7 +650,7 @@ WriteDamage
 */
 static void WriteDamage(dloaddef_t *ld, float damage)
 {
-    MSG_WriteByte(ld->modelBuf, 9);
+    MSG_WriteByte(ld->modelBuf, SETUP_DAMAGE);
     MSG_WriteFloat(ld->modelBuf, damage);
 }
 
@@ -618,7 +661,7 @@ WriteShader
 */
 static void WriteShader(dloaddef_t *ld, const char *shader)
 {
-    MSG_WriteByte(ld->modelBuf, 10);
+    MSG_WriteByte(ld->modelBuf, SETUP_SHADER);
     MSG_WriteString(ld->modelBuf, shader);
 }
 
@@ -629,7 +672,7 @@ WriteBeginCase
 */
 static void WriteBeginCase(dloaddef_t *ld)
 {
-    MSG_WriteByte(ld->modelBuf, 13);
+    MSG_WriteByte(ld->modelBuf, SETUP_BEGIN_CASE);
 }
 
 /*
@@ -639,7 +682,7 @@ WriteCaseKey
 */
 static void WriteCaseKey(dloaddef_t *ld, const char *key)
 {
-    MSG_WriteByte(ld->modelBuf, 11);
+    MSG_WriteByte(ld->modelBuf, SETUP_CASE_KEY);
     MSG_WriteString(ld->modelBuf, key);
 }
 
@@ -650,7 +693,7 @@ WriteCaseValue
 */
 static void WriteCaseValue(dloaddef_t *ld, const char *value)
 {
-    MSG_WriteByte(ld->modelBuf, 12);
+    MSG_WriteByte(ld->modelBuf, SETUP_CASE_VALUE);
     MSG_WriteString(ld->modelBuf, value);
 }
 
@@ -661,7 +704,7 @@ WriteBeginCaseBody
 */
 static void WriteBeginCaseBody(dloaddef_t *ld)
 {
-    MSG_WriteByte(ld->modelBuf, 14);
+    MSG_WriteByte(ld->modelBuf, SETUP_BEGIN_CASE_BODY);
 }
 
 /*
@@ -671,7 +714,7 @@ WriteEndCase
 */
 static void WriteEndCase(dloaddef_t *ld)
 {
-    MSG_WriteByte(ld->modelBuf, 15);
+    MSG_WriteByte(ld->modelBuf, SETUP_END_CASE);
 }
 
 /*
@@ -705,25 +748,24 @@ qboolean TIKI_LoadSetupCaseHeader(
     const char *value;
     qboolean    match = false;
 
-    while (c != 14) {
+    while (c != SETUP_BEGIN_CASE_BODY) {
         c = MSG_ReadByte(msg);
         switch (c) {
-        case 11:
+        case SETUP_CASE_KEY:
             value = MSG_ReadString(msg);
             key   = value;
             break;
-        case 12:
+        case SETUP_CASE_VALUE:
             value = MSG_ReadString(msg);
             if (skip || match || !keyValues) {
                 break;
             }
 
             val = keyValues->find(key);
-            if (val && !stricmp(val->c_str(), value)) {
+            if (val && !Q_stricmp(val->c_str(), value)) {
                 match = true;
             }
             break;
-        case 14:
         default:
             break;
         }
@@ -766,28 +808,28 @@ qboolean TIKI_LoadSetupCase(
         switch (c) {
         default:
             break;
-        case 0:
+        case SETUP_LOAD_SCALE:
             load_scale = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->load_scale = load_scale;
             break;
-        case 1:
+        case SETUP_LOD_SCALE:
             lod_scale = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->lod_scale = lod_scale;
             break;
-        case 2:
+        case SETUP_LOD_BIAS:
             lod_bias = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->lod_bias = lod_bias;
             break;
-        case 3:
+        case SETUP_SKELMODEL:
             name = MSG_ReadString(msg);
             if (skip) {
                 break;
@@ -808,7 +850,7 @@ qboolean TIKI_LoadSetupCase(
             tiki->num_surfaces += skelmodel->numSurfaces;
             tiki->numMeshes++;
             break;
-        case 4:
+        case SETUP_LOAD_ORIGIN:
             load_origin[0] = MSG_ReadFloat(msg);
             load_origin[1] = MSG_ReadFloat(msg);
             load_origin[2] = MSG_ReadFloat(msg);
@@ -817,7 +859,7 @@ qboolean TIKI_LoadSetupCase(
             }
             VectorCopy(load_origin, tiki->load_origin);
             break;
-        case 5:
+        case SETUP_LIGHT_OFFSET:
             light_offset[0] = MSG_ReadFloat(msg);
             light_offset[1] = MSG_ReadFloat(msg);
             light_offset[2] = MSG_ReadFloat(msg);
@@ -826,21 +868,21 @@ qboolean TIKI_LoadSetupCase(
             }
             VectorCopy(light_offset, tiki->load_origin);
             break;
-        case 6:
+        case SETUP_RADIUS:
             radius = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->radius = radius;
             break;
-        case 7:
+        case SETUP_SURFACE:
             name = MSG_ReadString(msg);
             if (skip) {
                 break;
             }
 
             for (currentSurface = 0; currentSurface < *numSurfacesSetUp; currentSurface++) {
-                if (!stricmp(loadsurfaces[currentSurface].name, name)) {
+                if (!Q_stricmp(loadsurfaces[currentSurface].name, name)) {
                     break;
                 }
             }
@@ -849,23 +891,23 @@ qboolean TIKI_LoadSetupCase(
                 loadsurfaces[currentSurface].flags = 0;
                 (*numSurfacesSetUp)++;
             }
-            strcpy(loadsurfaces[currentSurface].name, name);
+            Q_strncpyz(loadsurfaces[currentSurface].name, name, sizeof(loadsurfaces[currentSurface].name));
             break;
-        case 8:
+        case SETUP_FLAGS:
             flags = MSG_ReadLong(msg);
             if (skip) {
                 break;
             }
             loadsurfaces[currentSurface].flags |= flags;
             break;
-        case 9:
+        case SETUP_DAMAGE:
             damage_multiplier = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             loadsurfaces[currentSurface].damage_multiplier = damage_multiplier;
             break;
-        case 10:
+        case SETUP_SHADER:
             name = MSG_ReadString(msg);
             if (skip) {
                 break;
@@ -887,13 +929,13 @@ qboolean TIKI_LoadSetupCase(
             );
             loadsurfaces[currentSurface].numskins++;
             break;
-        case 13:
+        case SETUP_BEGIN_CASE:
             if (!TIKI_LoadSetupCaseHeader(tiki, filename, loadsurfaces, numSurfacesSetUp, msg, skip, keyValues)) {
                 return false;
             }
             break;
-        case -1:
-        case 15:
+        case SETUP_END_MESSAGE:
+        case SETUP_END_CASE:
             return true;
         }
     }
@@ -979,72 +1021,72 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
 
-        if (!stricmp(token, "scale")) {
+        if (!Q_stricmp(token, "scale")) {
             load_scale = ld->tikiFile.GetFloat(false);
             WriteScale(ld, load_scale);
-        } else if (!stricmp(token, "lod_scale")) {
+        } else if (!Q_stricmp(token, "lod_scale")) {
             lod_scale = ld->tikiFile.GetFloat(false) / 5.0f;
             WriteLoadScale(ld, lod_scale);
-        } else if (!stricmp(token, "lod_bias")) {
+        } else if (!Q_stricmp(token, "lod_bias")) {
             lod_bias = ld->tikiFile.GetFloat(false);
             WriteLodBias(ld, lod_bias);
-        } else if (!stricmp(token, "skelmodel")) {
+        } else if (!Q_stricmp(token, "skelmodel")) {
             token = ld->tikiFile.GetToken(false);
-            strcpy(name, ld->tikiFile.currentScript->path);
-            strcat(name, token);
+            Q_strncpyz(name, ld->tikiFile.currentScript->path, sizeof(name));
+            Q_strcat(name, sizeof(name), token);
             WriteSkelmodel(ld, name);
-        } else if (!stricmp(token, "path")) {
+        } else if (!Q_stricmp(token, "path")) {
             token = ld->tikiFile.GetToken(false);
-            strcpy(ld->tikiFile.currentScript->path, token);
+            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, "/");
+                Q_strcat(ld->tikiFile.currentScript->path, sizeof(ld->tikiFile.currentScript->path), "/");
             }
-        } else if (!stricmp(token, "orgin")) {
+        } 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 (!stricmp(token, "lightoffset")) {
+        } 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 (!stricmp(token, "radius")) {
+        } else if (!Q_stricmp(token, "radius")) {
             tmpFloat = ld->tikiFile.GetFloat(false);
             WriteRadius(ld, tmpFloat);
-        } else if (!stricmp(token, "surface")) {
+        } 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 (!stricmp(token, "flags")) {
+                if (!Q_stricmp(token, "flags")) {
                     token  = ld->tikiFile.GetToken(false);
                     tmpInt = TIKI_ParseSurfaceFlag(token);
                     WriteFlags(ld, tmpInt);
-                } else if (!stricmp(token, "damage")) {
+                } else if (!Q_stricmp(token, "damage")) {
                     tmpFloat = ld->tikiFile.GetFloat(false);
                     WriteDamage(ld, tmpFloat);
-                } else if (!stricmp(token, "shader")) {
+                } else if (!Q_stricmp(token, "shader")) {
                     token = ld->tikiFile.GetToken(false);
                     if (strstr(token, ".")) {
-                        strcpy(name, ld->tikiFile.currentScript->path);
-                        strcat(name, 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 (!stricmp(token, "ischaracter")) {
+        } else if (!Q_stricmp(token, "ischaracter")) {
             ld->bIsCharacter = true;
-        } else if (!stricmp(token, "case")) {
+        } else if (!Q_stricmp(token, "case")) {
             if (!TIKI_ParseCase(ld)) {
                 return false;
             }
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             return true;
         } else {
             TIKI_Error(
@@ -1080,7 +1122,7 @@ void TIKI_ParseInitCommands(dloaddef_t *ld, dloadinitcmd_t **cmdlist, int maxcmd
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
 
-        if (!stricmp(token, "}")) {
+        if (!Q_stricmp(token, "}")) {
             break;
         }
 
@@ -1135,11 +1177,11 @@ void TIKI_ParseInit(dloaddef_t *ld)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "client")) {
+        if (!Q_stricmp(token, "client")) {
             TIKI_ParseInitCommands(ld, ld->loadclientinitcmds, 160, &ld->numclientinitcmds);
-        } else if (!stricmp(token, "server")) {
+        } else if (!Q_stricmp(token, "server")) {
             TIKI_ParseInitCommands(ld, ld->loadserverinitcmds, 160, &ld->numserverinitcmds);
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             break;
         } else {
             TIKI_Error(
@@ -1173,8 +1215,8 @@ qboolean TIKI_ParseCase(dloaddef_t *ld)
 __newcase:
     token = ld->tikiFile.GetToken(false);
     WriteCaseKey(ld, token);
-    isheadmodel = !stricmp(token, "headmodel");
-    isheadskin  = !stricmp(token, "headskin");
+    isheadmodel = !Q_stricmp(token, "headmodel");
+    isheadskin  = !Q_stricmp(token, "headskin");
 
     while (1) {
         if (!ld->tikiFile.TokenAvailable(true)) {
@@ -1187,9 +1229,9 @@ __newcase:
         }
 
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "case")) {
+        if (!Q_stricmp(token, "case")) {
             goto __newcase;
-        } else if (!stricmp(token, "{")) {
+        } else if (!Q_stricmp(token, "{")) {
             break;
         }
 
diff --git a/code/tiki/tiki_parse.h b/code/tiki/tiki_parse.h
index b3829ca0..1db2634f 100644
--- a/code/tiki/tiki_parse.h
+++ b/code/tiki/tiki_parse.h
@@ -26,15 +26,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 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(
@@ -75,3 +76,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
+
+void WriteSkelmodel(dloaddef_t* ld, const char* name);
diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index ed40b76e..ca9126db 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -55,6 +55,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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
@@ -71,11 +73,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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)
@@ -87,9 +93,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TIKI_SURF_NOMIPMAPS (1 << 8)
 #define TIKI_SURF_NOPICMIP  (1 << 9)
 
-#define MAX_SKELMODELS      12
-#define MAX_TIKI_SHADER     4
-#define MAX_TIKI_ALIASES    4095
+#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;
@@ -116,7 +126,7 @@ private:
     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);
@@ -139,7 +149,7 @@ typedef struct skelChannelList_s {
     short int  m_numChannels;
     short int  m_numLocalFromGlobal;
     short int *m_chanLocalFromGlobal;
-    short int  m_chanGlobalFromLocal[200];
+    short int  m_chanGlobalFromLocal[MAX_GLOBAL_FROM_LOCAL];
 } skelChannelList_c;
 
 #endif
@@ -186,19 +196,21 @@ typedef struct dtiki_s {
 } 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 {
@@ -249,12 +261,13 @@ typedef struct skelHeaderGame_s {
     int                  numBones;
     struct boneData_s   *pBones;
     skelSurfaceGame_t   *pSurfaces;
-    int                  lodIndex[10];
+    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 {
@@ -406,8 +419,8 @@ typedef struct {
 typedef struct lodControl_s {
     float                    minMetric;
     float                    maxMetric;
-    lodCurvePoint_t          curve[5];
-    lodCurvePointConstants_t consts[4];
+    lodCurvePoint_t          curve[MAX_LOD_CURVE_POINTS];
+    lodCurvePointConstants_t consts[MAX_LOD_CURVE_CONSTS];
 } lodControl_t;
 
 typedef struct {
@@ -416,3 +429,5 @@ typedef struct {
     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 ebc99e4f..3da54637 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.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.
 
@@ -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"
@@ -44,7 +47,7 @@ void LoadBoneFromBuffer2(boneFileData_t *fileData, boneData_t *boneData)
     boneData->boneType = fileData->boneType;
 
     if (boneData->boneType == SKELBONE_HOSEROT) {
-        i = *(int *)&fileData->parent[fileData->ofsBaseData + 4];
+        i = LittleLongPtr(fileData->parent[fileData->ofsBaseData + 4]);
 
         if (i == 1) {
             boneData->boneType = SKELBONE_HOSEROTPARENT;
@@ -156,21 +159,17 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     byte              *max_gs_ptr;
     byte              *gs_ptr = NULL;
 
-    pSurf      = (skelSurface_t *)((byte *)pHeader + LittleLong(pHeader->ofsSurfaces));
+    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 < numSurfaces; i++) {
-        skeletorVertex_t *pVert    = (skeletorVertex_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsVerts));
-        const int         numVerts = LittleLongPtr(pSurf->numVerts);
+    for (i = 0; i < pHeader->numSurfaces; i++) {
+        skeletorVertex_t *pVert    = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
+        const int         numVerts = LongNoSwapPtr(&pSurf->numVerts);
 
         nVertBytes = 0;
         for (j = 0; j < numVerts; j++) {
-            const int numMorphs  = LittleLongPtr(pVert->numMorphs);
-            const int numWeights = LittleLongPtr(pVert->numWeights);
+            const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+            const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
             int iOffset = sizeof(skeletorMorph_t) * numMorphs;
             iOffset += sizeof(skelWeight_t) * numWeights;
@@ -182,7 +181,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 
         nSurfBytes += sizeof(skelSurfaceGame_t);
         // triangles
-        nSurfBytes += LittleLongPtr(pSurf->numTriangles) * sizeof(skelIndex_t) * 3;
+        nSurfBytes += LongNoSwapPtr(&pSurf->numTriangles) * sizeof(skelIndex_t) * 3;
         nSurfBytes = PAD(nSurfBytes, sizeof(void *));
         // vertices
         nSurfBytes += nVertBytes;
@@ -190,38 +189,36 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         // collapse
         nSurfBytes += numVerts * sizeof(skelIndex_t);
 
-        if (version > TIKI_SKB_HEADER_VER_3) {
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
             // collapse indices
             nSurfBytes += numVerts * sizeof(skelIndex_t);
         }
 
-        pSurf = (skelSurface_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsEnd));
+        pSurf = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
     }
 
-    nBoneBytes  = LittleLong(pHeader->numBones) * sizeof(boneData_t);
+    nBoneBytes  = pHeader->numBones * sizeof(boneData_t);
     nBoxBytes   = 0;
     nMorphBytes = 0;
 
-    if (version > TIKI_SKB_HEADER_VERSION) {
+    if (pHeader->version > TIKI_SKB_HEADER_VERSION) {
         char    *pMorphTargets;
         intptr_t nLen;
 
-        nBoxBytes                 = LittleLong(pHeader->numBoxes) * sizeof(skelHitBox_t);
-        const int ofsMorphTargets = LittleLongPtr(pHeader->ofsMorphTargets);
-        const int numMorphTargets = LittleLongPtr(pHeader->numMorphTargets);
-        pMorphTargets             = (char *)((byte *)pHeader + ofsMorphTargets);
+        nBoxBytes     = pHeader->numBoxes * sizeof(skelHitBox_t);
+        pMorphTargets = (char *)((byte *)pHeader + pHeader->ofsMorphTargets);
 
-        if (ofsMorphTargets > 0 || (ofsMorphTargets + numMorphTargets) < length) {
-            for (i = 0; i < numMorphTargets; i++) {
+        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 = numMorphTargets;
+            nMorphBytes = pHeader->numMorphTargets;
         }
-    } else if (version == TIKI_SKB_HEADER_VERSION) {
-        nBoxBytes = LittleLong(pHeader->numBoxes) * sizeof(skelHitBox_t);
+    } else if (pHeader->version == TIKI_SKB_HEADER_VERSION) {
+        nBoxBytes = pHeader->numBoxes * sizeof(skelHitBox_t);
     }
 
     cache->size = sizeof(skelHeaderGame_t);
@@ -238,51 +235,61 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     byte *max_ptr       = start_ptr + cache->size;
     byte *ptr           = start_ptr + sizeof(skelHeaderGame_t);
 
-    pSkel->version     = version;
-    pSkel->numSurfaces = numSurfaces;
-    pSkel->numBones    = LittleLong(pHeader->numBones);
+    pSkel->version     = pHeader->version;
+
+    //
+    // Added in 2.0
+    //
+    if (pHeader->version >= TIKI_SKD_HEADER_VERSION) {
+        pSkel->scale = pHeader->scale * 0.52;
+    } else {
+        pSkel->scale = 0.52;
+    }
+
+    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 = LittleLong(pHeader->numBoxes);
+    pSkel->numBoxes = pHeader->numBoxes;
     pSkel->pBoxes   = (skelHitBox_t *)ptr;
     ptr += nBoxBytes;
     ptr                    = (byte *)PADP(ptr, sizeof(void *));
     pSkel->pLOD            = NULL;
-    pSkel->numMorphTargets = LittleLong(pHeader->numMorphTargets);
+    pSkel->numMorphTargets = pHeader->numMorphTargets;
     pSkel->pMorphTargets   = (char *)ptr;
     ptr += nMorphBytes;
     ptr = (byte *)PADP(ptr, sizeof(void *));
     memcpy(pSkel->name, pHeader->name, sizeof(pSkel->name));
 
     for (i = 0; i < sizeof(pSkel->lodIndex) / sizeof(pSkel->lodIndex[0]); i++) {
-        CopyLittleLong(&pSkel->lodIndex[0], &pHeader->lodIndex[0]);
+        pSkel->lodIndex[i] = LongNoSwapPtr(&pHeader->lodIndex[i]);
     }
 
-    pSurf     = (skelSurface_t *)((byte *)pHeader + LittleLongPtr(pHeader->ofsSurfaces));
+    pSurf     = (skelSurface_t *)((byte *)pHeader + pHeader->ofsSurfaces);
     pGameSurf = pSkel->pSurfaces;
 
-    for (i = 0; i < numSurfaces; i++) {
+    for (i = 0; i < pHeader->numSurfaces; i++) {
         size_t            nBytesUsed;
         skeletorVertex_t *pVert;
-        const int         numTriangles = LittleLongPtr(pSurf->numTriangles);
-        const int         numVerts     = LittleLongPtr(pSurf->numVerts);
+        const int         numTriangles = LongNoSwapPtr(&pSurf->numTriangles);
+        const int         numVerts     = LongNoSwapPtr(&pSurf->numVerts);
 
         nTriBytes  = numTriangles * sizeof(skelIndex_t) * 3;
         nSurfBytes = 0;
-        if (version > TIKI_SKB_HEADER_VER_3) {
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
             nSurfBytes = numVerts * sizeof(skelIndex_t);
         }
 
-        pVert = (skeletorVertex_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsVerts));
+        pVert = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
         nVertBytes = 0;
         for (j = 0; j < numVerts; j++) {
-            const int numMorphs  = LittleLongPtr(pVert->numMorphs);
-            const int numWeights = LittleLongPtr(pVert->numWeights);
+            const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+            const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
             int iOffset = sizeof(skeletorMorph_t) * numMorphs;
             iOffset += sizeof(skelWeight_t) * numWeights;
@@ -303,7 +310,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         max_gs_ptr   = (byte *)pGameSurf + nBytesUsed;
         gs_ptr       = start_gs_ptr + sizeof(skelSurfaceGame_t);
 
-        pGameSurf->ident            = LittleLongPtr(pSurf->ident);
+        pGameSurf->ident            = LongNoSwapPtr(&pSurf->ident);
         pGameSurf->numTriangles     = numTriangles;
         pGameSurf->numVerts         = numVerts;
         pGameSurf->pStaticXyz       = NULL;
@@ -317,17 +324,19 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         gs_ptr               = (byte *)PADP(gs_ptr, sizeof(void *));
         pGameSurf->pCollapse = (skelIndex_t *)gs_ptr;
         gs_ptr += sizeof(*pGameSurf->pCollapse) * numVerts;
-        if (version > TIKI_SKB_HEADER_VER_3) {
-            pGameSurf->pCollapseIndex = (skelIndex_t*)gs_ptr;
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
+            pGameSurf->pCollapseIndex = (skelIndex_t *)gs_ptr;
             gs_ptr += sizeof(*pGameSurf->pCollapseIndex) * numVerts;
         }
 
         memcpy(pGameSurf->name, pSurf->name, sizeof(pGameSurf->name));
 
         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]);
+            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;
@@ -335,21 +344,21 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 
         if (pGameSurf->numVerts) {
             skeletorVertex_t *skelVert = pGameSurf->pVerts;
-            pVert                      = (skeletorVertex_t *)((char *)pSurf + LittleLongPtr(pSurf->ofsVerts));
+            pVert                      = (skeletorVertex_t *)((char *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
             for (j = 0; j < pGameSurf->numVerts; j++) {
-                const int numMorphs  = LittleLongPtr(pVert->numMorphs);
-                const int numWeights = LittleLongPtr(pVert->numWeights);
+                const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+                const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
                 int iOffset = sizeof(skeletorMorph_t) * numMorphs;
                 iOffset += sizeof(skelWeight_t) * numWeights;
                 iOffset += sizeof(skeletorVertex_t);
 
-                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->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;
 
@@ -357,20 +366,20 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
                 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 = LittleLongPtr(pMorph->morphIndex);
-                    skelMorph->offset[0]  = LittleFloatPtr(pMorph->offset[0]);
-                    skelMorph->offset[1]  = LittleFloatPtr(pMorph->offset[1]);
-                    skelMorph->offset[2]  = LittleFloatPtr(pMorph->offset[2]);
+                    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 < 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->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);
@@ -379,15 +388,15 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 
             assert((byte *)skelVert - (byte *)pGameSurf <= (byte *)pGameSurf->pCollapse - (byte *)pGameSurf);
 
-            const int *pCollapse = (const int *)((byte *)pSurf + LittleLongPtr(pSurf->ofsCollapse));
+            const int *pCollapse = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapse));
             for (j = 0; j < numVerts; j++) {
-                pGameSurf->pCollapse[j] = LittleLongPtr(pCollapse[j]);
+                pGameSurf->pCollapse[j] = LongNoSwapPtr(&pCollapse[j]);
             }
 
-            if (version > TIKI_SKB_HEADER_VER_3) {
-                const int *pCollapseIndex = (const int *)((byte *)pSurf + LittleLongPtr(pSurf->ofsCollapseIndex));
+            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] = LittleLongPtr(pCollapseIndex[j]);
+                    pGameSurf->pCollapseIndex[j] = LongNoSwapPtr(&pCollapseIndex[j]);
                 }
             } else {
                 pGameSurf->pCollapseIndex = NULL;
@@ -398,10 +407,10 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
             pGameSurf->pCollapseIndex = NULL;
         }
 
-        if (i != numSurfaces - 1) {
+        if (i != pHeader->numSurfaces - 1) {
             pGameSurf->pNext = (skelSurfaceGame_t *)gs_ptr;
             pGameSurf        = pGameSurf->pNext;
-            pSurf            = (skelSurface_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsEnd));
+            pSurf            = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
         }
     }
 
@@ -410,8 +419,8 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     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));
+        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;
 
@@ -425,10 +434,10 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
                 TIKI_bones++;
             }
         } else {
-            boneFileData_t *boneBuffer = (boneFileData_t *)((byte *)pHeader + LittleLongPtr(pHeader->ofsBones));
+            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 + LittleLongPtr(boneBuffer->ofsEnd));
+                boneBuffer = (boneFileData_t *)((byte *)boneBuffer + LongNoSwapPtr(&boneBuffer->ofsEnd));
             }
         }
     } else {
@@ -436,7 +445,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         pSkel->pBones   = NULL;
     }
 
-    if (version <= TIKI_SKB_HEADER_VER_3) {
+    if (pHeader->version <= TIKI_SKB_HEADER_VER_3) {
         pSkel->numBoxes        = 0;
         pSkel->pBoxes          = NULL;
         pSkel->numMorphTargets = 0;
@@ -445,35 +454,31 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     }
 
     if (nBoxBytes) {
-        const int ofsBoxes = LittleLongPtr(pHeader->ofsBoxes);
-
-        if (ofsBoxes <= 0 || (nBoxBytes + ofsBoxes) >= length) {
+        if (pHeader->ofsBoxes <= 0 || (nBoxBytes + pHeader->ofsBoxes) > length) {
             Com_Printf("^~^~^ Box data is corrupted for '%s'\n", cache->path);
-            pSkel->numMorphTargets = 0;
-            pSkel->pMorphTargets   = NULL;
+            pSkel->numBoxes = 0;
+            pSkel->pBoxes   = NULL;
         } else {
-            memcpy(pSkel->pBoxes, ((byte *)pHeader + ofsBoxes), nBoxBytes);
+            memcpy(pSkel->pBoxes, ((byte *)pHeader + pHeader->ofsBoxes), nBoxBytes);
         }
     } else {
         pSkel->numBoxes = 0;
         pSkel->pBoxes   = NULL;
     }
 
-    if (version <= TIKI_SKB_HEADER_VERSION) {
+    if (pHeader->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) {
+        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 + ofsMorphTargets), nMorphBytes);
+            memcpy(pSkel->pMorphTargets, ((byte *)pHeader + pHeader->ofsMorphTargets), nMorphBytes);
         }
     } else {
         pSkel->numMorphTargets = 0;
@@ -573,7 +578,7 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
     memset(cache, 0, sizeof(skelcache_t));
     strncpy(cache->path, path, sizeof(cache->path));
 
-    header = LittleLong(pheader->ident);
+    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);
@@ -593,28 +598,35 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
         return qfalse;
     }
 
+    TIKI_SwapSkel(pheader);
+
     surf = (skelSurface_t *)((char *)pheader + pheader->ofsSurfaces);
     for (i = 0; i < pheader->numSurfaces; i++) {
-        if (surf->numVerts > TIKI_MAX_VERTEXES) {
+        int numSurfVerts, numSurfTriangles;
+
+        numSurfVerts     = LongNoSwapPtr(&surf->numVerts);
+        numSurfTriangles = LongNoSwapPtr(&surf->numTriangles);
+
+        if (numSurfVerts > TIKI_MAX_VERTEXES) {
             TIKI_Error(
-                "TIKI_LoadSKB: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, surf->numVerts
+                "TIKI_LoadSKB: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, numSurfVerts
             );
             TIKI_Free(pheader);
             return qfalse;
         }
 
-        if (surf->numTriangles > TIKI_MAX_TRIANGLES) {
+        if (numSurfTriangles > TIKI_MAX_TRIANGLES) {
             TIKI_Error(
                 "TIKI_LoadSKB: %s has more than %i triangles on a surface (%i)",
                 path,
                 TIKI_MAX_TRIANGLES,
-                surf->numTriangles
+                numSurfTriangles
             );
             TIKI_Free(pheader);
             return qfalse;
         }
 
-        surf = (skelSurface_t *)((char *)surf + surf->ofsEnd);
+        surf = (skelSurface_t *)((char *)surf + LongNoSwapPtr(&surf->ofsEnd));
     }
 
     if (pheader->numBones > TIKI_MAX_BONES) {
@@ -626,8 +638,8 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
     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);
+        totalVerts += LongNoSwapPtr(&surf->numVerts);
+        surf = (skelSurface_t *)((byte *)surf + LongNoSwapPtr(&surf->ofsEnd));
     }
 
     newLength = totalVerts * sizeof(unsigned int);
@@ -650,47 +662,60 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
     for (i = 0; i < pheader->numSurfaces; i++) {
         skeletorVertex_t *newVerts;
         skelVertex_t     *oldVerts;
+        int               numVerts;
 
         memcpy(newSurf, oldSurf, oldSurf->ofsVerts);
-        if (newSurf->ofsCollapse > newSurf->ofsVerts) {
-            newSurf->ofsCollapse += sizeof(unsigned int) * newSurf->numVerts;
+        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 > newSurf->ofsVerts) {
-            newSurf->ofsCollapse += sizeof(unsigned int) * newSurf->numVerts;
+        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 > newSurf->ofsVerts) {
-            newSurf->ofsTriangles += sizeof(unsigned int) * newSurf->numVerts;
+        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 > newSurf->ofsVerts) {
-            newSurf->ofsEnd += sizeof(unsigned int) * newSurf->numVerts;
+        if (newSurf->ofsEnd > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset = LongNoSwapPtr(&newSurf->ofsEnd) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsEnd, &newOffset, sizeof(newSurf->ofsEnd));
         }
 
         oldVerts = (skelVertex_t *)((byte *)oldSurf + oldSurf->ofsVerts);
         newVerts = (skeletorVertex_t *)((byte *)newSurf + newSurf->ofsVerts);
 
-        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;
+        numVerts = LongNoSwapPtr(&oldSurf->numVerts);
+        for (j = 0; j < numVerts; j++) {
+            int numMorphs, numWeights;
+
+            memcpy(newVerts->normal, oldVerts->normal, sizeof(newVerts->normal));
+            memcpy(newVerts->texCoords, oldVerts->texCoords, sizeof(newVerts->texCoords));
+
+            numMorphs  = 0;
+            numWeights = LongNoSwapPtr(&oldVerts->numWeights);
+            memcpy(&newVerts->numMorphs, &numMorphs, sizeof(newVerts->numMorphs));
+            memcpy(&newVerts->numWeights, &numWeights, sizeof(newVerts->numWeights));
 
             skelWeight_t *newWeights = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
 
-            for (k = 0; k < oldVerts->numWeights; k++) {
+            for (k = 0; k < numWeights; k++) {
                 memcpy(newWeights, &oldVerts->weights[k], sizeof(skelWeight_t));
                 newWeights++;
             }
 
-            oldVerts = (skelVertex_t *)((byte *)oldVerts + sizeof(skelWeight_t) * oldVerts->numWeights
+            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) * newVerts->numWeights);
+            newVerts =
+                (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t) + sizeof(skelWeight_t) * 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, 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));
@@ -749,7 +774,7 @@ void GetLODFile(skelcache_t *cache)
         return;
     }
 
-    strcpy(pathLOD, cache->path);
+    Q_strncpyz(pathLOD, cache->path, sizeof(pathLOD));
     ext = strstr(pathLOD, "skd");
     strcpy(ext, "lod");
 
@@ -758,6 +783,20 @@ void GetLODFile(skelcache_t *cache)
         LOD = (lodControl_t *)TIKI_Alloc(sizeof(lodControl_t));
         memcpy(LOD, buf, length);
         TIKI_FreeFile(buf);
+
+        LOD->minMetric = LittleFloat(LOD->minMetric);
+        LOD->maxMetric = LittleFloat(LOD->maxMetric);
+
+        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 = 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;
@@ -772,7 +811,7 @@ void GetLODFile(skelcache_t *cache)
         LOD->curve[3].val = (float)cache->skel->lodIndex[1];
         LOD->curve[4].pos = 1.0f;
 
-        for (i = 9; cache->skel->lodIndex[i] > cache->skel->lodIndex[3]; i--) {
+        for (i = TIKI_SKEL_LOD_INDEXES; cache->skel->lodIndex[i] > cache->skel->lodIndex[3]; i--) {
             if (i <= 2) {
                 break;
             }
@@ -780,8 +819,8 @@ void GetLODFile(skelcache_t *cache)
 
         LOD->curve[4].val = (float)cache->skel->lodIndex[i];
 
-        for (i = 8; i >= 0; i--) {
-            if (LOD->curve[i - 1].pos > LOD->curve[i].pos) {
+        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;
             }
         }
@@ -832,7 +871,7 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
     }
 
     // The SKD must have at least one surface
-    if (pheader->numSurfaces <= 0) {
+    if (LittleLong(pheader->numSurfaces) <= 0) {
         TIKI_Error("^~^~^ TIKI_LoadSKD: %s has no surfaces\n", path);
         TIKI_FreeFile(pheader);
         return qfalse;
@@ -842,7 +881,7 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
     strncpy(cache->path, path, sizeof(cache->path));
 
     // Check the signature
-    header = LittleLong(pheader->ident);
+    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);
@@ -857,6 +896,8 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
         return qfalse;
     }
 
+    TIKI_SwapSkel(pheader);
+
     surf = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
 
     for (i = 0; i < pheader->numSurfaces; i++) {
@@ -896,7 +937,8 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
     // Get the lod file associated with the skeleton
     GetLODFile(cache);
     TIKI_SortLOD(cache->skel);
-    return 1;
+
+    return true;
 }
 
 /*
@@ -984,8 +1026,11 @@ TIKI_FindSkel
 skelcache_t *TIKI_FindSkel(const char *path)
 {
     int          i;
+    int          num;
     skelcache_t *cache;
 
+    num = cache_numskel;
+
     for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
         cache = &skelcache[i];
 
@@ -996,6 +1041,47 @@ skelcache_t *TIKI_FindSkel(const char *path)
         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;
@@ -1045,6 +1131,8 @@ int TIKI_RegisterSkel(const char *path, dtiki_t *tiki)
         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;
@@ -1059,9 +1147,12 @@ int TIKI_RegisterSkel(const char *path, dtiki_t *tiki)
         if (!TIKI_LoadSKD(path, cache)) {
             return -1;
         }
+    } else {
+        TIKI_Error("TIKI_RegisterSkel: Unknown extension %s\n", extension);
+        return -1;
     }
 
-    sprintf(tempName, "l%s", path);
+    Com_sprintf(tempName, sizeof(tempName), "l%s", path);
     UI_LoadResource(tempName);
 
     return cache - skelcache;
diff --git a/code/tiki/tiki_skel.h b/code/tiki/tiki_skel.h
index 86361487..210e06e8 100644
--- a/code/tiki/tiki_skel.h
+++ b/code/tiki/tiki_skel.h
@@ -37,6 +37,7 @@ extern "C" {
     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);
 
diff --git a/code/tiki/tiki_tag.cpp b/code/tiki/tiki_tag.cpp
index 4b6e2b40..a67bd0d7 100644
--- a/code/tiki/tiki_tag.cpp
+++ b/code/tiki/tiki_tag.cpp
@@ -62,6 +62,10 @@ SkelMat4 *TIKI_TransformInternal(dtiki_t *tiki, int entnum, int tagnum)
     }
 
     skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    if (!skeletor) {
+        return NULL;
+    }
+
     return &skeletor->GetBoneFrame(tagnum);
 }
 
@@ -94,6 +98,10 @@ orientation_t TIKI_OrientationInternal(dtiki_t *tiki, int entnum, int tagnum, fl
     }
 
     const skeletor_c *skeletor   = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    if (!skeletor) {
+        return orientation_t {};
+    }
+
     const SkelMat4  & pTransform = skeletor->GetBoneFrame(tagnum);
 
     orientation_t orient;
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 16f4a3a1..bb86d51a 100644
--- a/code/uilib/ui_public.h
+++ b/code/uilib/ui_public.h
@@ -80,10 +80,11 @@ 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
@@ -124,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
@@ -161,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;
diff --git a/code/uilib/uibind.cpp b/code/uilib/uibind.cpp
index cc6d43c9..c617cc4e 100644
--- a/code/uilib/uibind.cpp
+++ b/code/uilib/uibind.cpp
@@ -172,7 +172,6 @@ void UIBindButton::DrawUnpressed(void)
     if (str::cmp(s, m_last_keyname)) {
         m_mat = uWinMan.RegisterShader("textures/bind/" + s);
         if (m_mat) {
-            m_mat->ReregisterMaterial();
             if (m_mat->GetMaterial()) {
                 m_material = m_mat;
             } else {
@@ -186,8 +185,6 @@ void UIBindButton::DrawUnpressed(void)
     }
 
     if (m_mat) {
-        m_mat->ReregisterMaterial();
-
         if (m_mat->GetMaterial()) {
             return;
         }
diff --git a/code/uilib/uibindlist.cpp b/code/uilib/uibindlist.cpp
index c2d3d1b4..f094a799 100644
--- a/code/uilib/uibindlist.cpp
+++ b/code/uilib/uibindlist.cpp
@@ -592,10 +592,7 @@ void UIFakkBindList::DrawPressKey(UIRect2D frame)
         return;
     }
 
-    m_presskey_mat->ReregisterMaterial();
     w = uii.Rend_GetShaderWidth(m_presskey_mat->GetMaterial()) * m_vVirtualScale[0];
-
-    m_presskey_mat->ReregisterMaterial();
     h = uii.Rend_GetShaderHeight(m_presskey_mat->GetMaterial()) * m_vVirtualScale[1];
 
     UIRect2D newFrame    = uWinMan.getFrame();
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 9b536b62..77e1c76d 100644
--- a/code/uilib/uicheckbox.cpp
+++ b/code/uilib/uicheckbox.cpp
@@ -102,7 +102,6 @@ void UICheckBox::Draw()
 	float y = (m_frame.size.height - height) * 0.5f;
 	if (material)
 	{
-		material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(x, y, width, height, 0.0f, 0.0f, 1.0f, 1.0f, material->GetMaterial());
 	}
 	else
diff --git a/code/uilib/uicheckbox.h b/code/uilib/uicheckbox.h
index f303f290..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;
@@ -60,6 +59,3 @@ extern Event EV_UICheckBox_SetCheckedCommand;
 extern Event EV_UICheckBox_SetUncheckedCommand;
 extern Event EV_UICheckBox_SetCheckedShader;
 extern Event EV_UICheckBox_SetUncheckedShader;
-
-#endif
-
diff --git a/code/uilib/uiconsole.cpp b/code/uilib/uiconsole.cpp
index 7529a171..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);
 	}
 }
 
@@ -303,7 +305,7 @@ void UIConsole::setConsoleHandler
 void UIConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -486,7 +488,7 @@ void UIConsole::Draw
 	)
 
 {
-	UColor* pCurrColor;
+	const UColor* pCurrColor;
 
 	m_font->setColor(m_foreground_color);
 	pCurrColor = &m_foreground_color;
@@ -503,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;
 
@@ -511,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) {
@@ -530,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;
 				}
@@ -557,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++;
 		}
@@ -817,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)
@@ -910,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);
@@ -947,7 +945,7 @@ void UIFloatingConsole::OnChildSizeChanged
 void UIFloatingConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -1134,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
@@ -1422,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);
@@ -1455,7 +1458,6 @@ void UIFloatingDMConsole::OnChildSizeChanged
 	}
 	else
 	{
-
 		m_console->setFrame(UIRect2D(UIPoint2D(0, 0), childSpaceSize));
 	}
 }
@@ -1463,7 +1465,7 @@ void UIFloatingDMConsole::OnChildSizeChanged
 void UIFloatingDMConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -1475,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 8e08bc22..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();
 };
@@ -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/uifield.cpp b/code/uilib/uifield.cpp
index a2a19b3f..51a4a744 100644
--- a/code/uilib/uifield.cpp
+++ b/code/uilib/uifield.cpp
@@ -38,7 +38,7 @@ void UIField::Draw(void)
     UpdateData();
 
     // the width of the widget that can be filled with valid text
-    float fVirtualWidth = m_frame.size.width / m_vVirtualScale[0] - m_font->getWidth(" ..", -1);
+    float fVirtualWidth = m_frame.size.width / getVirtualScale()[0] - m_font->getWidth(" ..", -1);
     float indentLength  = m_indent;
     float cursorSize    = m_font->getCharWidth('_');
 
@@ -125,7 +125,7 @@ void UIField::Draw(void)
     cursorPos = Q_min(cursorPos, fVirtualWidth);
 
     // Calculate text height
-    float y = m_frame.size.height / m_vVirtualScale[1] - m_font->getHeight(qfalse);
+    float y = m_frame.size.height / getVirtualScale()[1] - m_font->getHeight();
     if (m_bottomindent * 2 <= y) // upper and lower margin
     {
         y -= m_bottomindent;
@@ -135,27 +135,27 @@ void UIField::Draw(void)
 
     // Show text
     m_font->setColor(m_foreground_color);
-    m_font->Print(m_indent, y, temptext, -1, m_bVirtual);
+    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, m_bVirtual);
+        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, m_bVirtual);
+        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 / m_vVirtualScale[0] - m_font->getWidth(temptext, -1) - 2.0f;
-        m_font->Print(fVirtualWidth, y, temptext, -1, m_bVirtual);
+        fVirtualWidth = m_frame.size.width / getVirtualScale()[0] - m_font->getWidth(temptext, -1) - 2.0f;
+        m_font->Print(fVirtualWidth, y, temptext, -1, getVirtualScale());
     }
 }
 
@@ -287,7 +287,7 @@ void UIField::CharEvent(int ch)
     // 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] = NULL;
+        m_edit.m_buffer[m_edit.m_cursor] = 0;
     }
 
     if (m_cvarname.length()) {
@@ -306,7 +306,7 @@ void UIField::UpdateData(void)
 void UIField::Pressed(Event *ev)
 {
     float xpos  = ev->GetFloat(1);
-    float point = (xpos - m_frame.pos.x) / m_vVirtualScale[0];
+    float point = (xpos - m_frame.pos.x) / getVirtualScale()[0];
     point       = Q_max(point, 0.0f); // added in 2.15
 
     int   iStep        = m_iPreStep;
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 4bfeee3b..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.
 
@@ -83,11 +83,23 @@ const unsigned char DBCS_Tokin_Korean[] = {
 
 int UIFont::CodeSearch(unsigned short uch)
 {
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return -1;
+    }
+
     return UI_FontCodeSearch(m_font, uch);
 }
 
 bool UIFont::DBCSIsLeadByte(unsigned short uch)
 {
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
     return UI_FontDBCSIsLeadByte(m_font, uch);
 }
 
@@ -97,6 +109,12 @@ bool UIFont::DBCSIsMaekin(unsigned short uch)
     const unsigned char   *p;
     unsigned char ch;
 
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
     if (uch < 0x100) {
         return false;
     }
@@ -135,6 +153,12 @@ bool UIFont::DBCSIsAtokin(unsigned short uch)
     const unsigned char   *p;
     unsigned char ch;
 
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
     if (uch < 0x100) {
         return false;
     }
@@ -182,7 +206,7 @@ int UIFont::DBCSGetWordBlockCount(const char *text, int maxlen)
         return 0;
     }
 
-    uch = text[0];
+    uch = (unsigned char)text[0];
     p   = (unsigned char *)(text + 1);
 
     if (!text[0]) {
@@ -201,6 +225,7 @@ int UIFont::DBCSGetWordBlockCount(const char *text, int maxlen)
     isATokin  = DBCSIsAtokin(uch);
     hasDBCS   = DBCSLen > 1;
     isControl = uch < ' ';
+    uch2 = (unsigned char)*p;
 
     for (;;) {
         unsigned int subDBCSLen;
@@ -248,6 +273,9 @@ UIFont::UIFont()
 
     color = UBlack;
     setColor(color);
+
+    refHandle = uii.GetRefSequence();
+    name = "verdana-14";
 }
 
 UIFont::UIFont(const char *fn)
@@ -271,16 +299,26 @@ void UIFont::setFont(const char *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, qboolean bVirtualScreen)
+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);
-    uii.Rend_DrawString(m_font, text, x, y, maxlen, bVirtualScreen);
+    // 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, float *vVirtualScale
+    const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, const float *vVirtualScale
 )
 {
     float       newx, newy;
@@ -301,11 +339,11 @@ void UIFont::PrintJustified(
 
     if (horz == FONT_JUSTHORZ_LEFT && vert == FONT_JUSTVERT_TOP) {
         // no need to justify
-        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale != NULL);
+        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale);
         return;
     }
 
-    textheight = getHeight(text, -1, qfalse);
+    textheight = getHeight(text, -1);
 
     switch (vert) {
     case FONT_JUSTVERT_TOP:
@@ -359,10 +397,10 @@ void UIFont::PrintJustified(
             break;
         }
 
-        Print(newx, newy, string, -1, vVirtualScale != NULL);
+        Print(newx, newy, string, -1, vVirtualScale);
 
         // expand for newline
-        newy += getHeight(" ", -1, qfalse);
+        newy += getHeight(" ", -1);
     }
 }
 
@@ -372,7 +410,7 @@ void UIFont::PrintOutlinedJustified(
     fontvertjustify_t vert,
     const char       *text,
     const UColor    & outlineColor,
-    float            *vVirtualScale
+    const float      *vVirtualScale
 )
 {
     float       newx, newy;
@@ -397,11 +435,11 @@ void UIFont::PrintOutlinedJustified(
 
     if (horz == FONT_JUSTHORZ_LEFT && vert == FONT_JUSTVERT_TOP) {
         // no need to justify
-        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale != NULL);
+        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale);
         return;
     }
 
-    textheight = getHeight(text, -1, qfalse);
+    textheight = getHeight(text, -1);
 
     switch (vert) {
     case FONT_JUSTVERT_TOP:
@@ -463,36 +501,48 @@ void UIFont::PrintOutlinedJustified(
         // draw the outline
         //
         setColor(outlineColor);
-        Print(newx + 1, newy + 2, string, -1, bVirtual);
-        Print(newx + 2, newy + 1, string, -1, bVirtual);
-        Print(newx - 1, newy + 2, string, -1, bVirtual);
-        Print(newx - 2, newy + 1, string, -1, bVirtual);
-        Print(newx - 1, newy - 2, string, -1, bVirtual);
-        Print(newx - 2, newy - 1, string, -1, bVirtual);
-        Print(newx + 1, newy - 2, string, -1, bVirtual);
-        Print(newx + 2, newy - 1, string, -1, bVirtual);
-        Print(newx + 2, newy, string, -1, bVirtual);
-        Print(newx - 2, newy, string, -1, bVirtual);
-        Print(newx, newy + 2, string, -1, bVirtual);
-        Print(newx, newy - 2, string, -1, bVirtual);
+        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, bVirtual);
+        Print(newx, newy, string, -1, vVirtualScale);
 
         // expand for newline
-        newy += getHeight(" ", -1, qfalse);
+        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);
 }
 
@@ -500,13 +550,17 @@ 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 0;
+        return 4;
     }
 
     if (ch == '\t') {
         ch = ' ';
+        widthMul = 3.0f;
     }
 
     if (m_font->numPages) {
@@ -526,23 +580,21 @@ int UIFont::getCharWidth(unsigned short ch)
         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;
-    }
+    return m_font->sgl[index]->locations[indirected].size[0] * 256.0 * widthMul;
 }
 
-int UIFont::getHeight(const char *text, int maxlen, qboolean bVirtual)
+int UIFont::getHeight(const char *text, int maxlen, const float* virtualScale)
 {
     float height;
     int   i;
 
+    CheckRefreshFont();
+
     if (!m_font) {
         return 0;
     }
 
-    height = getHeight(bVirtual);
+    height = getHeight(virtualScale);
 
     for (i = 0; text[i]; i++) {
         if (maxlen != -1 && i > maxlen) {
@@ -550,20 +602,22 @@ int UIFont::getHeight(const char *text, int maxlen, qboolean bVirtual)
         }
 
         if (text[i] == '\n') {
-            height += getHeight(bVirtual);
+            height += getHeight(virtualScale);
         }
     }
 
     return height;
 }
 
-int UIFont::getHeight(qboolean bVirtual)
+int UIFont::getHeight(const float* virtualScale)
 {
-    if (bVirtual) {
+    CheckRefreshFont();
+
+    if (virtualScale) {
         if (m_font) {
-            return (m_font->sgl[0]->height * uid.vidHeight / 480.0);
+            return (m_font->sgl[0]->height * virtualScale[0]);
         } else {
-            return (16.0 * uid.vidHeight / 480.0);
+            return (16.0 * virtualScale[1]);
         }
     } else {
         if (m_font) {
@@ -631,6 +685,7 @@ float UI_FontgetCharWidthf(fontheader_t *font, unsigned short uch)
 {
     int index;
     int indirected;
+    float widthMul = 1.0f; // Added in OPM for easier readability
 
     if (!font) {
         return 0.f;
@@ -638,6 +693,7 @@ float UI_FontgetCharWidthf(fontheader_t *font, unsigned short uch)
 
     if (uch == '\t') {
         uch = ' ';
+        widthMul = 3.0f;
     }
 
     if (font->numPages) {
@@ -657,11 +713,7 @@ float UI_FontgetCharWidthf(fontheader_t *font, unsigned short uch)
         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)
@@ -674,13 +726,8 @@ int UI_FontStringMaxWidth(fontheader_t *pFont, const char *pszString, int iMaxLe
         return 0;
     }
 
-    i = 0;
-    for (;;) {
-        unsigned short uch = pszString[i++];
-
-        if (uch == 0 || (iMaxLen != -1 && i > iMaxLen)) {
-            break;
-        }
+    for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
+        unsigned short uch = (unsigned char)pszString[i];
 
         if (UI_FontDBCSIsLeadByte(pFont, uch)) {
             uch = (uch << 8) | pszString[i];
@@ -709,19 +756,13 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
 {
     float widths    = 0.0;
     float maxwidths = 0.0;
-    int   i;
 
     if (!pFont) {
         return 0;
     }
 
-    i = 0;
-    for (;;) {
-        unsigned short uch = pszString[i++];
-
-        if (uch == 0 || (iMaxLen != -1 && i > iMaxLen)) {
-            break;
-        }
+    for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
+        unsigned short uch = (unsigned char)pszString[i];
 
         if (UI_FontDBCSIsLeadByte(pFont, uch)) {
             uch = (uch << 8) | pszString[i];
@@ -745,3 +786,11 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
 
     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 85b2cffb..786fee3b 100644
--- a/code/uilib/uifont.h
+++ b/code/uilib/uifont.h
@@ -43,16 +43,22 @@ protected:
     UColor        color;
     fontheader_t *m_font;
 
+    //
+    // Added in OPM
+    //
+    str           name;
+    int           refHandle;
+
 public:
     UIFont();
     UIFont(const char *fn);
 
-    void Print(float x, float y, const char *text, size_t maxlen, qboolean bVirtualScreen);
+    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, float *vVirtualScale
+        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, float* vVirtualScale
+        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);
@@ -60,13 +66,16 @@ public:
     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, qboolean bVirtual);
-    int  getHeight(qboolean bVirtual);
+    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);
diff --git a/code/uilib/uihorizscroll.cpp b/code/uilib/uihorizscroll.cpp
index 54f14b83..14730727 100644
--- a/code/uilib/uihorizscroll.cpp
+++ b/code/uilib/uihorizscroll.cpp
@@ -161,6 +161,8 @@ void UIHorizScroll::DrawThumb(void)
             m_local_alpha
         );
         break;
+    default:
+        break;
     }
 }
 
diff --git a/code/uilib/uilabel.cpp b/code/uilib/uilabel.cpp
index 5a6524fe..642dc49d 100644
--- a/code/uilib/uilabel.cpp
+++ b/code/uilib/uilabel.cpp
@@ -166,7 +166,13 @@ void UILabel::LabelLayoutShader(Event *ev)
 void UILabel::LabelLayoutTileShader(Event *ev)
 {
     m_sCurrentShaderName = ev->GetString(1);
-    setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
+    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;
 }
@@ -270,7 +276,6 @@ void UILabel::Draw(void)
                 m_sCurrentShaderName = string;
 
                 setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
-                m_material->ReregisterMaterial();
 
                 if (!m_material->GetMaterial()) {
                     setMaterial(NULL);
@@ -313,7 +318,7 @@ void UILabel::Draw(void)
                 m_iFontAlignmentVertical,
                 string,
                 UBlack,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         } else {
             // print the text
@@ -322,7 +327,7 @@ void UILabel::Draw(void)
                 m_iFontAlignmentHorizontal,
                 m_iFontAlignmentVertical,
                 string,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         }
     }
@@ -369,7 +374,7 @@ void UILabel::ProcessSounds()
             m_bOneShotTriggered = true;
             m_iNextOneShotTime  = Sys_Milliseconds() + m_fOneShotSoundTime * 1000.0f;
         } else if (m_sLoopingSoundName.length()) {
-            uii.Cmd_Stuff("tmstartloop " + m_sLoopingSoundName);
+            uii.Cmd_Stuff("tmstartloop " + m_sLoopingSoundName + '\n');
 
             m_iNextOneShotTime = 0;
             m_iSoundState      = 0;
diff --git a/code/uilib/uilangamelist.cpp b/code/uilib/uilangamelist.cpp
index deb0ed93..0dd99184 100644
--- a/code/uilib/uilangamelist.cpp
+++ b/code/uilib/uilangamelist.cpp
@@ -287,9 +287,7 @@ void UILanGameList::DrawNoServers(UIRect2D frame)
         AddNoServer();
     }
 
-    m_noservers_mat->ReregisterMaterial();
     w = uii.Rend_GetShaderWidth(m_noservers_mat->GetMaterial() * m_vVirtualScale[0]);
-    m_noservers_mat->ReregisterMaterial();
     h = uii.Rend_GetShaderHeight(m_noservers_mat->GetMaterial() * m_vVirtualScale[1]);
 
     UIRect2D newFrame    = uWinMan.getFrame();
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 0b22cdba..107571e1 100644
--- a/code/uilib/uilist.cpp
+++ b/code/uilib/uilist.cpp
@@ -92,10 +92,10 @@ void UIList::Draw
 		}
 
 		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)) - 1.0f;
+		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_font->Print(textX, textY, text, -1, m_bVirtual ? m_vVirtualScale : NULL);
 	}
 
 	// draw the previous arrow
@@ -108,8 +108,6 @@ void UIList::Draw
 		m_border_color,
 		m_local_alpha);
 
-	m_prev_arrow->ReregisterMaterial();
-
 	float height = m_frame.size.height - 4.0;
 	float width = m_arrow_width - 4.0;
 	uii.Rend_DrawPicStretched(
@@ -135,8 +133,6 @@ void UIList::Draw
 		m_border_color,
 		m_local_alpha);
 
-	m_next_arrow->ReregisterMaterial();
-
 	uii.Rend_DrawPicStretched(
 		x + 2.0f,
 		y + 2.0f,
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 228b04a5..df6840ce 100644
--- a/code/uilib/uilistbox.cpp
+++ b/code/uilib/uilistbox.cpp
@@ -279,9 +279,13 @@ void UIListBox::Draw(void)
     float       aty;
     int         i;
     const char *str;
-    UColor      selectedBG(0, 1, 1, 1);
-    UColor      selectedColor  = UBlack;
-    UColor      selectedBorder = UWhite;
+    //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;
 
@@ -303,7 +307,7 @@ void UIListBox::Draw(void)
                 0,
                 aty * m_vVirtualScale[1],
                 m_frame.size.width - m_vVirtualScale[0] * 16,
-                m_font->getHeight(m_bVirtual),
+                m_font->getHeight(getVirtualScale()),
                 selectedBG,
                 1.f
             );
@@ -318,7 +322,7 @@ void UIListBox::Draw(void)
         } else {
             str = li->string;
         }
-        m_font->Print(m_indent, aty, str, -1, m_bVirtual);
+        m_font->Print(m_indent, aty, str, -1, m_bVirtual ? m_vVirtualScale : NULL);
 
         if (i == m_currentItem) {
             DrawBoxWithSolidBorder(
@@ -326,7 +330,7 @@ void UIListBox::Draw(void)
                     0,
                     aty * m_vVirtualScale[1],
                     m_frame.size.width - m_vVirtualScale[0] * 16,
-                    m_font->getHeight(m_bVirtual)
+                    m_font->getHeight(getVirtualScale())
                 ),
                 UWhite,
                 selectedBorder,
@@ -336,7 +340,7 @@ void UIListBox::Draw(void)
             );
         }
 
-        aty += m_font->getHeight(false);
+        aty += m_font->getHeight(getHighResScale());
         i++;
     }
 }
@@ -349,9 +353,9 @@ void UIListBox::MousePressed(Event *ev)
     p.y = ev->GetFloat(2) - m_screenframe.pos.y;
 
     if (m_vertscroll) {
-        TrySelectItem((m_vertscroll->getTopItem() + 1) + p.y / m_font->getHeight(m_bVirtual));
+        TrySelectItem((m_vertscroll->getTopItem() + 1) + p.y / m_font->getHeight(getVirtualScale()));
     } else {
-        TrySelectItem(p.y / m_font->getHeight(m_bVirtual) + 1);
+        TrySelectItem(p.y / m_font->getHeight(getVirtualScale()) + 1);
     }
 
     if (m_clickState.time + 500 > uid.time && m_currentItem == m_clickState.selected) {
@@ -409,7 +413,7 @@ void UIListBox::SetListFont(Event *ev)
     LayoutFont(ev);
 
     if (m_vertscroll) {
-        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
+        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
     }
 
     FrameInitialized();
@@ -483,7 +487,7 @@ void UIListBox::FrameInitialized(void)
     UIListBase::FrameInitialized();
 
     if (m_vertscroll) {
-        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
+        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
         m_vertscroll->setNumItems(m_itemlist.NumObjects());
     }
 }
diff --git a/code/uilib/uilistctrl.cpp b/code/uilib/uilistctrl.cpp
index c791ac43..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:
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 ecc9e316..64f6cf71 100644
--- a/code/uilib/uimenu.cpp
+++ b/code/uilib/uimenu.cpp
@@ -291,7 +291,7 @@ UIWidget *Menu::GetNamedWidget
 		}
 	}
 
-	return pWidget;
+	return NULL;
 }
 
 void Menu::Update
@@ -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 8bda5646..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.
 
@@ -103,10 +103,10 @@ void UIMultiLineEdit::setData(const char *data)
             toadd = "";
         } else if (*p == '\r') {
             continue;
+        } else {
+            s[0] = *p;
+            toadd += s;
         }
-
-        s[0] = *p;
-        toadd += s;
     }
 
     m_lines.AddTail(toadd);
@@ -128,7 +128,13 @@ void UIMultiLineEdit::getData(str& data)
     data = "";
 
     for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid(); i++, m_lines.IterateNext()) {
-        data += m_lines.getCurrent();
+        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";
@@ -140,18 +146,18 @@ void UIMultiLineEdit::FrameInitialized(void)
 {
     delete m_vertscroll;
     m_vertscroll = new UIVertScroll();
-    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(false));
+    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(false);
+    AllowActivate(true);
 }
 
 void UIMultiLineEdit::SizeChanged(Event *ev)
 {
-    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
+    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
     m_vertscroll->InitFrameAlignRight(this, 0, 0);
 }
 
@@ -201,76 +207,108 @@ void UIMultiLineEdit::Draw(void)
         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, cur, -1, m_bVirtual);
+            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) {
-                DrawBox(0, aty, linewidth, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
+                // 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);
-                m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                // 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) {
-                if (i == botsel->line) {
-                    int toplen = m_font->getWidth(cur, botsel->column);
+                // 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, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
-                        m_font->Print(0, aty, cur, botsel->column, m_bVirtual);
+                        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) {
+                    if (toplen < linewidth) { // is there still text on this line after the selection?
                         m_font->setColor(m_foreground_color);
-                        m_font->Print(toplen, aty, &cur[botsel->column], -1, m_bVirtual);
+                        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) {
-                int toplen = m_font->getWidth(cur, topsel->column);
-                if (topsel->column) {
+                // 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, cur, topsel->column, m_bVirtual);
+                    m_font->Print(0, aty / getVirtualScale()[1], cur, topsel->column, getVirtualScale());
                 }
 
-                if (toplen < linewidth) {
+                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, aty, linewidth - toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
-                    m_font->Print(toplen, aty, &cur[topsel->column], -1, m_bVirtual);
+                    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);
-                    m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                    // 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 {
-                    int toplen = m_font->getWidth(cur, topsel->column);
-                    int botlen = toplen + m_font->getWidth(&cur[topsel->column], botsel->column - topsel->column);
+                    // 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) {
+                    if (toplen) { // is there any text on this line before the selection?
                         m_font->setColor(m_foreground_color);
-                        m_font->Print(0, aty, cur, topsel->column, m_bVirtual);
+                        m_font->Print(0, aty / getVirtualScale()[1], cur, topsel->column, getVirtualScale());
                     }
 
-                    if (botlen != toplen) {
-                        DrawBox(toplen, aty, botlen - toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
+                    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, &cur[topsel->column], botsel->column - topsel->column, m_bVirtual);
+                        m_font->Print(toplen, aty / getVirtualScale()[1], &cur[topsel->column], botsel->column - topsel->column, getVirtualScale());
                     }
 
-                    if (cur.length() != botsel->column) {
+                    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);
-                        m_font->Print(botlen, aty, &cur[botsel->column], m_bVirtual, false);
+
+                        // 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;
                     }
                 }
@@ -280,14 +318,16 @@ void UIMultiLineEdit::Draw(void)
             }
         }
 
-        if (m_selection.end.line == i && (uid.time % 750) > 374 && IsActive()) {
-            DrawBox(caret, aty, 2.f, m_font->getHeight(m_bVirtual), UBlack, 1.f);
+        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(m_bVirtual);
+        aty += m_font->getHeight(getVirtualScale());
     }
 }
 
+// num is the ZERO-BASED index of the sought line!
 str& UIMultiLineEdit::LineFromLineNumber(int num, bool resetpos)
 {
     static str emptyLine;
@@ -323,10 +363,8 @@ void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t
     float totalWidth = 0;
     float lastWidth  = 0;
 
-    clickedLine = m_vertscroll->getTopItem() + p.y / m_font->getHeight(m_bVirtual);
-    if (clickedLine >= m_lines.getCount()) {
-        clickedLine = m_lines.getCount() - 1;
-    }
+    clickedLine = m_vertscroll->getTopItem() + p.y / m_font->getHeight(getVirtualScale());
+    clickedLine = Q_min(clickedLine, m_lines.getCount() - 1);
 
     if (clickedLine < 0) {
         sel.line   = 0;
@@ -334,9 +372,9 @@ void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t
         return;
     }
 
-    str& line = LineFromLineNumber(clickedLine, true);
+    const char *line = LineFromLineNumber(clickedLine, true).c_str();
     for (i = 0; line[i] && totalWidth < p.x; i++) {
-        lastWidth = m_font->getCharWidth(line[i]);
+        lastWidth = m_font->getCharWidth(line[i]) * getVirtualScale()[0];
         totalWidth += lastWidth;
     }
 
@@ -423,7 +461,10 @@ void UIMultiLineEdit::EnsureSelectionPointVisible(selectionpoint_t& point)
 
 void UIMultiLineEdit::BoundSelectionPoint(selectionpoint_t& point)
 {
-    point.line = Q_clamp_int(point.line, 0, m_lines.getCount());
+    // 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());
@@ -438,10 +479,12 @@ qboolean UIMultiLineEdit::KeyEvent(int key, unsigned int time)
     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--;
@@ -485,16 +528,21 @@ qboolean UIMultiLineEdit::KeyEvent(int key, unsigned int time)
         }
         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();
-        } else {
-            DeleteSelection();
         }
+
+        DeleteSelection();
         break;
     case K_PGDN:
         if (m_selection.end.line == (m_vertscroll->getTopItem() + m_vertscroll->getPageHeight() - 1)) {
@@ -584,8 +632,9 @@ void UIMultiLineEdit::DeleteSelection(void)
         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 < topsel->line;
+        for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < botsel->line;
              i++, m_lines.IterateNext()) {
             if (i > topsel->line) {
                 m_lines.RemoveCurrentSetPrev();
@@ -597,12 +646,19 @@ void UIMultiLineEdit::DeleteSelection(void)
 
     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();
-    topline.CapLength(topsel->column);
+    if (topline.length() > topsel->column) {
+        topline.CapLength(topsel->column);
+    }
     m_lines.IterateNext();
-    str& line = m_lines.getCurrent();
+    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];
+    }
 
-    topline += &line[botsel->column];
     m_lines.RemoveCurrentSetPrev();
     *botsel = *topsel;
     m_vertscroll->setNumItems(m_lines.getCount());
@@ -642,8 +698,11 @@ void UIMultiLineEdit::CharEvent(int ch)
         m_changed = true;
 
         str& line      = LineFromLineNumber(m_selection.begin.line, false);
-        str  otherline = &line[m_selection.begin.column];
-        otherline.CapLength(m_selection.begin.column);
+        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);
@@ -681,19 +740,25 @@ void UIMultiLineEdit::CopySelection(void)
 
     line = LineFromLineNumber(topsel->line, true);
 
-    clipText += &line[topsel->column];
+    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 += LineFromLineNumber(i, 1);
+            clipText += "\n" + LineFromLineNumber(i, 1);
         }
 
         line = LineFromLineNumber(botsel->line, true);
-        line.CapLength(botsel->column);
+        if (line.length() > botsel->column) {
+            line.CapLength(botsel->column);
+        }
         clipText += "\n" + line;
     }
+
+    uii.Sys_SetClipboard(clipText);
 }
 
 void UIMultiLineEdit::PasteSelection(void)
@@ -701,15 +766,32 @@ void UIMultiLineEdit::PasteSelection(void)
     str sel;
     int i;
 
-    sel = uii.Sys_GetClipboard();
+    // 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]);
+            CharEvent(sel[i]); // FIXME: this is VERY slow and jams up the EventQueue!
         }
     }
 }
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 4e37663d..b119100b 100644
--- a/code/uilib/uipopupmenu.cpp
+++ b/code/uilib/uipopupmenu.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015-2023 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -100,7 +100,7 @@ uipopup_describe *UIPopupMenu::getDescribeFromPoint
 		return NULL;
 	}
 
-	float top = m_vVirtualScale[1] * 4.0f;
+	float top = getVirtualScale()[1] * 4.0f;
 	for (int i = 1; i <= m_describe->NumObjects(); i++)
 	{
 		uipopup_describe* desc = m_describe->ObjectAt(i);
@@ -163,10 +163,10 @@ float UIPopupMenu::getDescribeHeight
 {
 	if (d->type == UIP_SEPARATOR)
 	{
-		return 8.0f;
+		return 8.0f * getVirtualScale()[0];
 	}
 	
-	return m_font->getHeight(m_bVirtual);
+	return m_font->getHeight(getVirtualScale());
 }
 
 float UIPopupMenu::getDescribeWidth
@@ -175,7 +175,7 @@ float UIPopupMenu::getDescribeWidth
 	)
 
 {
-	return m_font->getWidth(d->title, -1);
+	return m_font->getWidth(d->title, -1) * getVirtualScale()[0];
 }
 
 bool UIPopupMenu::MouseInSubmenus
@@ -251,7 +251,7 @@ void UIPopupMenu::Create
 		}
 	}
 
-	totalSize.height /= m_vVirtualScale[1];
+	totalSize.height /= getVirtualScale()[1];
 
 	if (width != -1.0f)
 	{
@@ -266,11 +266,11 @@ void UIPopupMenu::Create
 	totalSize.width += 24.0f;
 	totalSize.height += 8.0f;
 
-	if (m_bVirtual)
-	{
-		totalSize.width *= m_vVirtualScale[0];
-		totalSize.height *= m_vVirtualScale[1];
-	}
+	//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;
@@ -326,10 +326,10 @@ void UIPopupMenu::Draw
 	)
 
 {
-	const float originX = m_vVirtualScale[0] * 4.0f;
-	const float originY = m_vVirtualScale[1] * 4.0f;
+	const float originX = getVirtualScale()[0] * 4.0f;
+	const float originY = getVirtualScale()[1] * 4.0f;
 
-	float fFontHeight = m_font->getHeight(m_bVirtual);
+	float fFontHeight = m_font->getHeight(getVirtualScale());
 	float top = originY;
 	for (int i = 1; i <= m_describe->NumObjects(); i++)
 	{
@@ -369,7 +369,7 @@ void UIPopupMenu::Draw
 			m_font->setColor(textColor);
 			m_marlett.setColor(textColor);
 			const char *text = Sys_LV_CL_ConvertString(desc->title);
-			m_font->Print(4.0f, top / m_vVirtualScale[1], text, -1, m_bVirtual);
+			m_font->Print(4.0f, top / getVirtualScale()[1], text, -1, getVirtualScale());
 
 			if (desc->type == UIP_SUBMENU)
 			{
@@ -378,7 +378,7 @@ void UIPopupMenu::Draw
 					m_iFontAlignmentHorizontal,
 					m_iFontAlignmentVertical,
 					"4",
-					m_bVirtual ? m_vVirtualScale : NULL
+					getVirtualScale()
 				);
 			}
 		}
@@ -405,6 +405,11 @@ void UIPopupMenu::MouseReleased
 		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();
@@ -413,10 +418,11 @@ void UIPopupMenu::MouseReleased
 	switch (desc->type)
 	{
 	case UIP_EVENT:
-		ProcessEvent((Event*)desc->data);
+		// 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:
-		ProcessEvent(new Event((const char*)desc->data));
+		listener->ProcessEvent(new Event((const char*)desc->data));
 		break;
 	case UIP_CMD:
 	case UIP_CVAR:
@@ -462,13 +468,9 @@ void UIPopupMenu::Dismiss
 
 {
 	// navigate to the topmost menu
-	if (m_parentMenu)
-	{
+	if (m_parentMenu) {
 		m_parentMenu->Dismiss();
-	}
-	else
-	{
-		// this is the topmost menu, self-destruct
+	} else {
 		delete this;
 	}
 }
diff --git a/code/uilib/uipopupmenu.h b/code/uilib/uipopupmenu.h
index 635ff264..927ea29c 100644
--- a/code/uilib/uipopupmenu.h
+++ b/code/uilib/uipopupmenu.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,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;
@@ -68,12 +67,19 @@ uipopup_describe::uipopup_describe
 inline
 uipopup_describe::~uipopup_describe()
 {
-	if (this->data)
-	{
-		// clean up strdup'd C-string from memory
-		free(this->data);
-		this->data = NULL;
-	}
+    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 {
@@ -126,6 +132,3 @@ public:
 };
 
 uipopup_type UI_PopupTypeStringToInt(str type);
-
-#endif
-
diff --git a/code/uilib/uipulldownmenu.cpp b/code/uilib/uipulldownmenu.cpp
index 9236472e..9f2e4fb0 100644
--- a/code/uilib/uipulldownmenu.cpp
+++ b/code/uilib/uipulldownmenu.cpp
@@ -84,6 +84,11 @@ UIPulldownMenu::UIPulldownMenu()
 
 	// 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()
@@ -115,14 +120,12 @@ UIRect2D UIPulldownMenu::getAlignmentRect
 		m_vVirtualScale[1] = (float)uid.vidHeight / SCREEN_HEIGHT;
 	}
 
-	int maxheight = m_font->getHeight(m_bVirtual);
+	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)
 		{
-			uipd->material->ReregisterMaterial();
-
 			int h = uii.Rend_GetShaderHeight(uipd->material->GetMaterial());
 			if (h > maxheight)
 			{
@@ -148,7 +151,6 @@ float UIPulldownMenu::getDescWidth
 	UIReggedMaterial* mat = desc->material;
 	if (mat)
 	{
-		mat->ReregisterMaterial();
 		return uii.Rend_GetShaderWidth(mat->GetMaterial());
 	}
 
@@ -164,11 +166,10 @@ float UIPulldownMenu::getDescHeight
 	UIReggedMaterial* mat = desc->material;
 	if (mat)
 	{
-		mat->ReregisterMaterial();
 		return uii.Rend_GetShaderHeight(mat->GetMaterial());
 	}
 
-	return m_font->getHeight(m_bVirtual);
+	return m_font->getHeight(m_bVirtual ? m_vVirtualScale : NULL);
 }
 
 uipull_describe *UIPulldownMenu::getPulldown
@@ -549,7 +550,6 @@ void UIPulldownMenu::Draw
 			m_font->setColor(m_highlightFGColor);
 			if (desc->selected_material)
 			{
-				desc->selected_material->ReregisterMaterial();
 				uii.Rend_DrawPicStretched(
 					atx,
 					0.0f,
@@ -577,7 +577,6 @@ void UIPulldownMenu::Draw
 		{
 			if (m_submenu != i)
 			{
-				desc->material->ReregisterMaterial();
 				uii.Rend_DrawPicStretched(
 					atx,
 					0.0f,
@@ -596,7 +595,7 @@ void UIPulldownMenu::Draw
 			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_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 95598035..c9cbbbd3 100644
--- a/code/uilib/uipulldownmenu.h
+++ b/code/uilib/uipulldownmenu.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,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:
@@ -102,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 06396b29..4d105266 100644
--- a/code/uilib/uipulldownmenucontainer.cpp
+++ b/code/uilib/uipulldownmenucontainer.cpp
@@ -166,7 +166,7 @@ void UIPulldownMenuContainer::FrameInitialized
 {
 	AllowActivate(qfalse);
 	m_menu->setBackgroundColor(m_background_color, qtrue);
-	m_menu->setForegroundColor(m_background_color);
+	m_menu->setForegroundColor(m_foreground_color);
 }
 
 void UIPulldownMenuContainer::setBackgroundAlpha
diff --git a/code/uilib/uipulldownmenucontainer.h b/code/uilib/uipulldownmenucontainer.h
index 75badfb3..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:
@@ -54,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 cc7b7c13..b2403e78 100644
--- a/code/uilib/uislider.cpp
+++ b/code/uilib/uislider.cpp
@@ -454,7 +454,6 @@ void UISlider::LayoutSliderThumbShader
 		m_thumbmaterial_pressed = uWinMan.RegisterShader(pressedShader);
 	}
 
-	m_thumbmaterial->ReregisterMaterial();
 	m_sliderwidth = uii.Rend_GetShaderWidth(m_thumbmaterial->GetMaterial());
 	m_initialized = qfalse;
 }
@@ -478,7 +477,6 @@ void UISlider::LayoutSliderLeftShader
 		m_prev_arrow_material_pressed = uWinMan.RegisterShader(pressedShader);
 	}
 
-	m_prev_arrow_material->ReregisterMaterial();
 	m_arrow_width = uii.Rend_GetShaderWidth(m_prev_arrow_material->GetMaterial());
 	m_initialized = qfalse;
 }
@@ -502,7 +500,6 @@ void UISlider::LayoutSliderRightShader
 		m_next_arrow_material_pressed = uWinMan.RegisterShader(pressedShader);
 	}
 
-	m_next_arrow_material->ReregisterMaterial();
 	m_arrow_width = uii.Rend_GetShaderWidth(m_next_arrow_material->GetMaterial());
 	m_initialized = qfalse;
 }
@@ -569,7 +566,6 @@ void UISlider::Draw
 	if (m_thumbmaterial)
 	{
 		UIReggedMaterial* material = m_thumb_depressed ? m_thumbmaterial_pressed : m_thumbmaterial;
-		material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(x, 0.0f, scaledThumbWidth, m_frame.size.height, 0.0f, 0.0f, 1.0f, 1.0f, material->GetMaterial());
 	}
 	else
@@ -581,7 +577,6 @@ void UISlider::Draw
 	{
 		Draw3DBox(0.0f, 0.0f, scaledArrowWidth, m_frame.size.height, m_prev_arrow_depressed, m_border_color, m_local_alpha);
 
-		m_prev_arrow_material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(
 			2.0f,
 			2.0f,
@@ -599,12 +594,10 @@ void UISlider::Draw
 		uihandle_t material;
 		if (m_prev_arrow_depressed)
 		{
-			m_prev_arrow_material_pressed->ReregisterMaterial();
 			material = m_prev_arrow_material_pressed->GetMaterial();
 		}
 		else
 		{
-			m_prev_arrow_material->ReregisterMaterial();
 			material = m_prev_arrow_material->GetMaterial();
 		}
 
@@ -615,7 +608,6 @@ void UISlider::Draw
 	{
 		Draw3DBox(m_frame.size.width - scaledArrowWidth, 0.0f, scaledArrowWidth, m_frame.size.height, m_next_arrow_depressed, m_border_color, m_local_alpha);
 
-		m_next_arrow_material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(
 			m_frame.size.width - scaledArrowWidth + 2.0f,
 			2.0f,
@@ -633,12 +625,10 @@ void UISlider::Draw
 		uihandle_t material;
 		if (m_next_arrow_depressed)
 		{
-			m_next_arrow_material_pressed->ReregisterMaterial();
 			material = m_next_arrow_material_pressed->GetMaterial();
 		}
 		else
 		{
-			m_next_arrow_material->ReregisterMaterial();
 			material = m_next_arrow_material->GetMaterial();
 		}
 
diff --git a/code/uilib/uislider.h b/code/uilib/uislider.h
index 7fc3e463..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;
 
@@ -85,6 +84,3 @@ public:
 	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 d8055775..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
@@ -496,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)
 	{
@@ -510,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 8a8ac499..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,7 +633,11 @@ UIReggedMaterial::UIReggedMaterial()
 
 uihandle_t UIReggedMaterial::GetMaterial()
 {
-	ReregisterMaterial();
+	if ( !isGot )
+	{
+		isGot = true;
+		this->hMat = uii.Rend_RegisterMaterial(name.c_str());
+	}
 	return hMat;
 }
 
@@ -620,9 +647,7 @@ void UIReggedMaterial::ReregisterMaterial
 	)
 
 {
-	if( !isGot )
-	{
-		isGot = true;
+	if( isGot ) {
 		this->hMat = uii.Rend_RegisterMaterial( name.c_str() );
 	}
 }
@@ -651,9 +676,8 @@ void UIReggedMaterial::RefreshMaterial
 	)
 
 {
-	if( !isGot )
+	if( isGot )
 	{
-		isGot = true;
 		this->hMat = uii.Rend_RefreshMaterial( name.c_str() );
 	}
 }
@@ -680,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;
@@ -704,12 +729,12 @@ UIWidget::UIWidget()
 	m_scaleCvar = NULL;
 	m_enabledCvar = "";
 
-	m_fadeSequenceDelayStart = 0;
+	m_fadeSequenceDelay = 0;
 	m_fadeSequenceFadeIn = 0;
 	m_fadeSequenceHold = 0;
 	m_fadeSequenceFadeOut = 0;
 	m_fadeSequenceState = fadesequence_t::SEQUENCE_NONE;
-	m_fadeSequenceAlpha = 0;
+	m_fadeSequenceLastTime = 0;
 
 	UIRect2D frame( 6.0f, 6.0f, 100.0f, 13.0f );
 	setFrame( frame );
@@ -902,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;
 	}
 }
 
@@ -916,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
@@ -934,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;
 
@@ -1105,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)
 	{
@@ -1327,7 +1348,7 @@ void UIWidget::InitFrame
 		setParent( parentview );
 	}
 	else if( this != &uWinMan )
-	{
+    {
 		setParent( &uWinMan );
 	}
 
@@ -1966,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;
 }
 
@@ -2414,84 +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 )
-		{
-			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 );
-
-			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 );
 	}
 }
 
@@ -2544,7 +2573,7 @@ float UIWidget::getTitleHeight
 	)
 
 {
-	return m_font->getHeight( m_bVirtual );
+	return m_font->getHeight(getVirtualScale());
 }
 
 bool UIWidget::CanActivate
@@ -2720,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
@@ -2728,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)
 	{
@@ -2784,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;
@@ -3099,6 +3135,11 @@ bool UIWidget::PassEventToWidget
 	return false;
 }
 
+UIFont *UIWidget::getFont() const
+{
+    return m_font;
+}
+
 bool UIWidget::isVirtual() const
 {
 	return m_bVirtual;
@@ -3106,7 +3147,16 @@ bool UIWidget::isVirtual() const
 
 const vec2_t& UIWidget::getVirtualScale() const
 {
-	return m_vVirtualScale;
+	if (m_bVirtual) {
+		return m_vVirtualScale;
+	} else {
+		return uid.scaleRes;
+	}
+}
+
+const vec2_t& UIWidget::getHighResScale() const
+{
+	return uid.scaleRes;
 }
 
 void UIWidget::SetEnabledCvar
@@ -3128,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)
@@ -3145,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()
@@ -3189,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 fc525ca4..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;
@@ -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,9 +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 c988d08f..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.
 
@@ -194,7 +194,13 @@ UIWidget *UIWindowManager::getResponder(UIPoint2D& pos)
 
     responder = m_firstResponder;
 
-    if (responder != this) {
+    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;
     }
 
@@ -256,8 +262,6 @@ void UIWindowManager::UpdateViews(void)
         set2D();
         uii.Rend_SetColor(col);
 
-        m_cursor->ReregisterMaterial();
-
         uii.Rend_DrawPicStretched(uid.mouseX, uid.mouseY, 0, 0, 0, 0, 1, 1, m_cursor->GetMaterial());
 
         m_font->setColor(UWhite);
@@ -265,7 +269,7 @@ void UIWindowManager::UpdateViews(void)
         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_font->Print(x, y, va("%d:%d", uid.mouseX, uid.mouseY), -1, m_bVirtual ? m_vVirtualScale : NULL);
         }
     }
 }
@@ -525,7 +529,7 @@ qboolean UIWindowManager::KeyEvent(int key, unsigned int time)
 {
     UIWidget *selwidget = NULL;
 
-    if (key == K_TAB && (uii.Sys_IsKeyDown(K_CTRL) || uii.Sys_IsKeyDown(K_DEL))) {
+    if (key == K_TAB && uii.Sys_IsKeyDown(K_CTRL)) {
         UIWidget *wid;
 
         if (m_activeControl && m_activeControl != this) {
@@ -540,13 +544,13 @@ qboolean UIWindowManager::KeyEvent(int key, unsigned int time)
             selwidget = getFirstChild();
         }
 
-        for (wid = selwidget->getNextChild(selwidget); wid != NULL; wid = wid->getNextChild(wid)) {
+        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 = wid->getNextChild(wid)) {
+        for (wid = getFirstChild(); wid != selwidget && wid != NULL; wid = getNextChild(wid)) {
             if (!(selwidget->m_flags & WF_ALWAYS_BOTTOM) && selwidget->CanActivate()) {
                 ActivateControl(wid);
                 return true;
@@ -555,7 +559,7 @@ qboolean UIWindowManager::KeyEvent(int key, unsigned int time)
     } else {
         if (m_bindactive) {
             m_bindactive->KeyEvent(key, time);
-        } else if (!m_activeControl || !m_activeControl->KeyEvent(key, time) && (key != K_UPARROW || key != K_DOWNARROW)) {
+        } 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()) {
@@ -635,7 +639,7 @@ UIReggedMaterial *UIWindowManager::RefreshShader(const str& name)
     for (i = 1; i <= m_materiallist.NumObjects(); i++) {
         regged = m_materiallist.ObjectAt(i);
         if (regged->GetName() == name) {
-            regged->ReregisterMaterial();
+            regged->RefreshMaterial();
             return regged;
         }
     }
@@ -906,6 +910,8 @@ void UIWindowManager::Shutdown(void)
         delete b;
     }
 
+    m_cursor = NULL;
+
     UIWidget::Shutdown();
 }
 
diff --git a/code/uilib/ulist.h b/code/uilib/ulist.h
index 3c141719..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 {
@@ -349,5 +348,3 @@ void UList< type >::setPosition
 {
 	m_at = static_cast<UListItem<type>*>(pos);
 }
-
-#endif /* __ULIST_H__ */
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/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 100%
rename from docker/x86_64/14.04/Dockerfile
rename to docker/dev/x86_64/14.04/Dockerfile
diff --git a/docker/x86_64/16.04/Dockerfile b/docker/dev/x86_64/16.04/Dockerfile
similarity index 100%
rename from docker/x86_64/16.04/Dockerfile
rename to docker/dev/x86_64/16.04/Dockerfile
diff --git a/docker/x86_64/18.04/Dockerfile b/docker/dev/x86_64/18.04/Dockerfile
similarity index 100%
rename from docker/x86_64/18.04/Dockerfile
rename to docker/dev/x86_64/18.04/Dockerfile
diff --git a/docker/x86_64/20.04/Dockerfile b/docker/dev/x86_64/20.04/Dockerfile
similarity index 100%
rename from docker/x86_64/20.04/Dockerfile
rename to docker/dev/x86_64/20.04/Dockerfile
diff --git a/docker/x86_64/22.04/Dockerfile b/docker/dev/x86_64/22.04/Dockerfile
similarity index 100%
rename from docker/x86_64/22.04/Dockerfile
rename to docker/dev/x86_64/22.04/Dockerfile
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
index 39faec5f..41b4f445 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -1,43 +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) have been tested and confirmed to work, big-Endian architectures should be supported as well; however, they remain untested.
+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.5
+- CMake >= 3.12
 - Flex (>= 2.6.4) and Bison (>= 3.5.1)
-- A C++11 compiler is also required.
+- A C++11 compiler
+- [SDL2](https://github.com/libsdl-org/SDL/tree/SDL2)
+- [OpenAL SDK](https://github.com/kcat/openal-soft)
 
-The installation directory can be set to the MOHAA directory.
+The following tools may be useful:
+- [cURL](https://github.com/curl/curl)
 
-By default, the build will produce both the client and dedicated server versions. The client can be omitted from the build by appending `-DBUILD_NO_CLIENT=1` to the CMake command-line arguments. Using this parameter will result in only the server portion being built.
+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 >= 3.3 or GCC >= 4.8.5
+- Clang >= 7.0.1 or GCC >= 9.4.0
 - libsdl2-dev
+- libopenal-dev
+- libssl-dev
+- libcurl4-openssl-dev
 
-**clang-3.5** and **gcc-4.8.5** should work (tested on Ubuntu 16.04), but the latest version should be used.
-
-Ubuntu 20.04 is the minimum version required to fully compile the project successfully.
+**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
+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 -G Ninja ../
+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.
 
-Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/tag/v2.5.25
+- 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
 
-Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe` to the CMake command-line to use the package from the link above.
+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
index 707af024..2ebf8105 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -2,22 +2,47 @@
 
 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
 
-### Client-side and server-side
+### General
 
+- Demo recording
 - Features from ioquake3
+- Features from MOH: Spearhead 2.15 and MOH: Breakthrough 2.40
 - IPv6 support (from ioquake3)
-- Features from SH 2.15 and BT 2.40
+
+### 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
-- Demo recording
 - IP ban (from ioquake3)
 - More script commands for mods
 - Non-PVS optimization
-- Spectate players in first-person
+- 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
 
@@ -29,7 +54,8 @@ Enable this feature with `set sv_netoptimize 2`.
 
 ### Client-side and server-side
 
-- Fixes from SH 2.15 and BT 2.40
+- Fixed background ambient sounds being muted when restarting
+- Fixes from SH 2.15, BT 2.40 and ioquake3
 - Buffer overflow fixes
 - Directory traversal fix
 
@@ -37,13 +63,18 @@ Enable this feature with `set sv_netoptimize 2`.
 
 - DM message comment fix
 - Callvote fix
-- Getting weapons from opposite team
-- Grenade crash bug
-- Grenade spectator charge bug
-- `leave_team` bug fix
-- Primary DM weapon spectator fix
-- Projectile spectator glitch fix (for when firing a projectile then going into spectator to kill anyone)
-- `sv_fps` (tickrate) fix, higher values won't cause animation issues anymore
+- 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
 
diff --git a/docs/features_g_allclasses.html b/docs/features_g_allclasses.html
index 5b4b8471..0c82ecfa 100644
--- a/docs/features_g_allclasses.html
+++ b/docs/features_g_allclasses.html
@@ -28,14 +28,17 @@
 <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>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>
@@ -43,8 +46,8 @@
 <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>( <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>
@@ -52,9 +55,6 @@
 <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>( <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>
 
@@ -65,10 +65,10 @@
 <ul>Loop animation.</ul>
 
 <P><tt><B>animname</B></tt><BR>
-<ul>Gets the animname.</ul>
+<ul>Sets the animname.</ul>
 
 <P><tt><B>animname</B></tt><BR>
-<ul>Sets the animname.</ul>
+<ul>Gets the animname.</ul>
 
 <P><tt><B>animscript</B>( <i>String name </i>)</tt><BR>
 <ul>Play the animation script</ul>
@@ -95,43 +95,43 @@
 <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>Sets the current script that will handle attack events</ul>
+<ul>Gets the current script that will handle attack events</ul>
 
 <P><tt><B>attackhandler</B></tt><BR>
-<ul>Gets the current script that will handle attack events</ul>
+<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>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>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>( <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>Get the crossblend time</ul>
+<ul>Set the crossblend time to something other than the default, in seconds</ul>
 
 <P><tt><B>blendtime</B></tt><BR>
-<ul>Set the crossblend time to something other than the default, in seconds</ul>
+<ul>Get the crossblend time</ul>
 
 <P><tt><B>breakspecial</B></tt><BR>
 <ul>tell ai to break special attack</ul>
@@ -175,10 +175,10 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <ul>preps the dead actor for turning nonsolid gradually over time</ul>
 
 <P><tt><B>deathhandler</B></tt><BR>
-<ul>Gets the current script that will handle death events</ul>
+<ul>Sets the current script that will handle death events</ul>
 
 <P><tt><B>deathhandler</B></tt><BR>
-<ul>Sets the current script that will handle death events</ul>
+<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>
@@ -192,21 +192,21 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <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>( <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_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_level</B></tt><BR>
-<ul>Gets the disguise level of the actor. May be 1 or 2</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>
 
@@ -219,12 +219,12 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <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>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>
 
@@ -276,10 +276,10 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <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></tt><BR>
+<P><tt><B>fallheight</B>( <i>Float height </i>)</tt><BR>
 <ul>Set the fallheight</ul>
 
-<P><tt><B>fallheight</B>( <i>Float height </i>)</tt><BR>
+<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>
@@ -300,35 +300,38 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <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>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>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>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>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>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>
@@ -336,9 +339,6 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>gun</B></tt><BR>
 <ul>gets the gun to being used</ul>
 
-<P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
-<ul>specifies the gun to use</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>
 
@@ -348,12 +348,12 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>headmodel</B>( <i>String headmodel </i>)</tt><BR>
 <ul>sets the head model</ul>
 
-<P><tt><B>headskin</B>( <i>String headskin </i>)</tt><BR>
-<ul>sets the head skin</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>
 
@@ -381,24 +381,24 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>immediateremove</B></tt><BR>
 <ul>Removes this listener immediately.</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>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></tt><BR>
-<ul>Gets 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>
 
@@ -439,32 +439,35 @@ Location values:<BR>
 <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>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>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>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>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>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>
@@ -472,15 +475,12 @@ Location values:<BR>
 <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>( <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>mood</B></tt><BR>
-<ul>gets the AI mood: '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>
 
@@ -493,15 +493,15 @@ Location values:<BR>
 <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>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>nationality</B></tt><BR>
 <ul>Get the nationality of an actor. Return values are ger, it, usa, uk, ussr and unset.</ul>
 
@@ -511,15 +511,15 @@ Location values:<BR>
 <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>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>nonvislevel</B></tt><BR>
 <ul>visibility level in range 0-1 below which an enemy is treated as non-visible</ul>
 
@@ -529,6 +529,10 @@ Location values:<BR>
 <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>
@@ -537,46 +541,42 @@ Location values:<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>( <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>( <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>no_idle</B></tt><BR>
-<ul>Specifies if the actor will not go into idle after playing an animation</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>Sets the current script that will handle pain events</ul>
+<ul>Gets the current script that will handle pain events</ul>
 
 <P><tt><B>painhandler</B></tt><BR>
-<ul>Gets the current script that will handle pain events</ul>
+<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>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>physics_off</B></tt><BR>
 <ul>turn physics off.</ul>
 
@@ -614,15 +614,15 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>resetleash</B></tt><BR>
 <ul>resets the AI's leash to their current position</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>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>
 
@@ -665,15 +665,19 @@ default channel, CHAN_BODY.</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>( <i>Float max_sight_range </i>)</tt><BR>
-<ul>Sets the vision distance of the actor.</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>
 
@@ -681,9 +685,8 @@ default channel, CHAN_BODY.</ul>
 <ul>set to 0 to prevent this guy from saying stuff besides pain and death sounds.<BR>
 </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>
@@ -691,9 +694,6 @@ default channel, CHAN_BODY.</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>( <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>
 
@@ -736,23 +736,20 @@ default channel, CHAN_BODY.</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>turret</B>( <i>String turret </i>)</tt><BR>
 <ul>Sets the turret 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>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_disguise</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the disguise 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>
@@ -760,6 +757,9 @@ default channel, CHAN_BODY.</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>
 
@@ -769,15 +769,15 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>type_grenade</B></tt><BR>
 <ul>Gets the grenade 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></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>
 
@@ -787,19 +787,19 @@ default channel, CHAN_BODY.</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>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>waittrigger</B>( <i>Boolean bool </i>)</tt><BR>
+<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></tt><BR>
+<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>
@@ -839,30 +839,30 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>accuracy</B></tt><BR>
 <ul>Set percent to hit</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>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>( <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>disguise_level</B></tt><BR>
-<ul>Gets the disguise level of the actor. May be 1 or 2</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>
 
@@ -918,29 +918,29 @@ default channel, CHAN_BODY.</ul>
 <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>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
+<ul>Force the sentient to drop weapons no matter what level.nodropweapon 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>fov</B>( <i>Float angle </i>)</tt><BR>
-<ul>The fov angle of the actor</ul>
+<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>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>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>gun</B></tt><BR>
-<ul>gets the gun to being used</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>
 
@@ -965,24 +965,24 @@ default channel, CHAN_BODY.</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></tt><BR>
-<ul>Gets the maximum distance the AI tries to keep 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>mindist</B></tt><BR>
-<ul>Gets the minimum distance the AI tries to keep 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>model</B></tt><BR>
-<ul>get the modelName.</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>
@@ -991,48 +991,48 @@ default channel, CHAN_BODY.</ul>
 <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>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>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>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
-<ul>Sets the vision distance of the actor.</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>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>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></tt><BR>
-<ul>Gets 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>type_attack</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the attack type 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>
 
@@ -1052,10 +1052,10 @@ default channel, CHAN_BODY.</ul>
 <ul>Sets the idle type of the actor.</ul>
 
 <P><tt><B>voicetype</B></tt><BR>
-<ul>Gets the voice type</ul>
+<ul>Set voicetype to magic letter postfix</ul>
 
 <P><tt><B>voicetype</B></tt><BR>
-<ul>Set voicetype to magic letter postfix</ul>
+<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>
@@ -1076,6 +1076,9 @@ default channel, CHAN_BODY.</ul>
 
 <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>
@@ -1134,18 +1137,18 @@ speed - how fast the effect should travel, in other words, how long before the e
 <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></tt><BR>
-<ul>Get the node priority</ul>
-
 <P><tt><B>priority</B>( <i>Integer priority </i>)</tt><BR>
 <ul>Set the node priority</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>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>
 
@@ -1155,11 +1158,11 @@ speed - how fast the effect should travel, in other words, how long before the e
 <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></tt><BR>
-<ul>Get the attractive node team. 'none' for no team.</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>
@@ -1864,14 +1867,14 @@ offset		     - vector offset for the model from the specified tag</ul>
 <ul>used to ban certain contact when in parentmode<BR>
 </ul>
 
-<P><tt><B>classname</B></tt><BR>
-<ul>The entity's classname</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>
 
@@ -1998,9 +2001,6 @@ god - makes the entity invincible<BR>
 <P><tt><B>gettagposition</B>( <i>String tag_name </i>)</tt><BR>
 <ul>Gets the world position of the tag</ul>
 
-<P><tt><B>getzone</B></tt><BR>
-<ul>Gets the current entity zone. NIL if the entity is not in a zone.</ul>
-
 <P><tt><B>ghost</B></tt><BR>
 <ul>make non-solid but still send to client regardless of hide status.</ul>
 
@@ -2048,9 +2048,6 @@ entity's current health, it will be killed or destroyed.</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>isinzone</B>( <i>Entity zone </i>)</tt><BR>
-<ul>Returns 1 if the entity is in the specified zone. 0 otherwise</ul>
-
 <P><tt><B>istouching</B>( <i>Entity ent </i>)</tt><BR>
 <ul>returns 1 if the entities are touching,0 if not</ul>
 
@@ -2125,21 +2122,21 @@ which is attached to the current 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>( <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>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>movementstealth</B>( <i>Float scale </i>)</tt><BR>
 <ul>Sets the current movement stealth scalar for the sentient</ul>
 
@@ -2211,12 +2208,12 @@ lightstyledynamiclight - the dynamic light uses a light style, use the<BR>
 <P><tt><B>revive</B>( <i>Float health </i>)</tt><BR>
 <ul>sets the health,even if dead</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>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>
 
@@ -2351,20 +2348,17 @@ broadcast - always send this entity to the client</ul>
 <P><tt><B>usebbox</B></tt><BR>
 <ul>do not perform perfect collision,use bounding box instead.</ul>
 
-<P><tt><B>velocity</B></tt><BR>
-<ul>gets the velocity for this entity.</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>
-
-<P><tt><B>zone</B></tt><BR>
-<ul>Get the current entity zone. NIL if the entity is not in a zone.</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="Event">Event</a> -> <a href="#Class">Class</a></h2>
@@ -2517,6 +2511,31 @@ Location values:<BR>
 
 <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>
@@ -2676,6 +2695,12 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 
 <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>
@@ -2776,24 +2801,24 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <h2> <a name="Hud">Hud</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
-<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>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>( <i>Float alpha </i>)</tt><BR>
-<ul>Sets the HUD alpha</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>
 
@@ -2855,17 +2880,17 @@ Note : you will need to call in HUD functions again as it won't refresh to the p
 <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>( <i>Integer x </i>)</tt><BR>
-<ul>Sets the HUD horizontal position</ul>
-
 <P><tt><B>x</B></tt><BR>
 <ul>Gets the HUD horizontal position</ul>
 
-<P><tt><B>y</B></tt><BR>
-<ul>Gets the HUD vertical 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>
@@ -2882,7 +2907,7 @@ Note : you will need to call in HUD functions again as it won't refresh to the p
 <BLOCKQUOTE>
 </BLOCKQUOTE>
 
-<h2> <a name="InfoNull">InfoNull (<i>info_null</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<h2> <a name="InfoNull">InfoNull (<i>info_null</i>)</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 </BLOCKQUOTE>
 
@@ -3028,51 +3053,60 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <h2> <a name="Level">Level</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
-<P><tt><B>alarm</B>( <i>Integer alarm_status </i>)</tt><BR>
+<P><tt><B>alarm</B></tt><BR>
 <ul>zero = global level alarm off,non-zero = alarm on</ul>
 
-<P><tt><B>alarm</B></tt><BR>
+<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>the number of bombs that are set</ul>
+<ul>Sets the number of bombs that are set</ul>
 
 <P><tt><B>bombs_planted</B>( <i>Integer num </i>)</tt><BR>
-<ul>Sets the number of bombs that are set</ul>
+<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></tt><BR>
-<ul>Gets which side the clock is on... 'axis' or 'allies' win when time is up</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>( <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>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>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>
+<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>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>
 
@@ -3103,12 +3137,12 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</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></tt><BR>
-<ul>Gets 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>
 
@@ -3172,21 +3206,21 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</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>Sets 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></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>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>
 
@@ -3390,6 +3424,15 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <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>
 
@@ -3398,6 +3441,12 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</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>
@@ -3502,11 +3551,11 @@ Location values:<BR>
 17 LFoot<BR>
 </ul>
 
-<P><tt><B>damage_multiplier</B></tt><BR>
-
 <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>
 
@@ -3604,7 +3653,7 @@ Location values:<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 player all weapons.</ul>
+<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>
@@ -3612,10 +3661,10 @@ Location values:<BR>
 <P><tt><B>gvo</B></tt><BR>
 <ul>Retrieves the server's vote options file</ul>
 
-<P><tt><B>has_disguise</B></tt><BR>
+<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>( <i>Integer is_disguised </i>)</tt><BR>
+<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>
@@ -3798,10 +3847,10 @@ can specify 'stand', 'duck' or 'prone'.</ul>
 <ul>returns 1 if this player is holding the primary fire, or 0 if not</ul>
 
 <P><tt><B>ready</B></tt><BR>
-<ul>returns 1 if this player is ready,0 otherwise</ul>
+<ul>makes this player ready for the round to start</ul>
 
 <P><tt><B>ready</B></tt><BR>
-<ul>makes this player ready for the round to start</ul>
+<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>
@@ -4544,6 +4593,9 @@ Default=0:</ul>
 <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>
@@ -4748,6 +4800,18 @@ Location values:<BR>
 <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>
 
@@ -4759,7 +4823,7 @@ Location values:<BR>
 
 <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>
-normalangles, loop, and a number specifying the start time.</ul>
+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>
@@ -5683,15 +5747,15 @@ Location values:<BR>
 <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>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>Force the sentient to drop weapons no matter what level.nodropweapon is.</ul>
-
 <P><tt><B>forcelandminemeasure</B></tt><BR>
 <ul>Force a remeasurement to all landmines</ul>
 
@@ -5829,18 +5893,15 @@ Location values:<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>( <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>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>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>
@@ -5848,6 +5909,9 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</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>
 
@@ -5869,24 +5933,24 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</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>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>( <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>
@@ -6120,6 +6184,10 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <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>
 
@@ -6234,7 +6302,7 @@ Location values:<BR>
 <P><tt><B>stickybombwet</B></tt><BR>
 </BLOCKQUOTE>
 
-<h2> <a name="ThrowObject">ThrowObject (<i>func_throwobject</i>)</a> -> <a href="#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>
+<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>
@@ -6289,12 +6357,12 @@ Location values:<BR>
 <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>( <i>Integer ControlledBy </i>)</tt><BR>
-<ul>Sets the team controlling the objective</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>
 
@@ -6454,30 +6522,8 @@ If facet is 2 than trigger is East/West oriented. If facet is 3 than trigger is
 <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>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</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>
@@ -6661,6 +6707,10 @@ as a multi-faceted edge trigger.</ul>
 <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>
@@ -6767,14 +6817,14 @@ as a multi-faceted edge trigger.</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>( <i>String value </i>)</tt><BR>
-<ul>Sets the target type to be none any, or player</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></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>turnSpeed</B>( <i>Float speed </i>)</tt><BR>
 <ul>Sets the turret's turn speed</ul>
@@ -6947,10 +6997,10 @@ Location values:<BR>
 <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>( <i>Entity entity </i>)</tt><BR>
+<P><tt><B>collisionent</B></tt><BR>
 <ul>Gets the Collision Entity</ul>
 
-<P><tt><B>collisionent</B></tt><BR>
+<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>
@@ -7233,6 +7283,9 @@ Location values:<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>
@@ -7348,12 +7401,12 @@ Location values:<BR>
 <P><tt><B>aimtolerance</B>( <i>Vector caps </i>)</tt><BR>
 <ul>Sets a tolerance for the angles.</ul>
 
-<P><tt><B>collisionent</B>( <i>Entity entity </i>)</tt><BR>
-<ul>Sets the Collision Entity</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>
@@ -8114,12 +8167,12 @@ Location values:<BR>
 <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></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>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>
 
@@ -8129,21 +8182,21 @@ Location values:<BR>
 <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_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_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_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>
@@ -8208,7 +8261,7 @@ Location values:<BR>
 <ul>Set the watercolor screen blend</ul>
 </BLOCKQUOTE>
 <H2>
-189 Game Module Classes.<BR>2154 Game Module Events.
+191 Game Module Classes.<BR>2169 Game Module Events.
 </H2>
 </BODY>
 </HTML>
diff --git a/docs/features_implementation.md b/docs/features_implementation.md
deleted file mode 100644
index f013c171..00000000
--- a/docs/features_implementation.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Implementation
-
-## Server
-
-The server version can be built successfully, but some features are not functional. For example, the Actor system is almost fully implemented, but it is not yet stable. This means that Actor 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    |        |      |       |     |             |                                                                   |
-| 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, and few gameplay bugs                                      |
-| UI                      |      | x      |      |       |     |             | A few bugs to fix                                                 |
diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 129353eb..d1edfa69 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -1,25 +1,128 @@
 # Installation
 
-Ensure that you download the binaries compatible with your platform in the release section.
+- 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 valid MOH:AA installation
-- 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 may be required.
+- 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)
 
-## Client
+## Installing official patches
 
-a) extract archive to your MOHAA installation directory.
+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 archive somewhere on your hard drive, create a shortcut to openmohaa (or omohaaded), and set the start directory on the shortcut to your MOHAA installation directory.
+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.
 
-## Server
+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.
 
-Extract the archive to your MOHAA server installation directory. Then proceed like you would do with mohaa server:
+----
 
-- `.\omohaaded.exe +exec server.cfg` on Windows
-- `./omohaaded +exec server.cfg` on Linux
+**Notes:**
 
-Only `omohaaded*` and `game*` binaries are required for the server version, other binaries can be omitted.
+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
index 33c1a070..c89b3288 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -2,33 +2,63 @@
 
 ## Game selection
 
-**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:
+**Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
 
-- `+set com_target_game 1` for Spearhead (mohaas/mohta)
-- `+set com_target_game 2` for Breakthrough (mohaab/mohtt)
+### From the launchers
 
-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 (main).
+Base game and expansions can be started from one of the 3 launchers:
 
-With `com_target_game`, OpenMoHAA will support the network protocol accordingly.
+- `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.
 
-## Config file
+### Using a demo version
 
-The config file can be found in different locations depending on the platform:
+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.
 
-- `%APPDATA%\openmohaa\<game_name>\configs\omconfig.cfg` on Windows
-- `~/.openmohaa/<game_name>/configs/omconfig.cfg` on Linux
+## User data location
 
-This has two advantages:
+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.
\ No newline at end of file
+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/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/+                                                                                                                                                                                                                                                                                                 "};