Updated the version number

This fixes issues with animation being stuck on secondary grenade charge

.clang-format

@@ -0,0 +1,90 @@
+---
+Language: Cpp
+Standard: c++17
+
+AccessModifierOffset: -4
+AlignAfterOpenBracket: BlockIndent
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments: Consecutive
+AlignConsecutiveBitFields: Consecutive
+AlignConsecutiveDeclarations: Consecutive
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: false
+AlignEscapedNewlines: Left
+AlignOperands: AlignAfterOperator
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Inline
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: True
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BitFieldColonSpacing: Both
+BraceWrapping:
+  AfterClass: true
+  AfterEnum: false
+  AfterExternBlock: false
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: true
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyNamespace: false
+  SplitEmptyRecord: false
+BreakArrays: true
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeConceptDeclarations: Always
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+ColumnLimit: 120
+CompactNamespaces: false
+Cpp11BracedListStyle: true
+EmptyLineBeforeAccessModifier: Always
+IndentAccessModifiers: false
+IndentCaseBlocks: true
+IndentCaseLabels: false
+IndentExternBlock: Indent
+IndentGotoLabels: true
+IndentPPDirectives: AfterHash
+IndentRequiresClause: true
+IndentWidth: 4
+InsertBraces: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+LineEnding: LF
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+PackConstructorInitializers: Never
+PointerAlignment: Right
+QualifierAlignment: Left
+ReferenceAlignment: Left
+ReflowComments: false
+RequiresClausePosition: WithFollowing
+SeparateDefinitionBlocks: Always
+SortIncludes: false
+SortUsingDeclarations: Lexicographic
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeParens: ControlStatements
+SpacesInAngles: Never
+UseTab: Never

.github/workflows/build-cmake.yml

@@ -2,9 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
   workflow_call:
 
 concurrency:
@@ -29,19 +27,6 @@ jobs:
     name: "Building for platform linux-${{matrix.architecture.name}}"
     runs-on: ubuntu-22.04
 
-#    container:
-#      image: ubuntu:22.04
-#      volumes:
-#        - ${{github.workspace}}:${{github.workspace}}
-#
-#    steps:
-#    - name: Install required packages
-#      run: apt update && apt install -y clang-15 cmake ninja-build flex bison git
-#
-#    - name: Install required cross-platform packages (${{ matrix.architecture.triple }})
-#      if: matrix.architecture.name != 'amd64'
-#      run: apt install -y gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
-
     steps:
     - name: Settings
       working-directory: ${{github.workspace}}
@@ -56,22 +41,18 @@ jobs:
     - 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 }}
-  
-    - name: Install dependencies
-      working-directory: ${{github.workspace}}
-      run: |
-        echo Using triple: ${{ matrix.architecture.triple }}
-        mkdir -p thirdparties && cd thirdparties
-        git clone --depth 1 --single-branch --branch SDL2 https://github.com/libsdl-org/SDL.git
-        cmake -B SDL-build \
-          -DCMAKE_C_COMPILER=clang \
-          -DCMAKE_CXX_COMPILER=clang++ \
-          -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }} \
-          -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }} \
-          -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/SDL-install' \
-          ./SDL
-        cmake --build SDL-build --config Release
-        cmake --install SDL-build
+
+    # 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:
@@ -86,21 +67,17 @@ jobs:
         -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 }} \
-        -DSDL2_DIR='${{github.workspace}}/thirdparties/SDL-install/lib/cmake/SDL2' \
-        -DWITH_CLIENT=1" >> $GITHUB_ENV
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
 
     - name: Configure CMake
       working-directory: ${{github.workspace}}
       run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} -DTARGET_GAME_TYPE=0 ./source
-        cmake -B ./buildtt ${{ env.CMAKE_PARAM }} -DTARGET_GAME_TYPE=2 ./source
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
 
     - name: Build
       working-directory: ${{github.workspace}}
       run: |
         cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        cmake --build ${{github.workspace}}/buildtt --config ${{env.BUILD_TYPE}}
 
     - name: Test
       working-directory: ${{github.workspace}}
@@ -109,16 +86,13 @@ jobs:
       run: |
         cd "${{github.workspace}}/build"
         ctest -C ${{env.BUILD_TYPE}}
-        cd "${{github.workspace}}/buildtt"
-        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}}
-        cmake --install ${{github.workspace}}/buildtt --config ${{env.BUILD_TYPE}}
-        cp '${{github.workspace}}/thirdparties/SDL-install/lib/libSDL2.so' '${{github.workspace}}/install'
+        cp '${{steps.sdl.outputs.prefix}}/lib/libSDL2.so' '${{github.workspace}}/install'
 
     - uses: actions/upload-artifact@v3
       with:
@@ -145,14 +119,19 @@ jobs:
       run: |
         echo "CMAKE_BUILD_PARALLEL_LEVEL=$((Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors * 16)" >> $GITHUB_ENV
 
-    - name: Install required packages
+        # 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 SDL2 https://github.com/libsdl-org/SDL.git
-        cmake -B SDL-build -A ${{ matrix.architecture.config }} -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/SDL-install' ./SDL
-        cmake --build SDL-build --config Release --parallel
-        cmake --install SDL-build
         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
@@ -168,25 +147,19 @@ jobs:
         --log-level=VERBOSE `
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
-        -DCMAKE_C_COMPILER=clang `
-        -DCMAKE_CXX_COMPILER=clang++ `
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
-        -DSDL2_DIR='${{github.workspace}}/thirdparties/SDL-install/cmake' `
         -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
-        -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe' `
-        -DWITH_CLIENT=1".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
+        -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 }} -DTARGET_GAME_TYPE=0 ./source
-        cmake -B ./buildtt ${{ env.CMAKE_PARAM }} -DTARGET_GAME_TYPE=2 ./source
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
 
     - name: Build
       working-directory: ${{github.workspace}}
       run: |
         cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        cmake --build ${{github.workspace}}/buildtt --config ${{env.BUILD_TYPE}}
 
     - name: Test
       working-directory: ${{github.workspace}}
@@ -195,16 +168,13 @@ jobs:
       run: |
         cd "${{github.workspace}}/build"
         ctest -C ${{env.BUILD_TYPE}}
-        cd "${{github.workspace}}/buildtt"
-        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}}
-        cmake --install ${{github.workspace}}/buildtt --config ${{env.BUILD_TYPE}}
-        Copy-Item "${{github.workspace}}/thirdparties/SDL-install/bin/*.dll" -Destination "${{github.workspace}}/install"
+        Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/install'
 
     - uses: actions/upload-artifact@v3
       with:

.github/workflows/codeql.yml

@@ -43,6 +43,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: sdl2-latest
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/publish-release.yml

@@ -18,6 +18,9 @@ jobs:
 
   deploy_all:
     strategy:
+      # Set the maximum number of parallel jobs to 1, to avoid a race-condition
+      # while creating a new release
+      max-parallel: 1
       matrix:
         target_os: [
           'linux-amd64',

CHANGELOG.txt

@@ -1,13 +0,0 @@
-=== Patch 1.12 ===
-
->>> Client :
-- Added GFX features such as bloom, SSAO & FXAA
-- Added support of .vision files
-- Added support of custom weapons and view model animations
-
->>> Game :
-- Added more scripting functions
-- Lot more..
-
-
-THIS CHANGELOG IS NOT COMPLETED YET.

CMakeLists.txt

@@ -5,23 +5,14 @@ include(TargetArch.cmake)
 
 target_architecture(TARGET_ARCH)
 
+
 if(TARGET_GAME_TYPE)
-	if(TARGET_GAME_TYPE EQUAL 1)
-		# Build for Team Assault (Spearhead)
-		set(TARGET_BASE_SUFFIX "ta")
-	elseif(TARGET_GAME_TYPE EQUAL 2)
-		# Build for Team Tactics (Breakthrough)
-		set(TARGET_BASE_SUFFIX "tt")
-	else()
-		set(TARGET_BASE_SUFFIX)
-		message(SEND_ERROR "Invalid game type. Game type can be 0, 1 or 2")
-	endif()
-else()
-	set(TARGET_BASE_SUFFIX)
-	set(TARGET_GAME_TYPE 0)
+	message(SEND_ERROR "TARGET_GAME_TYPE is now unsupported, it is now done at runtime.")
 endif()
 
-set(TARGET_BASE_GAME "main${TARGET_BASE_SUFFIX}")
+
+set(TARGET_BASE_GAME "./")
+set(CMAKE_DEBUG_POSTFIX "-dbg")
 
 if(MSVC)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
@@ -31,13 +22,24 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	add_compile_options(-Wno-pointer-bool-conversion)
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	# Add this option on gcc to prevent functions from having the STB_GNU_UNIQUE binding
+	# Otherwise, it would prevent libraries from being unloaded
+	# which will cause undefined behavior and crashes due to memory corruption
+	add_compile_options(-fno-gnu-unique)
+endif()
+
+if(DEBUG_MEMORY)
+	add_definitions(-D_DEBUG_MEM)
+endif()
+
 IF("${TARGET_ARCH}" STREQUAL "i386")
 	set(TARGET_ARCH_SUFFIX "x86")
 ELSE()
 	set(TARGET_ARCH_SUFFIX ${TARGET_ARCH})
 ENDIF()
 
-message(STATUS "Architecture detected: ${TARGET_ARCH}, suffix set to ${TARGET_ARCH_SUFFIX}")
+message(STATUS "Architecture detected: ${TARGET_ARCH}, suffix set to ${TARGET_ARCH_SUFFIX}.")
 
 IF(WIN32)
 	set(TARGET_PLATFORM_PREFIX "")
@@ -50,16 +52,14 @@ ELSE()
 ENDIF()
 
 IF(CMAKE_BUILD_TYPE MATCHES Debug)
-	set(TARGET_CONFIG_SUFFIX "-dbg")
 	add_definitions(-D_DEBUG)
 
+	# NOTE: The following may mess up function importation
 	#if(UNIX)
 	#	# Enable all exports so all functions name can be seen during executable crash
 	#	set(CMAKE_ENABLE_EXPORTS ON)
 	#	message(STATUS "Enabling exports on Unix for backtrace")
 	#endif()
-ELSE()
-	set(TARGET_CONFIG_SUFFIX "")
 ENDIF()
 
 # Common stuff
@@ -81,9 +81,11 @@ target_compile_features(omohaaded PUBLIC c_variadic_macros)
 target_link_libraries(omohaaded PRIVATE omohserver)
 target_link_libraries(omohaaded PRIVATE syslib)
 target_link_libraries(omohaaded PRIVATE qcommon qcommon_standalone)
+
 # Gamespy dependency
 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}${TARGET_CONFIG_SUFFIX}")
+set_target_properties(omohaaded PROPERTIES OUTPUT_NAME "omohaaded${TARGET_BASE_SUFFIX}${TARGET_ARCH_SUFFIX}")
+set_target_properties(omohaaded PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 if (MSVC)
 	target_link_options(omohaaded PRIVATE "/MANIFEST:NO")
@@ -92,7 +94,7 @@ endif()
 
 INSTALL(TARGETS omohaaded DESTINATION "./")
 
-if (WITH_CLIENT)
+if (NOT BUILD_NO_CLIENT)
 	## Client app
 
 	add_subdirectory("code/renderer")
@@ -113,7 +115,8 @@ if (WITH_CLIENT)
 
 	### 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}${TARGET_CONFIG_SUFFIX}")
+	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BASE_SUFFIX}${TARGET_ARCH_SUFFIX}")
+	set_target_properties(openmohaa PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 	target_link_libraries(openmohaa PRIVATE jpeg8)
 	if (USE_OPENAL)

README.md

@@ -1,111 +1,198 @@
 # 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)
+
+![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)
+
+
+```
      / _ \ _ __   ___ _ __ |  \/  |/ _ \| | | |  / \      / \
     | | | | '_ \ / _ \ '_ \| |\/| | | | | |_| | / _ \    / _ \
     | |_| | |_) |  __/ | | | |  | | |_| |  _  |/ ___ \  / ___ \
      \___/| .__/ \___|_| |_|_|  |_|\___/|_| |_/_/   \_\/_/   \_\
           |_|
-      
-
-
-## Discord
-
-[![Discord Banner 1](https://discordapp.com/api/guilds/596049712579215361/widget.png?style=banner2)](https://discord.gg/NYtH58R)
+```
 
 ## Current State
 
-[![Build](https://github.com/openmoh/openmohaa/actions/workflows/build-cmake.yml/badge.svg)](https://github.com/openmoh/openmohaa/actions/workflows/build-cmake.yml)
+OpenMoHAA is still under development. The single-player campaign is not yet functional due to AI not being fully stable. But the `training` map can be played from start to end. The current focus is on multiplayer.
 
-OpenMoHAA is still in its early days.
+## Intro
 
-### Server
-
-The server version can successfully be built.
-Some stuff are not working as intended, such as Actor or Vehicle. These systems are both almost fully implemented, but not really in stable state.
-
-Overall the server part and the game module are almost fully implemented, but the stability may vary, there may be some minor bugs and crashes.
-
-### Client
-
-The client version of OpenMoHAA is partially implemented and not stable currently. The cgame module is partially implemented as well, but is compatible with the original MOH:AA game. Credits to **Heavy Metal: F.A.K.K. 2**'s SDK for the cgame module.
-
-Here is the current working state for each part of the engine:
-
-| Part name               | Full | Almost | Half | Early | Bad | Not working | Comment                                                           |
-|-------------------------|------|--------|------|-------|-----|-------------|-------------------------------------------------------------------|
-| Audio                   |      |        |      |       | x   |             | Very basic implementation from Quake III                          |
-| CG Module               |      | x      |      |       |     |             | Missing FX, Marks and decals                                      |
-| Client                  |      |        | x    |       |     |             | Missing GameSpy, server list, binds, map picker, ...              |
-| Collision               | x    |        |      |       |     |             |                                                                   |
-| Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                   |
-| Renderer                |      |        |      | x     |     |             | Missing ghost, marks, sphere lights, sky portal, sun flare, swipe |
-| Server                  |      | x      |      |       |     |             | Probably a few bugs remaining                                     |
-| Server module (fgame)   |      | x      |      |       |     |             | Actor, vehicle, and few gameplay bugs                             |
-| UI                      |      |        |      | x     |     |             | Has core features only (menu, widgets, console, hud, urc loading) |
-
-NOTE: Both client and server version can be compiled to target **Medal of Honor: Spearhead** and **Medal of Honor: Breakthrough**.
+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).
 
 ## Running
 
-Backup existing mohaa files, **cgamex86.dll** and **gamex86.dll** (set their extension to **.bak**)
+Ensure that you download the binaries compatible with your platform.
+
+### Requirements
+
+You may need to install Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170
+
+### Client
 
 a) extract archive to your MOHAA installation directory.
 
 -or-
 
-b) Copy all pak*.pk3 files and the sound/ directory from your **MOHAA/main** directory into openmohaa's 'main' directory.
+b) extract archive somewhere on your hard drive, create a shortcut to openmohaa (or omohaaded), and set the start directory to your MOHAA installation directory.
 
-If you have problems running the game :
+### Server
 
-You may need to install Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from
+Extract the archive to your MOHAA server installation directory. Then proceed like you would do with mohaa server:
 
-https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170
+- `.\omohaaded.exe +exec server.cfg` on Windows
+- `./omohaaded +exec server.cfg` on Linux
+
+Only `omohaaded*` and `game*` binaries are required for the server version, other binaries can be omitted.
+
+### Config file
+
+The config file can be found in different locations depending on the platform:
+
+- `%APPDATA%\openmohaa\<game_name>\configs\omconfig.cfg` on Windows
+- `~/.openmohaa/<game_name>/configs/omconfig.cfg` on Linux
+
+This 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.
+
+### 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:
+
+- `+set com_target_game 1` for Spearhead (mohaas/mohta)
+- `+set com_target_game 2` for Breakthrough (mohaab/mohtt)
+
+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).
+
+With `com_target_game`, OpenMoHAA will support the network protocol accordingly.
 
 You can now start a local OpenMOHAA server or play on a server.
 
+### Playing with bots
+
+OpenMoHAA has a basic bot system that emulates real players. The maximum number of bots is defined by the `sv_maxbots` variable, and the number of initial bots is defined by the `sv_numbots` variable. Bots can also be added or removed using the `addbot` and `removebot` commands.
+
+This feature is a great way to test the gameplay and mods.
+
+## Builds
+
+### Server
+
+The server version can be built successfully, but some features are not functional. For example, the Actor 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      |      |       |     |             | Missing GameSpy, server list, binds, map picker, ...              |
+| Collision               | x    |        |      |       |     |             |                                                                   |
+| Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                   |
+| Renderer                |      | x      |      |       |     |             | Missing ghost, marks, sphere lights, sky portal, sun flare, swipe |
+| Server                  |      | x      |      |       |     |             | Probably a few bugs remaining                                     |
+| Server module (fgame)   |      | x      |      |       |     |             | Actor, and few gameplay bugs                                      |
+| UI                      |      |        | x    |       |     |             | Has core features only (menu, widgets, console, hud, urc loading) |
+
 ## Compiling
 
-OpenMoHAA supports both x86 and x64 architectures, and although the target platform is Windows, it still can be compiled for other platforms, and even other architectures.
+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.
 
-These are the tools required for all platforms :
+The following tools are required for all platforms:
 - CMake >= 3.5
-- Flex and Bison (currently not used)
-- A C++11 compiler is required.
+- Flex (>= 2.6.4) and Bison (>= 3.5.1)
+- A C++11 compiler is also required.
 
-The installation directory can be set to MOHAA directory.
+The installation directory can be set to the MOHAA directory.
 
-The client build can be built by adding `-DWITH_CLIENT=1` to the CMake command line. This will compile the cgame module and the full app with rendering, ui and sound suppport, alongside the dedicated server version.
-
-To compile for either Spearhead or Breakthrough, append `-DTARGET_GAME_TYPE=x` where x can be 1 for Team Assault (Spearhead), and 2 for Team Tactics (Breakthrough). 2 is recommended because Team Tactics can connect to both Spearhead and Breakthrough servers.
+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.
 
 ### Linux
 
-These are the tools required on Unix :
-- Clang >= 3.3 or GCC >= 4.8.1
+These are the tools required on Linux :
+- Clang >= 3.3 or GCC >= 4.8.5
+- libsdl2-dev
 
-**clang-3.5** and **gcc-4.8.5** should work (tested on Ubuntu 16.04). Use the latest possible version of those compilers.
+**clang-3.5** and **gcc-4.8.5** should work (tested on Ubuntu 16.04), but the latest version should be used.
 
-SDL2 library is required (libsdl2-dev).
+Ubuntu 20.04 is the minimum version required to fully compile the project successfully.
 
-1 line install command with latest clang version : `sudo apt-get install -y ninja-build cmake make clang-15 lld-15 flex bison libsdl2-dev`
+1 line install command with clang:
+```sh
+sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev
+```
 
-Example with **CMake**, **clang-15** and **ninja-build** installed:
+Example with **CMake** and **ninja-build** installed:
 ```sh
 mkdir .cmake && cd .cmake
-cmake -DCMAKE_C_COMPILER=clang-15 -DCMAKE_CXX_COMPILER=clang++-15 -DWITH_CLIENT=1 -G Ninja
+cmake -G Ninja ../
 ```
 
+Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compiler -DCMAKE_CXX_COMPILER=path/to/compiler` to the CMake command-line.
+
 ### Windows
 
 Visual Studio (2019 or 2022) is generally preferred.
 
+Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/tag/v2.5.25
+
+Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe` to the CMake command-line to use the package from the link above.
+
 ## Screenshots
 
-|                                                                     |                                                                           |
-|---------------------------------------------------------------------|---------------------------------------------------------------------------|
-| ![](docs/images/opm_53_tt_1.png "Playing on a Breakthrough server") | ![](docs/images/opm_50b_1.png)                                            |
-| ![](docs/images/opm_50b_2.png)                                      | ![](docs/images/opm-arm_53_tt_1.png "OpenMoHAA on Raspberry")             |
+|                                                                                   |                                                                            |
+|-----------------------------------------------------------------------------------|----------------------------------------------------------------------------|
+| ![](docs/images/v0.60.0-x86_64/mohdm1_1.png)                                      | ![](docs/images/v0.60.0-x86_64/training_1.png)                               |
+| ![](docs/images/v0.60.0-x86_64/flughafen_1.png)                                   | ![](docs/images/v0.60.0-x86_64/flughafen_2.png)                            |
+| ![](docs/images/v0.60.0-x86_64/mohdm2_1.png "Playing Freeze-Tag mode with bots")  | ![](docs/images/v0.60.0-x86_64/training_3.png "Single-Player training")    |
 
+*More screenshots [here](docs/images)*
+
+## Features
+
+### Features added and not present in MOH:AA
+
+#### Server-side
+
+- Bots
+- Spectate players in first-person
+- Demo recording
+- More script commands for mods
+- Non-PVS optimization
+
+##### Non-PVS optimization
+
+For each client, the server optimizes by only sending them information about other players that they can see. Clients won't see other players they can't see.
+
+Enable this feature with `set sv_netoptimize 2`.
+
+#### Client-side and server-side
+
+- Security fixes and features from ioquake3
+- IPv6 support (from ioquake3)
+
+### Objectives / planned features
+
+This is a non-exhaustive list of objectives and planned features.
+
+#### Server-side
+
+- 100% compatibility with mohaa content
+- More feature for mods
+- Anticheat
+- Stats system
+- Multiple roles/abilities for server admins to reduce password-stealing
 
 ## Third party
 
@@ -113,20 +200,14 @@ Visual Studio (2019 or 2022) is generally preferred.
 
 http://www.libsdl.org/
 
-download Source code, compile
-
 ### OpenAL
 
-https://www.openal.org/ download OpenAL soft source
-
-run cmake on OpenAL, compile
+https://www.openal.org/
 
 ### LibMAD
 
 http://www.underbit.com/products/mad/
 
-download source code, compile
-
 ### cURL
 
 https://curl.se/
@@ -143,8 +224,14 @@ https://xiph.org/vorbis/
 
 https://opus-codec.org/
 
-## URLs and communities
+## Communities
+
+### URLs
 
 - https://github.com/openmoh/openmohaa/
 - https://mohaaaa.co.uk/AAAAMOHAA/index.php
 - https://x-null.net/
+
+### Discord
+
+[![Discord Banner 1](https://discordapp.com/api/guilds/596049712579215361/widget.png?style=banner2)](https://discord.gg/NYtH58R)

TODO.TXT

@@ -1,25 +0,0 @@
-//// //// //// //// ////
-/// OpenMoHAA - TODO ///
-//// //// //// //// ////
-
-================
-= Server code  =
-================
-1) Fix some crashes
-
-================
-=    Client    =
-================
-2) Better client/sound implementation
-3) Better renderer implementation (light, fog)
-4) Better cgame implementation (using FAKK2)
-5) UI implementation (unfortunately, the mohaa UI is fully based on FAKK 2 sources but isn't available anywhere)
-
-================
-=  Game code   =
-================
-6) Finish the vehicle implementation
---- Open Beta ---
-7) Actors/SinglePlayer
-8) SH/BT features (there are not much things to implement I guess)
---- Release ---

TargetArch.cmake

@@ -1,36 +1,44 @@
 set(archdetect_c_code "
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-#error cmake_ARCH x86
+#  error cmake_ARCH x86
 #elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
-#error cmake_ARCH x86_64
+#  error cmake_ARCH x86_64
 #elif defined(__ppc64__) || defined(__powerpc64__)
-#error cmake_ARCH ppc64
+#  error cmake_ARCH ppc64
 #elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__)
-#error cmake_ARCH ppc
+#  error cmake_ARCH ppc
 #elif defined __s390__
-#error cmake_ARCH s390
+#  error cmake_ARCH s390
 #elif defined __s390x__
-#error cmake_ARCH s390x
+#  error cmake_ARCH s390x
 #elif defined __ia64__
-#error cmake_ARCH ia64
+#  error cmake_ARCH ia64
+#elif defined __e2k__
+#  error cmake_ARCH e2k
 #elif defined __alpha__
-#error cmake_ARCH alpha
+#  error cmake_ARCH alpha
 #elif defined __sparc__
-#error cmake_ARCH sparc
+#  error cmake_ARCH sparc
 #elif defined __arm__ || defined (_M_ARM)
-#error cmake_ARCH arm
+#  error cmake_ARCH arm
 #elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
-#error cmake_ARCH aarch64
+#  error cmake_ARCH aarch64
 #elif defined __cris__
-#error cmake_ARCH cris
+#  error cmake_ARCH cris
 #elif defined __hppa__
-#error cmake_ARCH hppa
+#  error cmake_ARCH hppa
 #elif defined __mips__
-#error cmake_ARCH mips
+#  error cmake_ARCH mips
 #elif defined __sh__
-#error cmake_ARCH sh
+#  error cmake_ARCH sh
+#elif defined __riscv
+#  if __UINTPTR_MAX__ == __UINT64_MAX__
+#    error cmake_ARCH riscv64
+#  else
+#    error cmake_ARCH riscv
+#  endif
 #else
-#error cmake_ARCH unknown
+#  error cmake_ARCH unknown
 #endif
 
 ")

code/cgame/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(fgame)
+project(cgame)
 
 # Shared source files for modules
 set(SOURCES_SHARED
@@ -18,23 +18,23 @@ set(SOURCES_SHARED
 	"../script/scriptvariable.cpp"
 )
 
-file(GLOB_RECURSE SOURCES_BG "../fgame/bg_*.cpp")
+file(GLOB_RECURSE SOURCES_BG "../fgame/bg_misc.cpp" "../fgame/bg_pmove.cpp" "../fgame/bg_slidemove.cpp" "../fgame/bg_voteoptions.cpp")
 file(GLOB_RECURSE SOURCES_CGAME "./*.c" "./*.cpp")
 
 add_library(cgame SHARED ${SOURCES_CGAME} ${SOURCES_BG})
-target_compile_definitions(cgame PRIVATE CGAME_DLL TARGET_GAME_TYPE=${TARGET_GAME_TYPE})
+target_compile_definitions(cgame PRIVATE CGAME_DLL)
 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}${TARGET_CONFIG_SUFFIX}")
+set_target_properties(cgame PROPERTIES OUTPUT_NAME "cgame${TARGET_ARCH_SUFFIX}")
 set_target_properties(cgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
 
 INSTALL(
 	TARGETS cgame
-	DESTINATION "${TARGET_BASE_GAME}"
-	ARCHIVE EXCLUDE_FROM_ALL
+	LIBRARY DESTINATION "${TARGET_BASE_GAME}"
+	RUNTIME DESTINATION "${TARGET_BASE_GAME}"
 )
 
 if(MSVC)

code/cgame/cg_archive.cpp

@@ -0,0 +1,196 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cg_local.h"
+#include "cg_archive.h"
+#include "cg_commands.h"
+#include "memarchiver.h"
+#include "../qcommon/tiki.h"
+
+void CG_ArchiveStuff(MemArchiver& archiver, int svsTime)
+{
+	archiver.SetBaseTime(svsTime);
+	commandManager.ArchiveToMemory(archiver);
+	CG_ArchiveVSSGlobals(archiver);
+}
+
+size_t CG_SaveStateToBuffer(void** out, int svsTime)
+{
+	MemArchiver archiver;
+	size_t size;
+
+	archiver.SetupForWriting(0x200000);
+	CG_ArchiveStuff(archiver, svsTime);
+	size = archiver.BufferSize();
+	if (size && out) {
+		*out = archiver.ConfiscateBuffer();
+	}
+
+	return size;
+}
+
+qboolean CG_LoadStateToBuffer(void* state, size_t size, int svsTime)
+{
+	MemArchiver archiver;
+
+	archiver.SetupForReading((byte*)state, size);
+	CG_ArchiveStuff(archiver, svsTime);
+
+	return archiver.FinishedReading();
+}
+
+void CG_ArchiveStringContainer(MemArchiver& archiver, Container<str>* container)
+{
+    int num;
+    int i;
+
+	if (archiver.IsReading()) {
+		str tmp;
+
+		archiver.ArchiveInteger(&num);
+		container->ClearObjectList();
+
+		for (i = 0; i < num; i++) {
+			archiver.ArchiveString(&tmp);
+			container->AddObject(tmp);
+		}
+	} else {
+        num = container->NumObjects();
+        archiver.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+			str& tmp = container->ObjectAt(i + 1);
+			archiver.ArchiveString(&tmp);
+		}
+	}
+}
+
+void CG_ArchiveTikiPointer(MemArchiver& archiver, dtiki_t** pTiki)
+{
+    str tmp;
+
+	if (archiver.IsReading()) {
+		archiver.ArchiveString(&tmp);
+		if (tmp.length()) {
+			*pTiki = cgi.R_Model_GetHandle(cgi.R_RegisterModel(tmp.c_str()));
+		} else {
+			*pTiki = NULL;
+		}
+	} else {
+		if (*pTiki) {
+			tmp = (*pTiki)->name;
+		}
+
+		archiver.ArchiveString(&tmp);
+	}
+}
+
+void CG_ArchiveModelHandle(MemArchiver& archiver, qhandle_t* handle)
+{
+    str tmp;
+
+	if (archiver.IsReading()) {
+		archiver.ArchiveString(&tmp);
+		if (tmp.length()) {
+			*handle = cgi.R_RegisterModel(tmp.c_str());
+		} else {
+			*handle = NULL;
+		}
+	} else {
+		if (*handle) {
+			tmp = cgi.R_GetModelName(*handle);
+		} else {
+			tmp = "";
+		}
+
+		archiver.ArchiveString(&tmp);
+	}
+}
+
+void CG_ArchiveShaderHandle(MemArchiver& archiver, qhandle_t* handle)
+{
+    str tmp;
+
+	if (archiver.IsReading()) {
+		archiver.ArchiveString(&tmp);
+		if (tmp.length()) {
+			*handle = cgi.R_RegisterShader(tmp.c_str());
+		} else {
+			*handle = NULL;
+		}
+	} else {
+		if (*handle) {
+			tmp = cgi.R_GetShaderName(*handle);
+		} else {
+			tmp = "";
+		}
+
+		archiver.ArchiveString(&tmp);
+	}
+}
+
+void CG_ArchiveRefEntity(MemArchiver& archiver, refEntity_t* ref)
+{
+    archiver.ArchiveRaw(&ref->reType, sizeof(ref->reType));
+    archiver.ArchiveInteger(&ref->renderfx);
+
+    CG_ArchiveModelHandle(archiver, &ref->hModel);
+    CG_ArchiveModelHandle(archiver, &ref->hOldModel);
+
+    archiver.ArchiveVec3(ref->lightingOrigin);
+    archiver.ArchiveInteger(&ref->parentEntity);
+    archiver.ArchiveVec3(ref->axis[0]);
+    archiver.ArchiveVec3(ref->axis[1]);
+    archiver.ArchiveVec3(ref->axis[2]);
+    archiver.ArchiveBoolean(&ref->nonNormalizedAxes);
+    archiver.ArchiveVec3(ref->origin);
+    archiver.ArchiveRaw(ref->frameInfo, 192);
+    archiver.ArchiveFloat(&ref->actionWeight);
+    archiver.ArchiveShort(&ref->wasframe);
+    archiver.ArchiveFloat(&ref->scale);
+    archiver.ArchiveVec3(ref->oldorigin);
+    archiver.ArchiveInteger(&ref->skinNum);
+
+    CG_ArchiveShaderHandle(archiver, &ref->customShader);
+    archiver.ArchiveRaw(ref->shaderRGBA, 4);
+    archiver.ArchiveFloat(ref->shaderTexCoord);
+    archiver.ArchiveFloat(&ref->shaderTexCoord[1]);
+    archiver.ArchiveFloat(&ref->shaderTime);
+
+    archiver.ArchiveInteger(&ref->entityNumber);
+    archiver.ArchiveRaw(ref->surfaces, 32);
+    archiver.ArchiveFloat(ref->shader_data);
+    archiver.ArchiveFloat(&ref->shader_data[1]);
+
+    ref->bone_tag = NULL;
+    ref->bone_quat = NULL;
+    ref->of = NULL;
+    ref->nf = NULL;
+
+    CG_ArchiveTikiPointer(archiver, &ref->tiki);
+
+    archiver.ArchiveInteger(&ref->bonestart);
+    archiver.ArchiveInteger(&ref->morphstart);
+    archiver.ArchiveBoolean(&ref->hasMorph);
+    archiver.ArchiveFloat(&ref->radius);
+    archiver.ArchiveFloat(&ref->rotation);
+}

code/cgame/cg_archive.h

@@ -0,0 +1,53 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// DESCRIPTION:
+// Memory archiver
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include "../qcommon/container.h"
+#include "../qcommon/str.h"
+
+class MemArchiver;
+
+extern "C" {
+#endif
+
+size_t CG_SaveStateToBuffer(void** out, int svsTime);
+qboolean CG_LoadStateToBuffer(void* state, size_t size, int svsTime);
+
+#ifdef __cplusplus
+void CG_ArchiveStuff(MemArchiver& archiver, int svsTime);
+void CG_ArchiveStringContainer(MemArchiver& archiver, Container<str>* container);
+void CG_ArchiveTikiPointer(MemArchiver& archiver, dtiki_t** pTiki);
+void CG_ArchiveModelHandle(MemArchiver& archiver, qhandle_t* handle);
+void CG_ArchiveShaderHandle(MemArchiver& archiver, qhandle_t* handle);
+void CG_ArchiveRefEntity(MemArchiver& archiver, refEntity_t* ref);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif

code/cgame/cg_consolecmds.c

@@ -61,22 +61,25 @@ Debugging command to print the current position
 */
 static void CG_Viewpos_f(void)
 {
-    cgi.Printf("(%i %i %i) : %i\n", (int)cg.refdef.vieworg[0],
-               (int)cg.refdef.vieworg[1], (int)cg.refdef.vieworg[2],
-               (int)cg.refdefViewAngles[YAW]);
+    cgi.Printf(
+        "(%i %i %i) : %i\n",
+        (int)cg.refdef.vieworg[0],
+        (int)cg.refdef.vieworg[1],
+        (int)cg.refdef.vieworg[2],
+        (int)cg.refdefViewAngles[YAW]
+    );
 }
 
 void CG_SetDesiredObjectiveAlpha(float fAlpha)
 {
     cg.ObjectivesDesiredAlpha = fAlpha;
-    cg.ObjectivesAlphaTime = (float)(cg.time + 250);
-    cg.ObjectivesBaseAlpha = cg.ObjectivesCurrentAlpha;
+    cg.ObjectivesAlphaTime    = (float)(cg.time + 250);
+    cg.ObjectivesBaseAlpha    = cg.ObjectivesCurrentAlpha;
 }
 
-void CG_ScoresDown_f( void )
+void CG_ScoresDown_f(void)
 {
-    if (cgs.gametype == GT_SINGLE_PLAYER)
-    {
+    if (cgs.gametype == GT_SINGLE_PLAYER) {
         if (!cg.scoresRequestTime) {
             cg.scoresRequestTime = cg.time;
             CG_SetDesiredObjectiveAlpha(1.0f);
@@ -85,33 +88,30 @@ void CG_ScoresDown_f( void )
         return;
     }
 
-	if ( cg.scoresRequestTime + 2000 >= cg.time )
-    {
+    if (cg.scoresRequestTime + 2000 >= cg.time) {
         // send another request
         cg.showScores = qtrue;
         CG_PrepScoreBoardInfo();
         cgi.UI_ShowScoreBoard(cg.scoresMenuName);
-		return;
-	}
-    
-    cg.scoresRequestTime = cg.time;
-	cgi.SendClientCommand( "score" );
+        return;
+    }
 
-	if ( !cg.showScores ) {
-		// don't display anything until first score returns
-		cg.showScores = qtrue;
+    cg.scoresRequestTime = cg.time;
+    cgi.SendClientCommand("score");
+
+    if (!cg.showScores) {
+        // don't display anything until first score returns
+        cg.showScores = qtrue;
         CG_PrepScoreBoardInfo();
         cgi.UI_ShowScoreBoard(cg.scoresMenuName);
-	}
+    }
 }
 
-void CG_ScoresUp_f( void )
+void CG_ScoresUp_f(void)
 {
-    if (cgs.gametype == GT_SINGLE_PLAYER)
-    {
-        if (!cg.scoresRequestTime)
-        {
-            cg.scoresRequestTime = cg.time;
+    if (cgs.gametype == GT_SINGLE_PLAYER) {
+        if (cg.scoresRequestTime) {
+            cg.scoresRequestTime = 0;
             CG_SetDesiredObjectiveAlpha(0.0f);
         }
 
@@ -126,12 +126,12 @@ void CG_ScoresUp_f( void )
     cgi.UI_HideScoreBoard();
 }
 
-baseshader_t* CG_GetShaderUnderCrosshair(qboolean bVerbose, trace_t* pRetTrace)
+baseshader_t *CG_GetShaderUnderCrosshair(qboolean bVerbose, trace_t *pRetTrace)
 {
-    vec3_t vPos, vEnd;
-    vec3_t axis[3];
-    baseshader_t* pShader;
-    trace_t trace;
+    vec3_t        vPos, vEnd;
+    vec3_t        axis[3];
+    baseshader_t *pShader;
+    trace_t       trace;
 
     AnglesToAxis(cg.refdefViewAngles, axis);
     vPos[0] = cg.refdef.vieworg[0];
@@ -140,18 +140,13 @@ baseshader_t* CG_GetShaderUnderCrosshair(qboolean bVerbose, trace_t* pRetTrace)
     VectorMA(vPos, 4096.0, axis[0], vEnd);
 
     CG_Trace(&trace, vPos, vec3_origin, vec3_origin, vEnd, 0, MASK_SHOT, 0, 0, "CG_GetShaderUnderCrosshair");
-    
+
     if (trace.startsolid || trace.fraction == 1.0) {
         return NULL;
     }
 
-    if (bVerbose)
-    {
-        cgi.Printf(
-            "Surface hit at (%i %i %i)\n",
-            (int)trace.endpos[0],
-            (int)trace.endpos[1],
-            (int)trace.endpos[2]);
+    if (bVerbose) {
+        cgi.Printf("Surface hit at (%i %i %i)\n", (int)trace.endpos[0], (int)trace.endpos[1], (int)trace.endpos[2]);
     }
 
     pShader = cgi.GetShader(trace.shaderNum);
@@ -179,19 +174,15 @@ static void CG_PrintSurfaceType(int iSurfType)
 
 void CG_GetCHShader(void)
 {
-    trace_t trace;
-    baseshader_t* pShader;
+    trace_t       trace;
+    baseshader_t *pShader;
 
     pShader = CG_GetShaderUnderCrosshair(qtrue, &trace);
     cgi.Printf("\n");
-    if (pShader)
-    {
-        if (pShader->surfaceFlags & SURF_SKY)
-        {
+    if (pShader) {
+        if (pShader->surfaceFlags & SURF_SKY) {
             cgi.Printf("Hit the sky\n");
-        }
-        else
-        {
+        } else {
             cgi.Printf("Shader: %s\n", pShader->shader);
             cgi.Printf("Shader Contents:");
             CG_PrintContentTypes(pShader->contentFlags);
@@ -212,28 +203,23 @@ void CG_GetCHShader(void)
             CG_PrintSurfaceType(trace.surfaceFlags);
             cgi.Printf("\n\n");
         }
-    }
-    else
-    {
+    } else {
         cgi.Printf("No surface selected\n");
     }
 }
 
 void CG_EditCHShader(void)
 {
-    char name[1024];
-    baseshader_t* pShader;
+    char          name[1024];
+    baseshader_t *pShader;
 
     pShader = CG_GetShaderUnderCrosshair(qfalse, NULL);
-    if (pShader)
-    {
+    if (pShader) {
         strcpy(name, "editspecificshader ");
         strcat(name, pShader->shader);
         strcat(name, "\n");
         cgi.AddCommand(name);
-    }
-    else
-    {
+    } else {
         cgi.Printf("No surface selected\n");
     }
 }
@@ -348,61 +334,61 @@ void CG_AddTestModel (void) {
 #endif
 
 typedef struct {
-    char* cmd;
+    char *cmd;
     void (*function)(void);
 } 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},
 };
 
 /*
@@ -415,8 +401,8 @@ Cmd_Argc() / Cmd_Argv()
 */
 qboolean CG_ConsoleCommand(void)
 {
-    const char* cmd;
-    int i;
+    const char *cmd;
+    int         i;
 
     cmd = cgi.Argv(0);
 
@@ -475,7 +461,7 @@ void CG_PushMenuTeamSelect_f(void)
     default:
         cgi.Cmd_Execute(EXEC_NOW, "pushmenu SelectTeam\n");
         break;
-	}
+    }
 }
 
 void CG_PushMenuWeaponSelect_f(void)
@@ -489,7 +475,7 @@ void CG_PushMenuWeaponSelect_f(void)
 
 void CG_UseWeaponClass_f(void)
 {
-    const char* cmd;
+    const char *cmd;
 
     cmd = cgi.Argv(1);
 
@@ -520,37 +506,37 @@ void CG_UseWeaponClass_f(void)
 
 void CG_NextWeapon_f(void)
 {
-    cg.iWeaponCommand = WEAPON_COMMAND_USE_NEXT_WEAPON;
+    cg.iWeaponCommand     = WEAPON_COMMAND_USE_NEXT_WEAPON;
     cg.iWeaponCommandSend = 0;
 }
 
 void CG_PrevWeapon_f(void)
 {
-    cg.iWeaponCommand = WEAPON_COMMAND_USE_PREV_WEAPON;
+    cg.iWeaponCommand     = WEAPON_COMMAND_USE_PREV_WEAPON;
     cg.iWeaponCommandSend = 0;
 }
 
 void CG_UseLastWeapon_f(void)
 {
-    cg.iWeaponCommand = WEAPON_COMMAND_USE_LAST_WEAPON;
+    cg.iWeaponCommand     = WEAPON_COMMAND_USE_LAST_WEAPON;
     cg.iWeaponCommandSend = 0;
 }
 
 void CG_HolsterWeapon_f(void)
 {
-    cg.iWeaponCommand = WEAPON_COMMAND_HOLSTER;
+    cg.iWeaponCommand     = WEAPON_COMMAND_HOLSTER;
     cg.iWeaponCommandSend = 0;
 }
 
 void CG_DropWeapon_f(void)
 {
-    cg.iWeaponCommand = WEAPON_COMMAND_DROP;
+    cg.iWeaponCommand     = WEAPON_COMMAND_DROP;
     cg.iWeaponCommandSend = 0;
 }
 
 void CG_ToggleItem_f(void)
 {
-    cg.iWeaponCommand = WEAPON_COMMAND_USE_ITEM1;
+    cg.iWeaponCommand     = WEAPON_COMMAND_USE_ITEM1;
     cg.iWeaponCommandSend = 0;
 }
 
@@ -562,7 +548,7 @@ int CG_WeaponCommandButtonBits(void)
         return 0;
     }
 
-	iShiftedWeaponCommand = cg.iWeaponCommand << 7;
+    iShiftedWeaponCommand = cg.iWeaponCommand << 7;
 
     cg.iWeaponCommandSend++;
     if (cg.iWeaponCommandSend > 2) {

code/cgame/cg_ents.c

@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // cg_ents.c -- present snapshot entities, happens every single frame
 
 #include "cg_local.h"
+#include "cg_radar.h"
 
 /*
 ==========================================================================
@@ -37,48 +38,42 @@ FUNCTIONS CALLED EACH FRAME
 CG_SetEntitySoundPosition
 ======================
 */
-void CG_SetEntitySoundPosition( centity_t *cent )
-   {
-	vec3_t	origin;
+void CG_SetEntitySoundPosition(centity_t *cent)
+{
+    vec3_t origin;
 
-	if ( cent->currentState.solid == SOLID_BMODEL )
-      {
-		float  *v;
-		vec3_t vel;
+    if (cent->currentState.solid == SOLID_BMODEL) {
+        float *v;
+        vec3_t vel;
 
-		v = cgs.inlineModelMidpoints[ cent->currentState.modelindex ];
-		VectorAdd( cent->lerpOrigin, v, origin );
+        v = cgs.inlineModelMidpoints[cent->currentState.modelindex];
+        VectorAdd(cent->lerpOrigin, v, origin);
 
-		vel[0] = 0.0;
-		vel[1] = 0.0;
-		vel[2] = 0.0;
+        vel[0] = 0.0;
+        vel[1] = 0.0;
+        vel[2] = 0.0;
 
-   	cgi.S_UpdateEntity( cent->currentState.number, origin, vel, qfalse );
-	   } 
-   else
-      {
-		if ( cent && cg.snap && cent->currentState.parent == cg.snap->ps.clientNum )
-			{
-			vec3_t origin;
-			vec3_t velocity;
+        cgi.S_UpdateEntity(cent->currentState.number, origin, vel, qfalse);
+    } else {
+        if (cent && cg.snap && cent->currentState.parent == cg.snap->ps.clientNum) {
+            vec3_t origin;
+            vec3_t velocity;
 
-			origin[0] = 0;
-			origin[1] = 0;
-			origin[2] = 0;
+            origin[0] = 0;
+            origin[1] = 0;
+            origin[2] = 0;
 
-			velocity[0] = 0;
-			velocity[1] = 0;
-			velocity[2] = 0;
+            velocity[0] = 0;
+            velocity[1] = 0;
+            velocity[2] = 0;
 
-			cgi.S_UpdateEntity( cent->currentState.number, origin, velocity, qtrue );
-			}
-		else
-			{
-			CG_GetOrigin( cent, origin );
-			cgi.S_UpdateEntity( cent->currentState.number, origin, cent->currentState.pos.trDelta, qfalse );
-			}
-	   }
-   }
+            cgi.S_UpdateEntity(cent->currentState.number, origin, velocity, qtrue);
+        } else {
+            CG_GetOrigin(cent, origin);
+            cgi.S_UpdateEntity(cent->currentState.number, origin, cent->currentState.pos.trDelta, qfalse);
+        }
+    }
+}
 
 /*
 ==================
@@ -87,165 +82,173 @@ CG_EntityEffects
 Add continuous entity effects, like local entity emission and lighting
 ==================
 */
-void CG_EntityEffects( centity_t *cent )
-   {
-   // initialize with the client colors
-   cent->color[ 0 ] = cent->client_color[ 0 ];
-   cent->color[ 1 ] = cent->client_color[ 1 ];
-   cent->color[ 2 ] = cent->client_color[ 2 ];
-   cent->color[ 3 ] = cent->client_color[ 3 ];
+void CG_EntityEffects(centity_t *cent)
+{
+    // initialize with the client colors
+    cent->color[0] = cent->client_color[0];
+    cent->color[1] = cent->client_color[1];
+    cent->color[2] = cent->client_color[2];
+    cent->color[3] = cent->client_color[3];
 
-	if ( cent->currentState.constantLight != 0xffffff )
-      {
-		int		style;
-      unsigned cl;
-		float		i, r, g, b;
+    if (cent->currentState.constantLight != 0xffffff) {
+        int      style;
+        unsigned cl;
+        float    i, r, g, b;
 
-		cl = cent->currentState.constantLight;
-      style = ( cl & 255 );
-		r = ( float )style / 255.0f;
-		g = ( float )( ( cl >> 8 ) & 255 ) / 255.0f;
-		b = ( float )( ( cl >> 16 ) & 255 ) / 255.0f;
-		i = ( ( cl >> 24 ) & 255 ) * CONSTANTLIGHT_RADIUS_SCALE;
-      if ( cent->currentState.renderfx & RF_LIGHTSTYLE_DLIGHT )
-         {
-         float color[ 4 ];
+        cl    = cent->currentState.constantLight;
+        style = (cl & 255);
+        r     = (float)style / 255.0f;
+        g     = (float)((cl >> 8) & 255) / 255.0f;
+        b     = (float)((cl >> 16) & 255) / 255.0f;
+        i     = ((cl >> 24) & 255) * CONSTANTLIGHT_RADIUS_SCALE;
+        if (cent->currentState.renderfx & RF_LIGHTSTYLE_DLIGHT) {
+            float color[4];
 
-         CG_LightStyleColor( style, cg.time, color, qfalse );
-         r = color[ 0 ];
-         g = color[ 1 ];
-         b = color[ 2 ];
-         i *= color[ 3 ];
-         }
-      if ( i )
-         {
-         int flags;
+            CG_LightStyleColor(style, cg.time, color, qfalse);
+            r = color[0];
+            g = color[1];
+            b = color[2];
+            i *= color[3];
+        }
+        if (i) {
+            int flags;
 
-         flags = 0;
-         if ( cent->currentState.renderfx & RF_LENSFLARE )
-            {
-            flags |= lensflare;
+            flags = 0;
+            if (cent->currentState.renderfx & RF_LENSFLARE) {
+                flags |= lensflare;
+            } else if (cent->currentState.renderfx & RF_VIEWLENSFLARE) {
+                flags |= viewlensflare;
             }
-         else if ( cent->currentState.renderfx & RF_VIEWLENSFLARE )
-            {
-            flags |= viewlensflare;
+            if (cent->currentState.renderfx & RF_ADDITIVE_DLIGHT) {
+                flags |= additive;
             }
-         if ( cent->currentState.renderfx & RF_ADDITIVE_DLIGHT )
-            {
-            flags |= additive;
-            }
-         cgi.R_AddLightToScene( cent->lerpOrigin, i, r, g, b, flags );
-         }
-      if ( r < cent->color[ 0 ] )
-         cent->color[ 0 ] = r;
-      if ( g < cent->color[ 1 ] )
-         cent->color[ 1 ] = g;
-      if ( b < cent->color[ 2 ] )
-         cent->color[ 2 ] = b;
-	   }
-   }
+            cgi.R_AddLightToScene(cent->lerpOrigin, i, r, g, b, flags);
+        }
+        if (r < cent->color[0]) {
+            cent->color[0] = r;
+        }
+        if (g < cent->color[1]) {
+            cent->color[1] = g;
+        }
+        if (b < cent->color[2]) {
+            cent->color[2] = b;
+        }
+    }
+}
 
 /*
 ==================
 CG_General
 ==================
 */
-void CG_General( centity_t *cent ) {
-	refEntity_t			ent;
-	entityState_t		*s1;
-   int i;
-   vec3_t vMins, vMaxs, vTmp;
+void CG_General(centity_t *cent)
+{
+    refEntity_t    ent;
+    entityState_t *s1;
+    int            i;
+    vec3_t         vMins, vMaxs, vTmp;
 
-	s1 = &cent->currentState;
+    s1 = &cent->currentState;
 
-   // add loop sound
-   if ( s1->loopSound )
-      {
-      cgi.S_AddLoopingSound( cent->lerpOrigin, vec3_origin, cgs.sound_precache[s1->loopSound], s1->loopSoundVolume, s1->loopSoundMinDist, s1->loopSoundMaxDist, s1->loopSoundPitch, s1->loopSoundFlags );
-      }
-   if ( cent->tikiLoopSound )
-      cgi.S_AddLoopingSound( cent->lerpOrigin, vec3_origin, cent->tikiLoopSound, cent->tikiLoopSoundVolume, cent->tikiLoopSoundMinDist, cent->tikiLoopSoundMaxDist, cent->tikiLoopSoundPitch, cent->tikiLoopSoundFlags );
+    // add loop sound
+    if (s1->loopSound) {
+        cgi.S_AddLoopingSound(
+            cent->lerpOrigin,
+            vec3_origin,
+            cgs.sound_precache[s1->loopSound],
+            s1->loopSoundVolume,
+            s1->loopSoundMinDist,
+            s1->loopSoundMaxDist,
+            s1->loopSoundPitch,
+            s1->loopSoundFlags
+        );
+    }
+    if (cent->tikiLoopSound) {
+        cgi.S_AddLoopingSound(
+            cent->lerpOrigin,
+            vec3_origin,
+            cent->tikiLoopSound,
+            cent->tikiLoopSoundVolume,
+            cent->tikiLoopSoundMinDist,
+            cent->tikiLoopSoundMaxDist,
+            cent->tikiLoopSoundPitch,
+            cent->tikiLoopSoundFlags
+        );
+    }
 
-	// if set to invisible, skip
-	if (!s1->modelindex) {
-		return;
-	}
+    if (s1->renderfx & RF_SKYORIGIN) {
+        AnglesToAxis(cent->lerpAngles, cg.sky_axis);
+        VectorCopy(cent->lerpOrigin, cg.sky_origin);
+    }
 
-	memset (&ent, 0, sizeof(ent));
+    // if set to invisible, skip
+    if (!s1->modelindex) {
+        return;
+    }
 
-	// set frame
+    if (s1->renderfx & RF_DONTDRAW) {
+        return;
+    }
 
-	ent.wasframe = s1->wasframe;
+    memset(&ent, 0, sizeof(ent));
 
-	VectorCopy( cent->lerpOrigin, ent.origin);
-	VectorCopy( cent->lerpOrigin, ent.oldorigin);
+    // set frame
 
-   // set skin
-	IntegerToBoundingBox(s1->solid, vMins, vMaxs);
-	VectorSubtract(vMins, vMaxs, vTmp);
-    ent.lightingOrigin[0] = ent.origin[0] + (vMins[0] + vMaxs[0]) * 0.5;
-    ent.lightingOrigin[1] = ent.origin[1] + (vMins[1] + vMaxs[1]) * 0.5;
-    ent.lightingOrigin[2] = ent.origin[2] + (vMins[2] + vMaxs[2]) * 0.5;
-	ent.radius = VectorLength(vTmp) * 0.5;
+    ent.wasframe = s1->wasframe;
 
-	ent.skinNum = s1->skinNum;
+    VectorCopy(cent->lerpOrigin, ent.origin);
+    VectorCopy(cent->lerpOrigin, ent.oldorigin);
 
-	ent.hModel = cgs.model_draw[s1->modelindex];
+    // set skin
+    IntegerToBoundingBox(s1->solid, vMins, vMaxs);
+    VectorMA(ent.origin, 0.5f, ent.lightingOrigin, ent.lightingOrigin);
+    VectorSubtract(vMins, vMaxs, vTmp);
+    ent.radius = VectorLength(vTmp) * 0.5;
 
-   // set surfaces
-   memcpy( ent.surfaces, s1->surfaces, MAX_MODEL_SURFACES );
+    ent.skinNum = s1->skinNum;
 
-   // Modulation based off the color
-   for( i=0; i<3; i++ )
-      ent.shaderRGBA[ i ] = cent->color[ i ] * 255;
+    ent.hModel = cgs.model_draw[s1->modelindex];
 
-   // take the alpha from the entity if less than 1, else grab it from the client commands version
-   if ( s1->alpha < 1 )
-      {
-      ent.shaderRGBA[ 3 ] = s1->alpha * 255;
-      }
-   else
-      {
-      ent.shaderRGBA[ 3 ] = cent->color[ 3 ] * 255;
-      }
+    // set surfaces
+    memcpy(ent.surfaces, s1->surfaces, MAX_MODEL_SURFACES);
 
-   // convert angles to axis
-	AnglesToAxis( cent->lerpAngles, ent.axis );
+    // Modulation based off the color
+    for (i = 0; i < 3; i++) {
+        ent.shaderRGBA[i] = cent->color[i] * 255;
+    }
 
-   // Interpolated state variables
-   if ( cent->interpolate )
-      {
-      ent.scale = s1->scale + cg.frameInterpolation * ( cent->nextState.scale - cent->currentState.scale );
-      }
-   else
-      {
-      ent.scale = s1->scale;
-      }
-   // set the entity number
-   ent.entityNumber = s1->number;
+    // take the alpha from the entity if less than 1, else grab it from the client commands version
+    if (s1->alpha < 1) {
+        ent.shaderRGBA[3] = s1->alpha * 255;
+    } else {
+        ent.shaderRGBA[3] = cent->color[3] * 255;
+    }
 
-   // copy shader specific data
-   ent.shader_data[ 0 ] = s1->tag_num;
-   ent.shader_data[ 1 ] = s1->skinNum;
-   ent.renderfx |= s1->renderfx;
+    // convert angles to axis
+    AnglesToAxis(cent->lerpAngles, ent.axis);
 
-   if ( ent.renderfx & RF_SKYORIGIN )
-      {
-      memcpy( cg.sky_axis, ent.axis, sizeof( cg.sky_axis ) );
-      VectorCopy( ent.origin, cg.sky_origin );
-      }
+    // Interpolated state variables
+    if (cent->interpolate) {
+        ent.scale = s1->scale + cg.frameInterpolation * (cent->nextState.scale - cent->currentState.scale);
+    } else {
+        ent.scale = s1->scale;
+    }
+    // set the entity number
+    ent.entityNumber = s1->number;
 
-   ent.tiki = cgi.R_Model_GetHandle(cgs.model_draw[s1->modelindex]);
-   ent.frameInfo[0].index = s1->frameInfo[0].index;
-   ent.frameInfo[0].time = s1->frameInfo[0].time;
-   ent.frameInfo[0].weight = s1->frameInfo[0].weight;
-   ent.actionWeight = 1.0;
+    // copy shader specific data
+    ent.shader_data[0] = s1->tag_num;
+    ent.shader_data[1] = s1->skinNum;
+    ent.renderfx |= s1->renderfx;
 
-	// add to refresh list
-   	cgi.R_AddRefEntityToScene (&ent, ENTITYNUM_NONE);
+    ent.tiki            = cgi.R_Model_GetHandle(cgs.model_draw[s1->modelindex]);
+    ent.frameInfo[0]    = s1->frameInfo[0];
+    ent.actionWeight    = 1.0;
 
-    if (ent.tiki)
-    {
+    // add to refresh list
+    cgi.R_AddRefEntityToScene(&ent, ENTITYNUM_NONE);
+
+    if (ent.tiki) {
         // update any emitter's...
         CG_UpdateEntityEmitters(s1->number, &ent, cent);
     }
@@ -258,58 +261,57 @@ CG_Speaker
 Speaker entities can automatically play sounds
 ==================
 */
-void CG_Speaker( centity_t *cent )
-   {
-	if ( ! cent->currentState.clientNum ) // FIXME: use something other than clientNum...
-      {	
-		return;		// not auto triggering
-	   }
+void CG_Speaker(centity_t *cent)
+{
+    if (!cent->currentState.clientNum) // FIXME: use something other than clientNum...
+    {
+        return; // not auto triggering
+    }
 
-	if ( cg.time < cent->miscTime )
-      {
-		return;
-	   }
-	
-	// FIXME
-   //cgi.S_StartSound (NULL, cent->currentState.number, CHAN_ITEM, cgs.sound_precache[cent->currentState.eventParm] );
+    if (cg.time < cent->miscTime) {
+        return;
+    }
 
-	//	ent->s.frame = ent->wait * 10;
-	//	ent->s.clientNum = ent->random * 10;
-	cent->miscTime = cg.time + cent->currentState.wasframe * 100 + cent->currentState.clientNum * 100 * crandom();
-   }
+    // FIXME
+    //cgi.S_StartSound (NULL, cent->currentState.number, CHAN_ITEM, cgs.sound_precache[cent->currentState.eventParm] );
 
+    //	ent->s.frame = ent->wait * 10;
+    //	ent->s.clientNum = ent->random * 10;
+    cent->miscTime = cg.time + cent->currentState.wasframe * 100 + cent->currentState.clientNum * 100 * crandom();
+}
 
 /*
 ===============
 CG_Mover
 ===============
 */
-void CG_Mover( centity_t *cent ) {
-	refEntity_t			ent;
-	entityState_t		*s1;
+void CG_Mover(centity_t *cent)
+{
+    refEntity_t    ent;
+    entityState_t *s1;
 
-	s1 = &cent->currentState;
+    s1 = &cent->currentState;
 
-	// create the render entity
-	memset (&ent, 0, sizeof(ent));
-	VectorCopy( cent->lerpOrigin, ent.origin);
-	VectorCopy( cent->lerpOrigin, ent.oldorigin);
-	AnglesToAxis( cent->lerpAngles, ent.axis );
+    // create the render entity
+    memset(&ent, 0, sizeof(ent));
+    VectorCopy(cent->lerpOrigin, ent.origin);
+    VectorCopy(cent->lerpOrigin, ent.oldorigin);
+    AnglesToAxis(cent->lerpAngles, ent.axis);
 
-	ent.renderfx &= ~RF_SHADOW;
+    ent.renderfx &= ~RF_SHADOW;
 
-	// flicker between two skins (FIXME?)
-	ent.skinNum = ( cg.time >> 6 ) & 1;
+    // flicker between two skins (FIXME?)
+    ent.skinNum = (cg.time >> 6) & 1;
 
-	// get the model, either as a bmodel or a modelindex
-	if ( s1->solid == SOLID_BMODEL ) {
-		ent.hModel = cgs.inlineDrawModel[s1->modelindex];
-	} else {
-		ent.hModel = cgs.model_draw[s1->modelindex];
-	}
+    // get the model, either as a bmodel or a modelindex
+    if (s1->solid == SOLID_BMODEL) {
+        ent.hModel = cgs.inlineDrawModel[s1->modelindex];
+    } else {
+        ent.hModel = cgs.model_draw[s1->modelindex];
+    }
 
-	// add to refresh list
-	cgi.R_AddRefEntityToScene(&ent, ENTITYNUM_NONE);
+    // add to refresh list
+    cgi.R_AddRefEntityToScene(&ent, ENTITYNUM_NONE);
 }
 
 /*
@@ -317,120 +319,117 @@ void CG_Mover( centity_t *cent ) {
 CG_Beam
 ===============
 */
-void CG_Beam( centity_t *cent ) {
-	entityState_t  *s1;
-   vec3_t         vz={0,0,0},origin={0,0,0};
-   float           modulate[4];
-   int            i;
+void CG_Beam(centity_t *cent)
+{
+    entityState_t *s1;
+    vec3_t         vz = {0, 0, 0}, origin = {0, 0, 0};
+    float          modulate[4];
+    int            i;
 
-	s1 = &cent->currentState;
+    s1 = &cent->currentState;
 
-   for ( i=0;i<4;i++ )
-      modulate[i] = cent->color[i];
+    for (i = 0; i < 4; i++) {
+        modulate[i] = cent->color[i];
+    }
 
-   if ( s1->beam_entnum != ENTITYNUM_NONE )
-      {
-      refEntity_t *parent;
-      parent = cgi.R_GetRenderEntity( s1->beam_entnum);
+    if (s1->beam_entnum != ENTITYNUM_NONE) {
+        refEntity_t *parent;
+        parent = cgi.R_GetRenderEntity(s1->beam_entnum);
 
-      if ( !parent )
-         {
-         cgi.DPrintf( "CG_Beam: Could not find parent entity\n" );
-         return;
-         }
+        if (!parent) {
+            cgi.DPrintf("CG_Beam: Could not find parent entity\n");
+            return;
+        }
 
-      VectorAdd( s1->origin, parent->origin, origin );
-      }
-   else
-      {
-      VectorCopy( s1->origin, origin );
-      }
+        VectorAdd(s1->origin, parent->origin, origin);
+    } else {
+        VectorCopy(s1->origin, origin);
+    }
 
-   CG_CreateBeam( origin,           // start
-                  vz,               // dir ( auto calculated by using origin2-origin )
-                  s1->number,       // owner number
-                  cgs.model_draw[s1->modelindex], //hModel
-                  s1->alpha,        // alpha
-                  s1->scale,        // scale
-                  s1->skinNum,      // flags
-                  0,                // length ( auto calculated )
-                  PKT_TO_BEAM_PARM( s1->surfaces[0] ) * 1000, // life
-                  qfalse,           // don't always create the beam, just update it
-                  s1->origin2,      // endpoint
-                  s1->bone_angles[0][0], // min offset
-                  s1->bone_angles[0][1], // max offset
-                  PKT_TO_BEAM_PARM( s1->surfaces[3] ), // overlap
-                  s1->surfaces[4],   // subdivisions
-                  PKT_TO_BEAM_PARM( s1->surfaces[5] ) * 1000, // delay
-                  CG_ConfigString( CS_IMAGES + s1->tag_num ), // index for shader configstring
-                  modulate,          // modulate color
-                  s1->surfaces[6],   // num sphere beams
-                  PKT_TO_BEAM_PARM( s1->surfaces[7] ),   // sphere radius
-                  PKT_TO_BEAM_PARM( s1->surfaces[8] ),   // toggle delay
-                  PKT_TO_BEAM_PARM( s1->surfaces[9] ),   // end alpha
-                  s1->renderfx,
-                  ""
-                  );   
+    CG_CreateBeam(
+        origin,                                   // start
+        vz,                                       // dir ( auto calculated by using origin2-origin )
+        s1->number,                               // owner number
+        cgs.model_draw[s1->modelindex],           //hModel
+        s1->alpha,                                // alpha
+        s1->scale,                                // scale
+        s1->skinNum,                              // flags
+        0,                                        // length ( auto calculated )
+        PKT_TO_BEAM_PARM(s1->surfaces[0]) * 1000, // life
+        qfalse,                                   // don't always create the beam, just update it
+        s1->origin2,                              // endpoint
+        s1->bone_angles[0][0],                    // min offset
+        s1->bone_angles[0][1],                    // max offset
+        PKT_TO_BEAM_PARM(s1->surfaces[3]),        // overlap
+        s1->surfaces[4],                          // subdivisions
+        PKT_TO_BEAM_PARM(s1->surfaces[5]) * 1000, // delay
+        CG_ConfigString(CS_IMAGES + s1->tag_num), // index for shader configstring
+        modulate,                                 // modulate color
+        s1->surfaces[6],                          // num sphere beams
+        PKT_TO_BEAM_PARM(s1->surfaces[7]),        // sphere radius
+        PKT_TO_BEAM_PARM(s1->surfaces[8]),        // toggle delay
+        PKT_TO_BEAM_PARM(s1->surfaces[9]),        // end alpha
+        s1->renderfx,
+        ""
+    );
 }
 
+void CG_Decal(centity_t *cent)
 
-void CG_Decal
-   (
-   centity_t *cent
-   )
+{
+    qhandle_t      shader;
+    vec3_t         dir;
+    entityState_t *s1;
 
-   {
-   qhandle_t      shader;
-   vec3_t         dir;
-   entityState_t	*s1;
+    s1 = &cent->currentState;
 
-	s1 = &cent->currentState;
-
-   shader = cgi.R_RegisterShader( CG_ConfigString( CS_IMAGES + s1->tag_num ) );
-   ByteToDir( s1->surfaces[0], dir );
-   CG_ImpactMark( shader,
-                  s1->origin,
-                  dir,
-                  s1->angles[2],
-                  cent->color[0],
-                  cent->color[1],
-                  cent->color[2],
-                  cent->color[3],
-                  qtrue,
-                  s1->scale,
-                  qfalse,
-                  -1,
-                  qfalse,
-                  0.f,
-                  0.f);
-   }
+    shader = cgi.R_RegisterShader(CG_ConfigString(CS_IMAGES + s1->tag_num));
+    ByteToDir(s1->surfaces[0], dir);
+    CG_ImpactMark(
+        shader,
+        s1->origin,
+        dir,
+        s1->angles[2],
+        s1->scale,
+        s1->scale,
+        cent->color[0],
+        cent->color[1],
+        cent->color[2],
+        cent->color[3],
+        qtrue,
+        qfalse,
+        qtrue,
+        qfalse,
+        0.5f,
+        0.5f
+    );
+}
 
 /*
 ===============
 CG_Portal
 ===============
 */
-void CG_Portal(centity_t* cent)
-{
-}
+void CG_Portal(centity_t *cent) {}
 
 /*
 ================
 BG_EvaluateTrajectory
 ================
 */
-void BG_EvaluateTrajectory(const trajectory_t* tr, int atTime, const vec3_t base, vec3_t result) {
-	float deltaTime;
+void BG_EvaluateTrajectory(const trajectory_t *tr, int atTime, const vec3_t base, vec3_t result)
+{
+    float deltaTime;
 
-	if (atTime > cg_smoothClientsTime->integer + tr->trTime) {
-		atTime = cg_smoothClientsTime->integer + tr->trTime;
-	}
+    if (atTime > cg_smoothClientsTime->integer + tr->trTime) {
+        atTime = cg_smoothClientsTime->integer + tr->trTime;
+    }
 
-	deltaTime = (float)(atTime - tr->trTime) / 1000.0;
+    deltaTime = (float)(atTime - tr->trTime) / 1000.0;
 
-	result[0] = tr->trDelta[0] * deltaTime + base[0];
-	result[1] = tr->trDelta[1] * deltaTime + base[1];
-	result[2] = tr->trDelta[2] * deltaTime + base[2];
+    result[0] = tr->trDelta[0] * deltaTime + base[0];
+    result[1] = tr->trDelta[1] * deltaTime + base[1];
+    result[2] = tr->trDelta[2] * deltaTime + base[2];
 }
 
 /*
@@ -439,17 +438,15 @@ CG_CalcEntityLerpPositions
 
 ===============
 */
-void CG_CalcEntityLerpPositions( centity_t *cent )
+void CG_CalcEntityLerpPositions(centity_t *cent)
 {
     int   i;
-    float	f;
+    float f;
 
     f = cg.frameInterpolation;
 
-    if (cent->currentState.eType == ET_PLAYER)
-    {
-        if (cent->currentState.number == cg.snap->ps.clientNum)
-        {
+    if (cent->currentState.eType == ET_PLAYER) {
+        if (cent->currentState.number == cg.snap->ps.clientNum) {
             // if the player, take position from prediction
             VectorCopy(cg.predicted_player_state.origin, cent->lerpOrigin);
             for (i = 0; i < 3; i++) {
@@ -471,28 +468,26 @@ void CG_CalcEntityLerpPositions( centity_t *cent )
         }
 
         for (i = 0; i < 3; i++) {
-            cent->lerpOrigin[i] = cent->currentState.origin[i] +
-                f * (cent->nextState.origin[i] - cent->currentState.origin[i]);
+            cent->lerpOrigin[i] =
+                cent->currentState.origin[i] + f * (cent->nextState.origin[i] - cent->currentState.origin[i]);
         }
 
         if (!memcmp(cent->currentState.angles, cent->nextState.angles, sizeof(vec3_t))) {
             VectorCopy(cent->currentState.angles, cent->lerpAngles);
-        }
-        else {
+        } else {
             // use spherical interpolation using quaternions so that bound objects
             // rotate properly without gimble lock.
             SlerpQuaternion(cent->currentState.quat, cent->nextState.quat, f, quat);
             QuatToMat(quat, mat);
             MatrixToEulerAngles(mat, cent->lerpAngles);
         }
-    }
-    else if (cent->interpolate) {
+    } else if (cent->interpolate) {
         float quat[4];
         float mat[3][3];
 
         // if the entity has a valid next state, interpolate a value between the frames
         // unless it is a mover with a known start and stop
-        vec3_t	current, next;
+        vec3_t current, next;
 
         // this will linearize a sine or parabolic curve, but it is important
         // to not extrapolate player positions if more recent data is available
@@ -505,16 +500,14 @@ void CG_CalcEntityLerpPositions( centity_t *cent )
 
         if (!memcmp(cent->currentState.angles, cent->nextState.angles, sizeof(vec3_t))) {
             VectorCopy(cent->currentState.angles, cent->lerpAngles);
-        }
-        else {
+        } else {
             // use spherical interpolation using quaternions so that bound objects
             // rotate properly without gimble lock.
             SlerpQuaternion(cent->currentState.quat, cent->nextState.quat, f, quat);
             QuatToMat(quat, mat);
             MatrixToEulerAngles(mat, cent->lerpAngles);
         }
-    }
-    else {
+    } else {
         // just use the current frame and evaluate as best we can
         BG_EvaluateTrajectory(&cent->currentState.pos, cg.time, cent->currentState.origin, cent->lerpOrigin);
         VectorCopy(cent->currentState.angles, cent->lerpAngles);
@@ -527,7 +520,7 @@ CG_AddCEntity
 
 ===============
 */
-void CG_AddCEntity(centity_t* cent)
+void CG_AddCEntity(centity_t *cent)
 {
     // event-only entities will have been dealt with already
     if (cent->currentState.eType >= ET_EVENTS) {
@@ -558,10 +551,13 @@ void CG_AddCEntity(centity_t* cent)
         CG_ModelAnim(cent, qtrue);
         break;
     case ET_PLAYER:
-		CG_Player(cent);
+        CG_Player(cent);
 		CG_Splash(cent);
-	case ET_ITEM:
 		CG_ModelAnim(cent, qfalse);
+        CG_UpdateRadarClient(cent);
+        break;
+    case ET_ITEM:
+        CG_ModelAnim(cent, qfalse);
         break;
     case ET_GENERAL:
         CG_General(cent);
@@ -588,10 +584,10 @@ void CG_AddCEntity(centity_t* cent)
         break;
     case ET_ROPE: // skip
         CG_Rope(cent);
-		break;
-	case ET_EXEC_COMMANDS:
-		CG_ModelAnim(cent, qfalse);
-		break;
+        break;
+    case ET_EXEC_COMMANDS:
+        CG_ModelAnim(cent, qfalse);
+        break;
     }
 }
 
@@ -601,29 +597,30 @@ CG_AddPacketEntities
 
 ===============
 */
-void CG_AddPacketEntities( void ) {
-	int					num;
-	centity_t			*cent;
-    int child, parent;
-    qboolean processed[MAX_ENTITIES];
-    int i;
+void CG_AddPacketEntities(void)
+{
+    int        num;
+    centity_t *cent;
+    int        child, parent;
+    qboolean   processed[MAX_ENTITIES];
+    int        i;
 
-	// the auto-rotating items will all have the same axis
-	cg.autoAngles[0] = 0;
-	cg.autoAngles[1] = ( cg.time & 2047 ) * 360 / 2048.0;
-	cg.autoAngles[2] = 0;
+    // the auto-rotating items will all have the same axis
+    cg.autoAngles[0] = 0;
+    cg.autoAngles[1] = (cg.time & 2047) * 360 / 2048.0;
+    cg.autoAngles[2] = 0;
 
-	cg.autoAnglesSlow[0] = 0;
-	cg.autoAnglesSlow[1] = ( cg.time & 4095 ) * 360 / 4096.0f;
-	cg.autoAnglesSlow[2] = 0;
+    cg.autoAnglesSlow[0] = 0;
+    cg.autoAnglesSlow[1] = (cg.time & 4095) * 360 / 4096.0f;
+    cg.autoAnglesSlow[2] = 0;
 
-	cg.autoAnglesFast[0] = 0;
-	cg.autoAnglesFast[1] = ( cg.time & 1023 ) * 360 / 1024.0f;
-	cg.autoAnglesFast[2] = 0;
+    cg.autoAnglesFast[0] = 0;
+    cg.autoAnglesFast[1] = (cg.time & 1023) * 360 / 1024.0f;
+    cg.autoAnglesFast[2] = 0;
 
-	AnglesToAxis( cg.autoAngles, cg.autoAxis );
-	AnglesToAxis( cg.autoAnglesSlow, cg.autoAxisSlow );
-	AnglesToAxis( cg.autoAnglesFast, cg.autoAxisFast );
+    AnglesToAxis(cg.autoAngles, cg.autoAxis);
+    AnglesToAxis(cg.autoAnglesSlow, cg.autoAxisSlow);
+    AnglesToAxis(cg.autoAnglesFast, cg.autoAxisFast);
 
     for (i = 0; i < MAX_ENTITIES; i++) {
         processed[i] = qtrue;
@@ -636,51 +633,43 @@ void CG_AddPacketEntities( void ) {
     // add each entity sent over by the server
     for (num = 0; num < cg.snap->numEntities; num++) {
         child = cg.snap->entities[num].number;
-        cent = &cg_entities[child];
+        cent  = &cg_entities[child];
         // add the parent first
         // so attachments are consistent
-        for (parent = cent->currentState.parent;
-            parent != ENTITYNUM_NONE && !processed[parent];
-            parent = cg_entities[parent].currentState.parent)
-        {
+        for (parent = cent->currentState.parent; parent != ENTITYNUM_NONE && !processed[parent];
+             parent = cg_entities[parent].currentState.parent) {
             processed[parent] = qtrue;
             CG_AddCEntity(&cg_entities[parent]);
         }
 
-        if (!processed[child])
-        {
+        if (!processed[child]) {
             // now add the children if not processed
             processed[child] = qtrue;
             CG_AddCEntity(cent);
         }
     }
 
-   // Add in the multibeams at the end
-   for ( num = 0 ; num < cg.snap->numEntities ; num++ ) {
-		cent = &cg_entities[ cg.snap->entities[ num ].number ];
-      if ( cent->currentState.eType == ET_MULTIBEAM )
-         CG_MultiBeam( cent );	
-	}
-
+    // Add in the multibeams at the end
+    for (num = 0; num < cg.snap->numEntities; num++) {
+        cent = &cg_entities[cg.snap->entities[num].number];
+        if (cent->currentState.eType == ET_MULTIBEAM) {
+            CG_MultiBeam(cent);
+        }
+    }
 }
 
-void CG_GetOrigin(centity_t* cent, vec3_t origin)
+void CG_GetOrigin(centity_t *cent, vec3_t origin)
 {
-    if (cent->currentState.parent == ENTITYNUM_NONE)
-    {
+    if (cent->currentState.parent == ENTITYNUM_NONE) {
         VectorCopy(cent->lerpOrigin, origin);
-    }
-    else
-    {
+    } else {
         int i;
-        orientation_t or;
-        refEntity_t* parent;
+        orientation_t or ;
+        refEntity_t *parent;
 
         parent = cgi.R_GetRenderEntity(cent->currentState.parent);
 
-        if (!parent)
-        {
-            cgi.DPrintf("CG_GetOrigin: Could not find parent entity\n");
+        if (!parent) {
             return;
         }
 
@@ -689,9 +678,8 @@ void CG_GetOrigin(centity_t* cent, vec3_t origin)
 
         VectorCopy(parent->origin, origin);
 
-        for (i = 0; i < 3; i++)
-        {
-            VectorMA(origin, or .origin[i], parent->axis[i], origin);
+        for (i = 0; i < 3; i++) {
+            VectorMA(origin, or.origin[i], parent->axis[i], origin);
         }
     }
 }

code/cgame/cg_event.c

@@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_local.h"
 
-
 /*
 ==============
 CG_EntityEvent
@@ -34,6 +33,4 @@ An entity has an event value
 ==============
 */
 
-void CG_EntityEvent( centity_t *cent, vec3_t position )
-   {
-   }
+void CG_EntityEvent(centity_t *cent, vec3_t position) {}

code/cgame/cg_nature.cpp

@@ -26,22 +26,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "cg_commands.h"
 
-cvar_t* cg_rain;
-cvar_t* cg_rain_drawcoverage;
+cvar_t *cg_rain;
+cvar_t *cg_rain_drawcoverage;
 
-void RainTouch(ctempmodel_t* ct, trace_t* trace)
+void RainTouch(ctempmodel_t *ct, trace_t *trace)
 {
     Vector norm, neworg;
 
-    ct->ent.hModel = cgi.R_RegisterModel("splash_z.spr");
-    ct->cgd.velocity = vec_zero;
-    ct->cgd.accel = vec_zero;
-    ct->killTime = cg.time + 400;
-    norm = trace->plane.normal;
-    norm.x = -norm.x;
-    norm.y = -norm.y;
-    ct->cgd.angles = norm.toAngles();
-    ct->ent.scale = 0.3f;
+    ct->ent.hModel    = cgi.R_RegisterModel("splash_z.spr");
+    ct->cgd.velocity  = vec_zero;
+    ct->cgd.accel     = vec_zero;
+    ct->killTime      = cg.time + 400;
+    norm              = trace->plane.normal;
+    norm.x            = -norm.x;
+    norm.y            = -norm.y;
+    ct->cgd.angles    = norm.toAngles();
+    ct->ent.scale     = 0.3f;
     ct->cgd.scaleRate = 4.0;
     ct->cgd.flags |= T_FADE;
 
@@ -49,7 +49,7 @@ void RainTouch(ctempmodel_t* ct, trace_t* trace)
     VectorCopy(neworg, ct->ent.origin);
 }
 
-void ClientGameCommandManager::RainTouch(Event* ev)
+void ClientGameCommandManager::RainTouch(Event *ev)
 {
     // FIXME: unimplemented
 }
@@ -59,15 +59,16 @@ void ClientGameCommandManager::InitializeRainCvars()
     int i;
 
     cg_rain = cgi.Cvar_Get("cg_rain", "0", CVAR_ARCHIVE);
-    cg_rain_drawcoverage = cgi.Cvar_Get("cg_rain_drawcoverage", "0", CVAR_SAVEGAME | CVAR_SERVER_CREATED | CVAR_SYSTEMINFO);
+    cg_rain_drawcoverage =
+        cgi.Cvar_Get("cg_rain_drawcoverage", "0", CVAR_SAVEGAME | CVAR_SERVER_CREATED | CVAR_SYSTEMINFO);
 
-    cg.rain.density = 0.0;
-    cg.rain.speed = 2048.0f;
-    cg.rain.length = 90.0f;
-    cg.rain.min_dist = 512.0f;
-    cg.rain.width = 1.0f;
+    cg.rain.density    = 0.0;
+    cg.rain.speed      = 2048.0f;
+    cg.rain.length     = 90.0f;
+    cg.rain.min_dist   = 512.0f;
+    cg.rain.width      = 1.0f;
     cg.rain.speed_vary = 512;
-    cg.rain.slant = 50;
+    cg.rain.slant      = 50;
 
     for (i = 0; i < MAX_RAIN_SHADERS; i++) {
         cg.rain.shader[i][0] = 0;
@@ -76,19 +77,19 @@ void ClientGameCommandManager::InitializeRainCvars()
     cg.rain.numshaders = 0;
 }
 
-void CG_Rain(centity_t* cent)
+void CG_Rain(centity_t *cent)
 {
-    int iLife;
-    vec3_t mins, maxs;
-    vec3_t vOmins, vOmaxs, vOe;
-    float fcolor[4];
-    vec3_t vStart, vEnd;
-    int iNumSpawn;
-    int i;
-    int iRandom;
-    float fDensity;
-    vec3_t vLength;
-    const char* shadername;
+    int         iLife;
+    vec3_t      mins, maxs;
+    vec3_t      vOmins, vOmaxs, vOe;
+    float       fcolor[4];
+    vec3_t      vStart, vEnd;
+    int         iNumSpawn;
+    int         i;
+    int         iRandom;
+    float       fDensity;
+    vec3_t      vLength;
+    const char *shadername;
 
     fcolor[0] = 1.0;
     fcolor[1] = 1.0;
@@ -133,35 +134,26 @@ void CG_Rain(centity_t* cent)
         return;
     }
 
-    if (cg_rain_drawcoverage->integer)
-    {
+    if (cg_rain_drawcoverage->integer) {
         cgi.R_DebugLine(
-            Vector(vOmins[0], vOmins[1], vOmins[2]),
-            Vector(vOmaxs[0], vOmins[1], vOmins[2]),
-            1.0, 0.0, 0.0, 1.0
+            Vector(vOmins[0], vOmins[1], vOmins[2]), Vector(vOmaxs[0], vOmins[1], vOmins[2]), 1.0, 0.0, 0.0, 1.0
         );
 
         cgi.R_DebugLine(
-            Vector(vOmaxs[0], vOmins[1], vOmins[2]),
-            Vector(vOmaxs[0], vOmaxs[1], vOmins[2]),
-            1.0, 0.0, 0.0, 1.0
+            Vector(vOmaxs[0], vOmins[1], vOmins[2]), Vector(vOmaxs[0], vOmaxs[1], vOmins[2]), 1.0, 0.0, 0.0, 1.0
         );
 
         cgi.R_DebugLine(
-            Vector(vOmaxs[0], vOmaxs[1], vOmins[2]),
-            Vector(vOmins[0], vOmaxs[1], vOmins[2]),
-            1.0, 0.0, 0.0, 1.0
+            Vector(vOmaxs[0], vOmaxs[1], vOmins[2]), Vector(vOmins[0], vOmaxs[1], vOmins[2]), 1.0, 0.0, 0.0, 1.0
         );
 
         cgi.R_DebugLine(
-            Vector(vOmins[0], vOmaxs[1], vOmins[2]),
-            Vector(vOmins[0], vOmins[1], vOmins[2]),
-            1.0, 0.0, 0.0, 1.0
+            Vector(vOmins[0], vOmaxs[1], vOmins[2]), Vector(vOmins[0], vOmins[1], vOmins[2]), 1.0, 0.0, 0.0, 1.0
         );
     }
 
     VectorSubtract(vOmaxs, vOmins, vOe);
-    fDensity = cg.rain.density / 200.0;
+    fDensity  = cg.rain.density / 200.0;
     iNumSpawn = (int)(sqrt(vOe[0] * vOe[1]) * fDensity);
     if (iNumSpawn > MAX_BEAMS) {
         iNumSpawn = MAX_BEAMS;
@@ -171,21 +163,18 @@ void CG_Rain(centity_t* cent)
 
     if (cg.rain.numshaders) {
         shadername = cg.rain.shader[iRandom % cg.rain.numshaders];
-    }
-    else {
+    } else {
         shadername = cg.rain.shader[0];
     }
 
-    for (i = 0; i < iNumSpawn; ++i)
-    {
-        iLife = (int)(vOe[2] / ((float)(iRandom % cg.rain.speed_vary) + cg.rain.speed) * 1000.0);
+    for (i = 0; i < iNumSpawn; ++i) {
+        iLife     = (int)(vOe[2] / ((float)(iRandom % cg.rain.speed_vary) + cg.rain.speed) * 1000.0);
         vStart[0] = (float)(iRandom % (int)(vOe[0] + 1.0)) + vOmins[0];
-        iRandom = ((214013 * iRandom + 2531011) >> 16) & 0x7FFF;
+        iRandom   = ((214013 * iRandom + 2531011) >> 16) & 0x7FFF;
         vStart[1] = (float)(iRandom % (int)(vOe[1] + 1.0)) + vOmins[1];
         vStart[2] = vOmaxs[2];
 
-        if (cg.snap)
-        {
+        if (cg.snap) {
             vLength[0] = cg.snap->ps.origin[0] - vStart[0];
             vLength[1] = cg.snap->ps.origin[1] - vStart[1];
             vLength[2] = 0.0;

code/cgame/cg_parsemsg.h

@@ -29,9 +29,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
-void CG_AddBulletTracers();
-void CG_AddBulletImpacts();
-void CG_ParseCGMessage();
+    void CG_AddBulletTracers();
+    void CG_AddBulletImpacts();
+    void CG_InitCGMessageAPI(clientGameExport_t *cge);
 
 #ifdef __cplusplus
 }

code/cgame/cg_player.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // DESCRIPTION:
-// Player functions for the cgame 
+// Player functions for the cgame
 
 #include "cg_local.h"
 #include "cg_commands.h"
@@ -42,9 +42,9 @@ CG_ResetPlayerEntity
 A player just came into view or teleported, so reset all animation info
 ===============
 */
-void CG_ResetPlayerEntity( centity_t *cent )
+void CG_ResetPlayerEntity(centity_t *cent)
 {
-    cent->errorTime = -99999;		// guarantee no error decay added
+    cent->errorTime    = -99999; // guarantee no error decay added
     cent->extrapolated = qfalse;
 
     VectorCopy(cent->currentState.origin, cent->lerpOrigin);
@@ -53,8 +53,7 @@ void CG_ResetPlayerEntity( centity_t *cent )
     VectorCopy(cent->currentState.angles, cent->lerpAngles);
     VectorCopy(cent->lerpAngles, cent->rawAngles);
 
-    if (cent->currentState.number == cg.snap->ps.clientNum)
-    {
+    if (cent->currentState.number == cg.snap->ps.clientNum) {
         // initialize the camera position
         VectorCopy(cent->lerpOrigin, cg.currentViewPos);
         // initialize the camera angles
@@ -70,7 +69,7 @@ void CG_ResetPlayerEntity( centity_t *cent )
 CG_Player
 ===============
 */
-void CG_Player( centity_t *cent )
-   {
-   //CG_PlayerSplash( cent );
-   }
+void CG_Player(centity_t *cent)
+{
+    //CG_PlayerSplash( cent );
+}

code/cgame/cg_playerstate.c

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // DESCRIPTION:
-// 
+//
 // this file acts on changes in a new playerState_t.
 // With normal play, this will be done after local prediction, but when
 // following another player or playing back a demo, it will be checked
@@ -35,8 +35,4 @@ CG_TransitionPlayerState
 
 ===============
 */
-void CG_TransitionPlayerState( playerState_t *ps, playerState_t *ops )
-   {
-
-   }
-
+void CG_TransitionPlayerState(playerState_t *ps, playerState_t *ops) {}

code/cgame/cg_predict.c

@@ -25,14 +25,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // interpolating between snapshots from the server or locally predicting
 // ahead the client's movement. It also handles local physics interaction,
 // like fragments bouncing off walls
+//
+// ADDITIONS:
+// - CG_InterpolatePlayerState() footer: Interpolate the lean angles
 
 #include "cg_local.h"
 
 static pmove_t cg_pmove;
 
-static int cg_numSolidEntities;
-static centity_t* cg_solidEntities[MAX_ENTITIES_IN_SNAPSHOT];
-static int cg_numTriggerEntities;
+static int        cg_numSolidEntities;
+static centity_t *cg_solidEntities[MAX_ENTITIES_IN_SNAPSHOT];
+static int        cg_numTriggerEntities;
+
 // static	centity_t	*cg_triggerEntities[MAX_ENTITIES_IN_SNAPSHOT];
 
 /*
@@ -46,12 +50,12 @@ efficient collision detection
 */
 void CG_BuildSolidList(void)
 {
-    int i;
-    centity_t* cent;
-    snapshot_t* snap;
-    entityState_t* ent;
+    int            i;
+    centity_t     *cent;
+    snapshot_t    *snap;
+    entityState_t *ent;
 
-    cg_numSolidEntities = 0;
+    cg_numSolidEntities   = 0;
     cg_numTriggerEntities = 0;
 
     if (cg.nextSnap && !cg.nextFrameTeleport && !cg.thisFrameTeleport) {
@@ -62,10 +66,9 @@ void CG_BuildSolidList(void)
 
     for (i = 0; i < snap->numEntities; i++) {
         cent = &cg_entities[snap->entities[i].number];
-        ent = &cent->currentState;
+        ent  = &cent->currentState;
 
-        if (ent->eType == ET_ITEM || ent->eType == ET_PUSH_TRIGGER ||
-            ent->eType == ET_TELEPORT_TRIGGER) {
+        if (ent->eType == ET_ITEM || ent->eType == ET_PUSH_TRIGGER || ent->eType == ET_TELEPORT_TRIGGER) {
             /*
                            cg_triggerEntities[cg_numTriggerEntities] = cent;
                            cg_numTriggerEntities++;
@@ -81,29 +84,71 @@ void CG_BuildSolidList(void)
     }
 }
 
+int CG_GetBrushEntitiesInBounds(int iMaxEnts, centity_t** pEntList, const vec3_t vMins, const vec3_t vMaxs)
+{
+    int i;
+    int iEntCount;
+    clipHandle_t cmodel;
+    vec3_t vEntMins, vEntMaxs;
+    centity_t* cent;
+
+    iEntCount = 0;
+    for (i = 0; i < cg_numSolidEntities; i++) {
+        cent = cg_solidEntities[i];
+        if (cent->currentState.solid != SOLID_BMODEL) {
+            continue;
+        }
+
+        cmodel = cgi.CM_InlineModel(cent->currentState.modelindex);
+        cgi.R_GetInlineModelBounds(cmodel, vEntMins, vEntMaxs);
+        if (cent->lerpAngles[0] || cent->lerpAngles[1] || cent->lerpAngles[2]) {
+            CalculateRotatedBounds(cent->lerpAngles, vEntMins, vEntMaxs);
+        }
+
+        VectorAdd(vEntMins, cent->lerpOrigin, vEntMins);
+        VectorAdd(vEntMaxs, cent->lerpOrigin, vEntMaxs);
+
+        if (vEntMins[0] <= vMaxs[0] && vEntMaxs[0] >= vMins[0]
+            && vEntMins[1] <= vMaxs[1] && vEntMaxs[1] >= vMins[1]
+            && vEntMins[2] <= vMaxs[2] && vEntMaxs[2] >= vMins[2]) {
+            pEntList[iEntCount++] = cent;
+            if (iEntCount >= iMaxEnts) {
+                return iEntCount;
+            }
+        }
+    }
+
+    return iEntCount;
+}
+
 /*
 ====================
 CG_ClipMoveToEntities
 
 ====================
 */
-void CG_ClipMoveToEntities(const vec3_t start, const vec3_t mins,
-                           const vec3_t maxs, const vec3_t end,
-                           int skipNumber, int mask, trace_t* tr,
-                           qboolean cylinder)
-
+void CG_ClipMoveToEntities(
+    const vec3_t start,
+    const vec3_t mins,
+    const vec3_t maxs,
+    const vec3_t end,
+    int          skipNumber,
+    int          mask,
+    trace_t     *tr,
+    qboolean     cylinder
+)
 {
-    int i;
-    trace_t trace;
-    entityState_t* ent;
-    clipHandle_t cmodel;
-    vec3_t bmins, bmaxs;
-    vec3_t origin, angles;
-    centity_t* cent;
+    int            i;
+    trace_t        trace;
+    entityState_t *ent;
+    clipHandle_t   cmodel;
+    vec3_t         bmins, bmaxs;
+    vec3_t         origin, angles;
+    centity_t     *cent;
 
     for (i = 0; i < cg_numSolidEntities; i++) {
         cent = cg_solidEntities[i];
-        ent = &cent->currentState;
+        ent  = &cent->currentState;
 
         if (ent->number == skipNumber) {
             continue;
@@ -117,42 +162,43 @@ void CG_ClipMoveToEntities(const vec3_t start, const vec3_t mins,
             }
         } else {
             IntegerToBoundingBox(ent->solid, bmins, bmaxs);
-            cmodel = cgi.CM_TempBoxModel(
-                bmins, bmaxs,
-                CONTENTS_BBOX);
+            cmodel = cgi.CM_TempBoxModel(bmins, bmaxs, CONTENTS_BBOX);
         }
 
         VectorCopy(cent->lerpOrigin, origin);
         if (ent->eFlags & EF_LINKANGLES) {
             VectorCopy(cent->lerpAngles, angles);
-        }
-        else {
+        } else {
             VectorClear(angles);
         }
 
-        cgi.CM_TransformedBoxTrace(&trace, start, end, mins, maxs, cmodel, mask,
-                                   origin, angles, cylinder);
+        cgi.CM_TransformedBoxTrace(&trace, start, end, mins, maxs, cmodel, mask, origin, angles, cylinder);
 
         if (trace.allsolid || trace.fraction < tr->fraction) {
             trace.entityNum = ent->number;
-            *tr = trace;
+            *tr             = trace;
         } else if (trace.startsolid) {
             tr->startsolid = qtrue;
         }
     }
 }
 
-void CG_ShowTrace(trace_t* trace, int passent, const char* reason)
-
+void CG_ShowTrace(trace_t *trace, int passent, const char *reason)
 {
     char text[1024];
 
     assert(reason);
     assert(trace);
 
-    sprintf(text, "%0.2f : Pass (%d) Frac %f Hit (%d): '%s'\n",
-            (float)cg.time / 1000.0f, passent, trace->fraction,
-            trace->entityNum, reason ? reason : "");
+    sprintf(
+        text,
+        "%0.2f : Pass (%d) Frac %f Hit (%d): '%s'\n",
+        (float)cg.time / 1000.0f,
+        passent,
+        trace->fraction,
+        trace->entityNum,
+        reason ? reason : ""
+    );
 
     if (cg_traceinfo->integer == 3) {
         cgi.DebugPrintf(text);
@@ -166,11 +212,18 @@ void CG_ShowTrace(trace_t* trace, int passent, const char* reason)
 CG_Trace
 ================
 */
-void CG_Trace(trace_t* result, const vec3_t start, const vec3_t mins,
-              const vec3_t maxs, const vec3_t end, int skipNumber, int mask,
-              qboolean cylinder, qboolean cliptoentities,
-              const char* description)
-
+void CG_Trace(
+    trace_t     *result,
+    const vec3_t start,
+    const vec3_t mins,
+    const vec3_t maxs,
+    const vec3_t end,
+    int          skipNumber,
+    int          mask,
+    qboolean     cylinder,
+    qboolean     cliptoentities,
+    const char  *description
+)
 {
     trace_t t;
 
@@ -185,8 +238,7 @@ void CG_Trace(trace_t* result, const vec3_t start, const vec3_t mins,
 
     if (cliptoentities) {
         // check all other solid models
-        CG_ClipMoveToEntities(start, mins, maxs, end, skipNumber, mask, &t,
-                              cylinder);
+        CG_ClipMoveToEntities(start, mins, maxs, end, skipNumber, mask, &t, cylinder);
     }
 
     *result = t;
@@ -201,13 +253,19 @@ void CG_Trace(trace_t* result, const vec3_t start, const vec3_t mins,
 CG_PlayerTrace
 ================
 */
-void CG_PlayerTrace(trace_t* result, const vec3_t start, const vec3_t mins,
-                    const vec3_t maxs, const vec3_t end, int skipNumber,
-                    int mask, qboolean cylinder, qboolean tracedeep)
-
+void CG_PlayerTrace(
+    trace_t     *result,
+    const vec3_t start,
+    const vec3_t mins,
+    const vec3_t maxs,
+    const vec3_t end,
+    int          skipNumber,
+    int          mask,
+    qboolean     cylinder,
+    qboolean     tracedeep
+)
 {
-    CG_Trace(result, start, mins, maxs, end, skipNumber, mask, cylinder, qtrue,
-             "PlayerTrace");
+    CG_Trace(result, start, mins, maxs, end, skipNumber, mask, cylinder, qtrue, "PlayerTrace");
 }
 
 /*
@@ -217,11 +275,11 @@ CG_PointContents
 */
 int CG_PointContents(const vec3_t point, int passEntityNum)
 {
-    int i;
-    entityState_t* ent;
-    centity_t* cent;
-    clipHandle_t cmodel;
-    int contents;
+    int            i;
+    entityState_t *ent;
+    centity_t     *cent;
+    clipHandle_t   cmodel;
+    int            contents;
 
     contents = cgi.CM_PointContents(point, 0);
 
@@ -243,8 +301,7 @@ int CG_PointContents(const vec3_t point, int passEntityNum)
             continue;
         }
 
-        contents |= cgi.CM_TransformedPointContents(point, cmodel, ent->origin,
-                                                    ent->angles);
+        contents |= cgi.CM_TransformedPointContents(point, cmodel, ent->origin, ent->angles);
     }
 
     return contents;
@@ -260,8 +317,8 @@ cg.snap->player_state and cg.nextFrame->player_state
 */
 static void CG_InterpolatePlayerStateCamera(void)
 {
-    float f;
-    int i;
+    float       f;
+    int         i;
     snapshot_t *prev, *next;
 
     prev = cg.snap;
@@ -283,8 +340,7 @@ static void CG_InterpolatePlayerStateCamera(void)
         return;
     }
 
-    f = (float)(cg.time - prev->serverTime) /
-        (next->serverTime - prev->serverTime);
+    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);
@@ -294,11 +350,8 @@ static void CG_InterpolatePlayerStateCamera(void)
     }
 
     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);
+        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);
     }
 }
 
@@ -312,12 +365,12 @@ cg.snap->player_state and cg.nextFrame->player_state
 */
 static void CG_InterpolatePlayerState(qboolean grabAngles)
 {
-    float f;
-    int i;
-    playerState_t* out;
-    snapshot_t *prev, *next;
+    float          f;
+    int            i;
+    playerState_t *out;
+    snapshot_t    *prev, *next;
 
-    out = &cg.predicted_player_state;
+    out  = &cg.predicted_player_state;
     prev = cg.snap;
     next = cg.nextSnap;
 
@@ -329,7 +382,7 @@ static void CG_InterpolatePlayerState(qboolean grabAngles)
     // if we are still allowing local input, short circuit the view angles
     if (grabAngles) {
         usercmd_t cmd;
-        int cmdNum;
+        int       cmdNum;
 
         cmdNum = cgi.GetCurrentCmdNumber();
         cgi.GetUserCmd(cmdNum, &cmd);
@@ -349,15 +402,15 @@ static void CG_InterpolatePlayerState(qboolean grabAngles)
     f = cg.frameInterpolation;
 
     for (i = 0; i < 3; i++) {
-        out->origin[i] =
-            prev->ps.origin[i] + f * (next->ps.origin[i] - prev->ps.origin[i]);
+        out->origin[i] = prev->ps.origin[i] + f * (next->ps.origin[i] - prev->ps.origin[i]);
         if (!grabAngles) {
-            out->viewangles[i] =
-                LerpAngle(prev->ps.viewangles[i], next->ps.viewangles[i], f);
+            out->viewangles[i] = LerpAngle(prev->ps.viewangles[i], next->ps.viewangles[i], f);
         }
-        out->velocity[i] = prev->ps.velocity[i] +
-                           f * (next->ps.velocity[i] - prev->ps.velocity[i]);
+        out->velocity[i] = prev->ps.velocity[i] + f * (next->ps.velocity[i] - prev->ps.velocity[i]);
     }
+
+    // interpolate the lean angle
+    out->fLeanAngle = LerpAngle(prev->ps.fLeanAngle, next->ps.fLeanAngle, f);
 }
 
 /*
@@ -388,10 +441,10 @@ to ease the jerk.
 */
 void CG_PredictPlayerState(void)
 {
-    int cmdNum, current;
+    int           cmdNum, current;
     playerState_t oldPlayerState;
-    qboolean moved;
-    usercmd_t latestCmd;
+    qboolean      moved;
+    usercmd_t     latestCmd;
 
     cg.hyperspace = qfalse; // will be set if touching a trigger_teleport
 
@@ -399,13 +452,12 @@ void CG_PredictPlayerState(void)
     // predicted_player_state is valid even if there is some
     // other error condition
     if (!cg.validPPS) {
-        cg.validPPS = qtrue;
+        cg.validPPS               = qtrue;
         cg.predicted_player_state = cg.snap->ps;
     }
 
     // demo playback just copies the moves
-    if (cg.demoPlayback || (cg.snap->ps.pm_flags & PMF_NO_PREDICTION) ||
-        (cg.snap->ps.pm_flags & PMF_FROZEN)) {
+    if (cg.demoPlayback || (cg.snap->ps.pm_flags & PMF_NO_PREDICTION) || (cg.snap->ps.pm_flags & PMF_FROZEN)) {
         CG_InterpolatePlayerState(qfalse);
         return;
     }
@@ -414,15 +466,14 @@ void CG_PredictPlayerState(void)
     // FIXME
     //  Noclip is jittery for some reason, so I'm disabling prediction while
     //  noclipping
-    if (cg_nopredict->integer || cg_synchronousClients->integer ||
-        (cg.snap->ps.pm_type == PM_NOCLIP)) {
+    if (cg_nopredict->integer || cg_synchronousClients->integer || (cg.snap->ps.pm_type == PM_NOCLIP)) {
         CG_InterpolatePlayerState(qtrue);
         return;
     }
 
     // prepare for pmove
-    cg_pmove.ps = &cg.predicted_player_state;
-    cg_pmove.trace = CG_PlayerTrace;
+    cg_pmove.ps            = &cg.predicted_player_state;
+    cg_pmove.trace         = CG_PlayerTrace;
     cg_pmove.pointcontents = CG_PointContents;
 
     if (cg_pmove.ps->pm_type == PM_DEAD) {
@@ -432,6 +483,24 @@ void CG_PredictPlayerState(void)
     }
 
     cg_pmove.noFootsteps = (cgs.dmflags & DF_NO_FOOTSTEPS) > 0;
+    if (cg_protocol >= PROTOCOL_MOHTA_MIN) {
+        // Leaning while moving is allowed in mohta and mohtt only with a specific dm flag bit set
+        cg_pmove.alwaysAllowLean = (cgs.dmflags & DF_ALLOW_LEAN_MOVEMENT) ? qtrue : qfalse;
+
+        cg_pmove.leanMax = 45.f;
+        cg_pmove.leanAdd = 6.f;
+        cg_pmove.leanRecoverSpeed = 8.5f;
+        cg_pmove.leanSpeed = 2.f;
+    } else {
+        cg_pmove.alwaysAllowLean = qtrue;
+
+        cg_pmove.leanMax = 40.f;
+        cg_pmove.leanAdd = 10.f;
+        cg_pmove.leanRecoverSpeed = 15.f;
+        cg_pmove.leanSpeed = 4.f;
+    }
+
+    cg_pmove.protocol = cg_protocol;
 
     // save the state before the pmove so we can detect transitions
     oldPlayerState = cg.predicted_player_state;
@@ -448,24 +517,22 @@ void CG_PredictPlayerState(void)
     // be ahead of everything else anyway
     if (cg.nextSnap && !cg.nextFrameTeleport && !cg.thisFrameTeleport) {
         cg.predicted_player_state = cg.nextSnap->ps;
-        cg.physicsTime = cg.nextSnap->serverTime;
+        cg.physicsTime            = cg.nextSnap->serverTime;
     } else {
         cg.predicted_player_state = cg.snap->ps;
-        cg.physicsTime = cg.snap->serverTime;
+        cg.physicsTime            = cg.snap->serverTime;
     }
 
-    if (pmove_msec->integer >= 8)
-    {
-        if (pmove_msec->integer > 33)
+    if (pmove_msec->integer >= 8) {
+        if (pmove_msec->integer > 33) {
             cgi.Cvar_Set("pmove_msec", "33");
-    }
-    else
-    {
+        }
+    } else {
         cgi.Cvar_Set("pmove_msec", "8");
     }
 
     cg_pmove.pmove_fixed = pmove_fixed->integer;
-    cg_pmove.pmove_msec = pmove_msec->integer;
+    cg_pmove.pmove_msec  = pmove_msec->integer;
 
     // run cmds
     moved = qfalse;
@@ -492,9 +559,7 @@ void CG_PredictPlayerState(void)
         // from the snapshot, but on a wan we will have
         // to predict several commands to get to the point
         // we want to compare
-        if (cg.predicted_player_state.commandTime ==
-            oldPlayerState.commandTime) {
-
+        if (cg.predicted_player_state.commandTime == oldPlayerState.commandTime) {
             if (cg.thisFrameTeleport) {
                 // a teleport will not cause an error decay
                 VectorClear(cg.predictedError);
@@ -508,13 +573,12 @@ void CG_PredictPlayerState(void)
         // if our feet are falling, don't try to move
         if (cg_pmove.ps->feetfalling && (cg_pmove.waterlevel < 2)) {
             cg_pmove.cmd.forwardmove = 0;
-            cg_pmove.cmd.rightmove = 0;
+            cg_pmove.cmd.rightmove   = 0;
         }
 
         if (cg_pmove.pmove_fixed) {
-            cg_pmove.cmd.serverTime = pmove_msec->integer
-                * ((cg_pmove.cmd.serverTime + pmove_msec->integer - 1)
-                    / pmove_msec->integer);
+            cg_pmove.cmd.serverTime =
+                pmove_msec->integer * ((cg_pmove.cmd.serverTime + pmove_msec->integer - 1) / pmove_msec->integer);
         }
 
         Pmove(&cg_pmove);
@@ -534,8 +598,8 @@ void CG_PredictPlayerState(void)
 
     // Interpolate the player position
     if (cg.predicted_player_state.groundEntityNum != ENTITYNUM_WORLD) {
-        centity_t* cent;
-        vec3_t offset;
+        centity_t *cent;
+        vec3_t     offset;
 
         cent = &cg_entities[cg.predicted_player_state.groundEntityNum];
 
@@ -544,9 +608,15 @@ void CG_PredictPlayerState(void)
 
             f = cg.frameInterpolation - 1.0;
 
-            offset[0] = (cent->nextState.origin[0] - cg_entities[cg.predicted_player_state.groundEntityNum].currentState.origin[0]) * f;
-            offset[1] = (cent->nextState.origin[1] - cg_entities[cg.predicted_player_state.groundEntityNum].currentState.origin[1]) * f;
-            offset[2] = (cent->nextState.origin[2] - cg_entities[cg.predicted_player_state.groundEntityNum].currentState.origin[2]) * f;
+            offset[0] = (cent->nextState.origin[0]
+                         - cg_entities[cg.predicted_player_state.groundEntityNum].currentState.origin[0])
+                      * f;
+            offset[1] = (cent->nextState.origin[1]
+                         - cg_entities[cg.predicted_player_state.groundEntityNum].currentState.origin[1])
+                      * f;
+            offset[2] = (cent->nextState.origin[2]
+                         - cg_entities[cg.predicted_player_state.groundEntityNum].currentState.origin[2])
+                      * f;
 
             cg.predicted_player_state.origin[0] += offset[0];
             cg.predicted_player_state.origin[1] += offset[1];

code/cgame/cg_public.h

@@ -23,62 +23,60 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // DESCRIPTION:
 // client game public interfaces
 
-#ifndef __CG_PUBLIC_H__
-#define __CG_PUBLIC_H__
+#pragma once
+
+#include "../renderercommon/tr_types.h"
 
 #ifdef __cplusplus
-extern "C"
-   {
+extern "C" {
 #endif
 
-#define  MAGIC_UNUSED_NUMBER 7777
-#define    CMD_BACKUP            128    
-#define    CMD_MASK            (CMD_BACKUP - 1)
-// allow a lot of command backups for very fast systems
-// multiple commands may be combined into a single packet, so this
-// needs to be larger than PACKET_BACKUP
+#define MAGIC_UNUSED_NUMBER 7777
+#define CMD_BACKUP          128
+#define CMD_MASK            (CMD_BACKUP - 1)
+    // allow a lot of command backups for very fast systems
+    // multiple commands may be combined into a single packet, so this
+    // needs to be larger than PACKET_BACKUP
 
+#define MAX_ENTITIES_IN_SNAPSHOT 1024
 
-#define    MAX_ENTITIES_IN_SNAPSHOT    1024
+    // snapshots are a view of the server at a given time
 
-// snapshots are a view of the server at a given time
+    // Snapshots are generated at regular time intervals by the server,
+    // but they may not be sent if a client's rate level is exceeded, or
+    // they may be dropped by the network.
+    typedef struct {
+        int snapFlags; // SNAPFLAG_RATE_DELAYED, etc
+        int ping;
 
-// Snapshots are generated at regular time intervals by the server,
-// but they may not be sent if a client's rate level is exceeded, or
-// they may be dropped by the network.
-typedef struct {
-    int                snapFlags;            // SNAPFLAG_RATE_DELAYED, etc
-    int                ping;
+        int serverTime; // server time the message is valid for (in msec)
 
-    int                serverTime;        // server time the message is valid for (in msec)
+        byte areamask[MAX_MAP_AREA_BYTES]; // portalarea visibility bits
 
-    byte                areamask[MAX_MAP_AREA_BYTES];        // portalarea visibility bits
+        playerState_t ps; // complete information about the current player at this time
 
-    playerState_t    ps;                        // complete information about the current player at this time
+        int           numEntities;                        // all of the entities that need to be presented
+        entityState_t entities[MAX_ENTITIES_IN_SNAPSHOT]; // at the time of this snapshot
 
-    int                numEntities;            // all of the entities that need to be presented
-    entityState_t    entities[MAX_ENTITIES_IN_SNAPSHOT];    // at the time of this snapshot
+        int numServerCommands;     // text based server commands to execute when this
+        int serverCommandSequence; // snapshot becomes current
 
-    int                numServerCommands;        // text based server commands to execute when this
-    int                serverCommandSequence;    // snapshot becomes current
+        int            number_of_sounds;
+        server_sound_t sounds[MAX_SERVER_SOUNDS];
+    } snapshot_t;
 
-    int                number_of_sounds;
-    server_sound_t    sounds[ MAX_SERVER_SOUNDS ];
-} snapshot_t;
+    typedef struct stopWatch_s {
+        int iStartTime;
+        int iEndTime;
+        int eType;
+    } stopWatch_t;
 
-typedef struct stopWatch_s
-{
-    int iStartTime;
-    int iEndTime;
+    typedef struct AliasList_s     AliasList_t;
+    typedef struct AliasListNode_s AliasListNode_t;
+    typedef struct dtiki_s         dtiki_t;
+    typedef struct tiki_cmd_s      tiki_cmd_t;
 
-} stopWatch_t;
-
-typedef struct AliasList_s AliasList_t;
-typedef struct AliasListNode_s AliasListNode_t;
-typedef struct dtiki_s dtiki_t;
-typedef struct tiki_cmd_s tiki_cmd_t;
-
-/*
+    /*
 ==================================================================
 
 functions imported from the main executable
@@ -86,9 +84,9 @@ functions imported from the main executable
 ==================================================================
 */
 
-#define    CGAME_IMPORT_API_VERSION    3
+#define CGAME_IMPORT_API_VERSION 3
 
-/*
+    /*
 ==================================================================
 
 functions exported to the main executable
@@ -96,274 +94,350 @@ functions exported to the main executable
 ==================================================================
 */
 
-typedef struct 
-   {
-    int            apiversion;
-    
-    //============== general services ==================
+    typedef struct {
+        int apiversion;
 
-    // print message on the local console
-    void             (*Printf)( const char *fmt, ...);
-    void             (*DPrintf)( const char *fmt, ...);
-    void             (*DebugPrintf)( const char *fmt, ...);
+        //============== general services ==================
 
-    // managed memory allocation
-    void             *(*Malloc)( int size );
-    void             (*Free)( void *block );
+        // print message on the local console
+        void (*Printf)(const char *fmt, ...);
+        void (*DPrintf)(const char *fmt, ...);
+        void (*DebugPrintf)(const char *fmt, ...);
 
-    // abort the game
-    void             (*Error)( int errorLevel, const char *fmt, ...);
+        // managed memory allocation
+        void *(*Malloc)(int size);
+        void (*Free)(void *block);
 
-    // milliseconds should only be used for profiling, never
-    // for anything game related.  Get time from CG_ReadyToBuildScene.
-    int              (*Milliseconds)( void );
+        // abort the game
+        void (*Error)(int errorLevel, const char *fmt, ...);
 
-    // localization
-    const char* (*LV_ConvertString)(const char* string);
+        // milliseconds should only be used for profiling, never
+        // for anything game related.  Get time from CG_ReadyToBuildScene.
+        int (*Milliseconds)(void);
 
-    // console variable interaction
-    cvar_t *       (*Cvar_Get)( const char *var_name, const char *value, int flags );
-    void           (*Cvar_Set)( const char *var_name, const char *value );
+        // localization
+        const char *(*LV_ConvertString)(const char *string);
 
-    // ClientCommand and ConsoleCommand parameter access
-    int              (*Argc)( void );
-    char *         (*Argv)( int n );
-    char *         (*Args)( void );    // concatenation of all argv >= 1
-   void           (*AddCommand)( const char *cmd );
-    void          (*Cmd_Stuff)(const char* text);
-    void          (*Cmd_Execute)(int execWhen, const char* text);
-    void          (*Cmd_TokenizeString)(const char* textIn);
+        // console variable interaction
+        cvar_t *(*Cvar_Get)(const char *var_name, const char *value, int flags);
+        void (*Cvar_Set)(const char *var_name, const char *value);
 
-    // a -1 return means the file does not exist
-    // NULL can be passed for buf to just determine existance
-    long              (*FS_ReadFile)( const char *name, void **buf, qboolean quiet );
-    void             (*FS_FreeFile)( void *buf );
-    int              (*FS_WriteFile)( const char *qpath, const void *buffer, int size );
-   void           (*FS_WriteTextFile)( const char *qpath, const void *buffer, int size );
-    // add commands to the local console as if they were typed in
-    // for map changing, etc.  The command is not executed immediately,
-    // but will be executed in order the next time console commands
-    // are processed
-    void             (*SendConsoleCommand)( const char *text );
+        // ClientCommand and ConsoleCommand parameter access
+        int (*Argc)(void);
+        char *(*Argv)(int n);
+        char *(*Args)(void); // concatenation of all argv >= 1
+        void (*AddCommand)(const char *cmd);
+        void (*Cmd_Stuff)(const char *text);
+        void (*Cmd_Execute)(int execWhen, const char *text);
+        void (*Cmd_TokenizeString)(const char *textIn);
 
-    // =========== client specific functions ===============
+        // a -1 return means the file does not exist
+        // NULL can be passed for buf to just determine existance
+        long (*FS_ReadFile)(const char *name, void **buf, qboolean quiet);
+        void (*FS_FreeFile)(void *buf);
+        int (*FS_WriteFile)(const char *qpath, const void *buffer, int size);
+        void (*FS_WriteTextFile)(const char *qpath, const void *buffer, int size);
+        char** (*FS_ListFilteredFiles)(const char* path, const char* extension, const char* filter, qboolean wantSubs, int* numfiles, qboolean allowNonPureFilesOnDisk);
+        void (*FS_FreeFileList)(char **list);
+        // add commands to the local console as if they were typed in
+        // for map changing, etc.  The command is not executed immediately,
+        // but will be executed in order the next time console commands
+        // are processed
+        void (*SendConsoleCommand)(const char *text);
 
-    // send a string to the server over the network
-   int          (*MSG_ReadBits)(int bits);
-   int          (*MSG_ReadChar)();
-   int          (*MSG_ReadByte)();
-   int          (*MSG_ReadSVC)();
-   int          (*MSG_ReadShort)();
-   int          (*MSG_ReadLong)();
-   float        (*MSG_ReadFloat)();
-   char*        (*MSG_ReadString)();
-   char*        (*MSG_ReadStringLine)();
-   float        (*MSG_ReadAngle8)();
-   float        (*MSG_ReadAngle16)();
-   void         (*MSG_ReadData)(void* data, int len);
-   float        (*MSG_ReadCoord)();
-   void         (*MSG_ReadDir)(vec3_t dir);
-    void        (*SendClientCommand)( const char *s );
+        // =========== client specific functions ===============
 
-   // CM functions
-    void           (*CM_LoadMap)( const char *name );
-    clipHandle_t   (*CM_InlineModel)( int index );        // 0 = world, 1+ = bmodels
-    int               (*CM_NumInlineModels)( void );
-    int               (*CM_PointContents)( const vec3_t p, int headnode );
-    int               (*CM_TransformedPointContents)(const vec3_t p, clipHandle_t model, const vec3_t origin, const vec3_t angles);
-    void            (*CM_BoxTrace)( trace_t *results, const vec3_t start, const vec3_t end,
-                                          const vec3_t mins, const vec3_t maxs,
-                                          int headnode, int brushmask, qboolean cylinder );
-   void             (*CM_TransformedBoxTrace)( trace_t *results, const vec3_t start, const vec3_t end,
-                                                    const vec3_t mins, const vec3_t maxs,
-                                                    int headnode, int brushmask,
-                                                   const vec3_t origin, const vec3_t angles, 
-                                             qboolean cylinder
-                                           );
-   clipHandle_t   (*CM_TempBoxModel)( const vec3_t mins, const vec3_t maxs, int contents );
-   void         (*CM_PrintBSPFileSizes)();
-   qboolean     (*CM_LeafInPVS)(int leaf1, int leaf2);
-   int          (*CM_PointLeafnum)(const vec3_t p);
-   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 );
+        // send a string to the server over the network
+        int (*MSG_ReadBits)(int bits);
+        int (*MSG_ReadChar)();
+        int (*MSG_ReadByte)();
+        int (*MSG_ReadSVC)();
+        int (*MSG_ReadShort)();
+        int (*MSG_ReadLong)();
+        float (*MSG_ReadFloat)();
+        char *(*MSG_ReadString)();
+        char *(*MSG_ReadStringLine)();
+        float (*MSG_ReadAngle8)();
+        float (*MSG_ReadAngle16)();
+        void (*MSG_ReadData)(void *data, int len);
+        float (*MSG_ReadCoord)();
+        void (*MSG_ReadDir)(vec3_t dir);
+        void (*SendClientCommand)(const char *s);
 
-   void     (*R_GetInlineModelBounds)(int index, vec3_t mins, vec3_t maxs);
-   void     (*R_GetLightingForDecal)(vec3_t light, vec3_t facing, vec3_t origin);
-   void     (*R_GetLightingForSmoke)(vec3_t light, vec3_t origin);
-   int      (*R_GatherLightSources)(const vec3_t pos, vec3_t* lightPos, vec3_t* lightIntensity, int maxLights);
+        // CM functions
+        void (*CM_LoadMap)(const char *name, int* checksum);
+        clipHandle_t (*CM_InlineModel)(int index); // 0 = world, 1+ = bmodels
+        int (*CM_NumInlineModels)(void);
+        int (*CM_PointContents)(const vec3_t p, int headnode);
+        int (*CM_TransformedPointContents)(
+            const vec3_t p, clipHandle_t model, const vec3_t origin, const vec3_t angles
+        );
+        void (*CM_BoxTrace)(
+            trace_t     *results,
+            const vec3_t start,
+            const vec3_t end,
+            const vec3_t mins,
+            const vec3_t maxs,
+            int          headnode,
+            int          brushmask,
+            qboolean     cylinder
+        );
+        void (*CM_TransformedBoxTrace)(
+            trace_t     *results,
+            const vec3_t start,
+            const vec3_t end,
+            const vec3_t mins,
+            const vec3_t maxs,
+            int          headnode,
+            int          brushmask,
+            const vec3_t origin,
+            const vec3_t angles,
+            qboolean     cylinder
+        );
+        clipHandle_t (*CM_TempBoxModel)(const vec3_t mins, const vec3_t maxs, int contents);
+        void (*CM_PrintBSPFileSizes)();
+        qboolean (*CM_LeafInPVS)(int leaf1, int leaf2);
+        int (*CM_PointLeafnum)(const vec3_t p);
+        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
+        );
 
-    // =========== sound function calls ===============
+        void (*R_GetInlineModelBounds)(int index, vec3_t mins, vec3_t maxs);
+        void (*R_GetLightingForDecal)(vec3_t light, const vec3_t facing, const vec3_t origin);
+        void (*R_GetLightingForSmoke)(vec3_t light, const vec3_t origin);
+        int (*R_GatherLightSources)(const vec3_t pos, vec3_t *lightPos, vec3_t *lightIntensity, int maxLights);
 
-    void             (*S_StartSound)(const vec3_t origin, int entNum, int entChannel, sfxHandle_t sfxHandle, float volume, float minDist, float pitch, float maxDist, int streamed);
-    void             (*S_StartLocalSound)(const char* soundName, qboolean forceLoad);
-    void             (*S_StopSound)( int entnum, int channel );
-    void             (*S_ClearLoopingSounds)(void);
-    void             (*S_AddLoopingSound)(const vec3_t origin, const vec3_t velocity, sfxHandle_t sfxHandle, float volume, float minDist, float maxDist, float pitch, int flags);
-    void             (*S_Respatialize)( int entityNum, const vec3_t origin, vec3_t axis[3] );
-    void             (*S_BeginRegistration)( void );
-    sfxHandle_t        (*S_RegisterSound)( const char *sample, int streamed );
-    void             (*S_EndRegistration)( void );
-    void                (*S_UpdateEntity)( int entityNum, const vec3_t origin, const vec3_t velocity, qboolean use_listener );
-    void                (*S_SetReverb)( int reverb_type, float reverb_level );
-   void           (*S_SetGlobalAmbientVolumeLevel)( float volume );
-   float        (*S_GetSoundTime)(sfxHandle_t handle);
-   int          (*S_ChannelNameToNum)(const char* name);
-   const char*  (*S_ChannelNumToName)(int channel);
-   int          (*S_IsSoundPlaying)(int channelNumber, const char* name);
+        // =========== sound function calls ===============
 
-    // =========== music function calls ===============
+        void (*S_StartSound)(
+            const vec3_t origin,
+            int          entNum,
+            int          entChannel,
+            sfxHandle_t  sfxHandle,
+            float        volume,
+            float        minDist,
+            float        pitch,
+            float        maxDist,
+            int          streamed
+        );
+        void (*S_StartLocalSound)(const char *soundName, qboolean forceLoad);
+        void (*S_StopSound)(int entnum, int channel);
+        void (*S_ClearLoopingSounds)(void);
+        void (*S_AddLoopingSound)(
+            const vec3_t origin,
+            const vec3_t velocity,
+            sfxHandle_t  sfxHandle,
+            float        volume,
+            float        minDist,
+            float        maxDist,
+            float        pitch,
+            int          flags
+        );
+        void (*S_Respatialize)(int entityNum, const vec3_t origin, vec3_t axis[3]);
+        void (*S_BeginRegistration)(void);
+        sfxHandle_t (*S_RegisterSound)(const char *sample, int streamed);
+        void (*S_EndRegistration)(void);
+        void (*S_UpdateEntity)(int entityNum, const vec3_t origin, const vec3_t velocity, qboolean use_listener);
+        void (*S_SetReverb)(int reverb_type, float reverb_level);
+        void (*S_SetGlobalAmbientVolumeLevel)(float volume);
+        float (*S_GetSoundTime)(sfxHandle_t handle);
+        int (*S_ChannelNameToNum)(const char *name);
+        const char *(*S_ChannelNumToName)(int channel);
+        int (*S_IsSoundPlaying)(int channelNumber, const char *name);
 
-    void            (*MUSIC_NewSoundtrack)( const char *name );
-    void            (*MUSIC_UpdateMood)( int current_mood, int fallback_mood );
-    void            (*MUSIC_UpdateVolume)( float volume, float fade_time );
+        // =========== music function calls ===============
 
-    // =========== camera function calls ===============
+        void (*MUSIC_NewSoundtrack)(const char *name);
+        void (*MUSIC_UpdateMood)(int current_mood, int fallback_mood);
+        void (*MUSIC_UpdateVolume)(float volume, float fade_time);
 
-    float *          (*get_camera_offset)( qboolean *lookactive, qboolean *resetview );
+        // =========== camera function calls ===============
 
-    // =========== renderer function calls ================
-   void           (*R_ClearScene)( void );
-   void           (*R_RenderScene)( const refdef_t *fd );
-   void             (*R_LoadWorldMap)(const char* mapname);
-   void             (*R_PrintBSPFileSizes)();
-   int              (*MapVersion)();
-   int              (*R_MapVersion)();
-   qhandle_t    (*R_RegisterModel)( const char *name );
-   qhandle_t    (*R_SpawnEffectModel)(const char* name, vec3_t pos, vec3_t axis[3]);
-   qhandle_t    (*R_RegisterServerModel)(const char* name);
-   void         (*R_UnregisterServerModel)(qhandle_t hModel);
-    qhandle_t      (*R_RegisterSkin)( const char *name );
-    qhandle_t      (*R_RegisterShader)( const char *name );
-    qhandle_t      (*R_RegisterShaderNoMip)( const char *name );
-   void           (*R_AddRefEntityToScene)(const refEntity_t *ent, int parentEntityNumber );
-   void           (*R_AddRefSpriteToScene)(const refEntity_t *ent );
-   void           (*R_AddLightToScene)(const vec3_t origin, float intensity, float r, float g, float b, int type );
-   qboolean       (*R_AddPolyToScene)(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-   void             (*R_AddTerrainMarkToScene)(int terrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderFx);
-    void             (*R_SetColor)( const vec4_t rgba );    // NULL = 1,1,1,1
-    void             (*R_DrawStretchPic) ( float x, float y, float w, float h, 
-                                          float s1, float t1, float s2, float t2, 
-                                        qhandle_t hShader );    // 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);
-   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 );
-   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 =============
-   void           (*R_SwipeBegin) ( float thistime, float life, qhandle_t shader );
-   void           (*R_SwipePoint) ( vec3_t p1, vec3_t p2, float time );
-   void           (*R_SwipeEnd) ( void );
-   int            (*R_GetShaderWidth)( qhandle_t shader );
-   int            (*R_GetShaderHeight)( qhandle_t shader );
-   void           (*R_DrawBox)( float x, float y, float w, float h );
+        float *(*get_camera_offset)(qboolean *lookactive, qboolean *resetview);
 
-    // =========== data shared with the client =============
-    void             (*GetGameState)( gameState_t *gamestate );
-    int             (*GetSnapshot)( int snapshotNumber, snapshot_t *snapshot );
-    int             (*GetServerStartTime)();
-    void            (*SetTime)(int time);
-   void              (*GetCurrentSnapshotNumber)( int *snapshotNumber, int *serverTime );
-   void              (*GetGlconfig)( glconfig_t *glconfig );
+        // =========== renderer function calls ================
+        void (*R_ClearScene)(void);
+        void (*R_RenderScene)(const refdef_t *fd);
+        void (*R_LoadWorldMap)(const char *mapname);
+        void (*R_PrintBSPFileSizes)();
+        int (*MapVersion)();
+        int (*R_MapVersion)();
+        qhandle_t (*R_RegisterModel)(const char *name);
+        qhandle_t (*R_SpawnEffectModel)(const char *name, vec3_t pos, vec3_t axis[3]);
+        qhandle_t (*R_RegisterServerModel)(const char *name);
+        const char * (*R_GetModelName)(qhandle_t hModel);
+        void (*R_UnregisterServerModel)(qhandle_t hModel);
+        qhandle_t (*R_RegisterShader)(const char *name);
+        qhandle_t (*R_RegisterShaderNoMip)(const char *name);
+        const char* (*R_GetShaderName)(qhandle_t hShader);
+        void (*R_AddRefEntityToScene)(const refEntity_t *ent, int parentEntityNumber);
+        void (*R_AddRefSpriteToScene)(const refEntity_t *ent);
+        void (*R_AddLightToScene)(const vec3_t origin, float intensity, float r, float g, float b, int type);
+        qboolean (*R_AddPolyToScene)(qhandle_t hShader, int numVerts, const polyVert_t *verts, int renderfx);
+        void (*R_AddTerrainMarkToScene)(
+            int terrainIndex, qhandle_t hShader, int numVerts, const polyVert_t *verts, int renderFx
+        );
+        void (*R_SetColor)(const vec4_t rgba); // NULL = 1,1,1,1
+        void (*R_DrawStretchPic)(
+            float     x,
+            float     y,
+            float     w,
+            float     h,
+            float     s1,
+            float     t1,
+            float     s2,
+            float     t2,
+            qhandle_t hShader
+        ); // 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
+        );
+        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);
+        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 =============
+        void (*R_SwipeBegin)(float thistime, float life, qhandle_t shader);
+        void (*R_SwipePoint)(vec3_t p1, vec3_t p2, float time);
+        void (*R_SwipeEnd)(void);
+        int (*R_GetShaderWidth)(qhandle_t shader);
+        int (*R_GetShaderHeight)(qhandle_t shader);
+        void (*R_DrawBox)(float x, float y, float w, float h);
 
-    // will return false if the number is so old that it doesn't exist in the buffer anymore
-    qboolean          (*GetParseEntityState)( int parseEntityNumber, entityState_t *state );
-    int              (*GetCurrentCmdNumber)( void );        // returns the most recent command number
-                                                                  // which is the local predicted command for
-                                                                  // the following frame
-    qboolean          (*GetUserCmd)( int cmdNumber, usercmd_t *ucmd );
-    qboolean          (*GetServerCommand)(int serverCommandNumber, qboolean differentServer);
+        // =========== data shared with the client =============
+        void (*GetGameState)(gameState_t *gamestate);
+        int (*GetSnapshot)(int snapshotNumber, snapshot_t *snapshot);
+        int (*GetServerStartTime)();
+        void (*SetTime)(int time);
+        void (*GetCurrentSnapshotNumber)(int *snapshotNumber, int *serverTime);
+        void (*GetGlconfig)(glconfig_t *glconfig);
 
-   // ALIAS STUFF
-   qboolean            (*Alias_Add)( const char * alias, const char * name, const char *parameters );
-   qboolean         (*Alias_ListAdd)(AliasList_t* list, const char* alias, const char* name, const char* parameters);
-   const char*      (*Alias_FindRandom)(const char* alias, AliasListNode_t **ret);
-   const char*      (*Alias_ListFindRandom)(AliasList_t* list, const char* alias, AliasListNode_t** ret);
-   void                (*Alias_Dump)( void );
-   void                (*Alias_Clear)( void );
-   AliasList_t*     (*AliasList_New)(const char* name);
-   void             (*Alias_ListFindRandomRange)(AliasList_t* list, const char* alias, int* minIndex, int* maxIndex, float* totalWeight);
-   AliasList_t*     (*Alias_GetGlobalList)();
+        // will return false if the number is so old that it doesn't exist in the buffer anymore
+        qboolean (*GetParseEntityState)(int parseEntityNumber, entityState_t *state);
+        int (*GetCurrentCmdNumber)(void); // returns the most recent command number
+                                          // which is the local predicted command for
+                                          // the following frame
+        qboolean (*GetUserCmd)(int cmdNumber, usercmd_t *ucmd);
+        qboolean (*GetServerCommand)(int serverCommandNumber, qboolean differentServer);
 
-   // ==================== UI STUFF ==========================
-   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);
+        // ALIAS STUFF
+        qboolean (*Alias_Add)(const char *alias, const char *name, const char *parameters);
+        qboolean (*Alias_ListAdd)(AliasList_t *list, const char *alias, const char *name, const char *parameters);
+        const char *(*Alias_FindRandom)(const char *alias, AliasListNode_t **ret);
+        const char *(*Alias_ListFindRandom)(AliasList_t *list, const char *alias, AliasListNode_t **ret);
+        void (*Alias_Dump)(void);
+        void (*Alias_Clear)(void);
+        AliasList_t *(*AliasList_New)(const char *name);
+        void (*Alias_ListFindRandomRange)(
+            AliasList_t *list, const char *alias, int *minIndex, int *maxIndex, float *totalWeight
+        );
+        AliasList_t *(*Alias_GetGlobalList)();
 
-   int              (*Key_StringToKeynum)(const char* str);
-   const char*      (*Key_KeynumToBindString)(int keyNum);
-   void             (*Key_GetKeysForCommand)(const char* command, int* key1, int* key2);
+        // ==================== UI STUFF ==========================
+        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);
 
-   // ==================== TIKI STUFF ==========================
-   // TIKI SPECIFIC STUFF
-   dtiki_t*         (*R_Model_GetHandle)(qhandle_t handle);
-   int              (*TIKI_NumAnims)(dtiki_t* pmdl);
-   void             (*TIKI_CalculateBounds)(dtiki_t* pmdl, float scale, vec3_t mins, vec3_t maxs);
-   const char*      (*TIKI_Name)(dtiki_t* tiki);
-   void*            (*TIKI_GetSkeletor)(dtiki_t* tiki, int entNum);
-   void             (*TIKI_SetEyeTargetPos)(dtiki_t* tiki, int entNum, vec3_t pos);
+        int (*Key_StringToKeynum)(const char *str);
+        const char *(*Key_KeynumToBindString)(int keyNum);
+        void (*Key_GetKeysForCommand)(const char *command, int *key1, int *key2);
 
-   // ANIM SPECIFIC STUFF
-   const char *   (*Anim_NameForNum) (dtiki_t* tiki, int animnum );
-   int                (*Anim_NumForName) (dtiki_t* tiki, const char * name );
-   int                (*Anim_Random) (dtiki_t* tiki, const char * name );
-   int                (*Anim_NumFrames) (dtiki_t* tiki, int animnum );
-   float                (*Anim_Time) (dtiki_t* tiki, int animnum);
-   float                (*Anim_Frametime) (dtiki_t* tiki, int animnum);
-   void                (*Anim_Delta) (dtiki_t* tiki, int animnum, vec3_t delta );
-   int                (*Anim_Flags) (dtiki_t* tiki, int animnum);
-   int                (*Anim_FlagsSkel) (dtiki_t* tiki, int animnum);
-   float                (*Anim_CrossblendTime) (dtiki_t* tiki, int animnum );
-   qboolean            (*Anim_HasCommands) (dtiki_t* tiki, int animnum );
+        // ==================== TIKI STUFF ==========================
+        // TIKI SPECIFIC STUFF
+        dtiki_t *(*R_Model_GetHandle)(qhandle_t handle);
+        int (*TIKI_NumAnims)(dtiki_t *pmdl);
+        void (*TIKI_CalculateBounds)(dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs);
+        const char *(*TIKI_Name)(dtiki_t *tiki);
+        void *(*TIKI_GetSkeletor)(dtiki_t *tiki, int entNum);
+        void (*TIKI_SetEyeTargetPos)(dtiki_t *tiki, int entNum, vec3_t pos);
 
-   // FRAME SPECIFIC STUFF
-   qboolean       (*Frame_Commands) (dtiki_t* tiki, int animnum, int framenum, tiki_cmd_t * tiki_cmd );
-   qboolean       (*Frame_CommandsTime) (dtiki_t* tiki, int animnum, float start, float end, tiki_cmd_t * tiki_cmd );
+        // ANIM SPECIFIC STUFF
+        const char *(*Anim_NameForNum)(dtiki_t *tiki, int animnum);
+        int (*Anim_NumForName)(dtiki_t *tiki, const char *name);
+        int (*Anim_Random)(dtiki_t *tiki, const char *name);
+        int (*Anim_NumFrames)(dtiki_t *tiki, int animnum);
+        float (*Anim_Time)(dtiki_t *tiki, int animnum);
+        float (*Anim_Frametime)(dtiki_t *tiki, int animnum);
+        void (*Anim_Delta)(dtiki_t *tiki, int animnum, vec3_t delta);
+        int (*Anim_Flags)(dtiki_t *tiki, int animnum);
+        int (*Anim_FlagsSkel)(dtiki_t *tiki, int animnum);
+        float (*Anim_CrossblendTime)(dtiki_t *tiki, int animnum);
+        qboolean (*Anim_HasCommands)(dtiki_t *tiki, int animnum);
 
-   // SURFACE SPECIFIC STUFF
-   int                (*Surface_NameToNum) (dtiki_t* tiki, const char * name );
-   //const char *   (*Surface_NumToName) (dtiki_t* tiki, int num );
-   //int                (*Surface_Flags) (dtiki_t* tiki, int num );
-   //int                (*Surface_NumSkins) (dtiki_t* tiki, int num );
+        // FRAME SPECIFIC STUFF
+        qboolean (*Frame_Commands)(dtiki_t *tiki, int animnum, int framenum, tiki_cmd_t *tiki_cmd);
+        qboolean (*Frame_CommandsTime)(dtiki_t *tiki, int animnum, float start, float end, tiki_cmd_t *tiki_cmd);
 
-   // TAG SPECIFIC STUFF
-   int                (*Tag_NumForName) (dtiki_t* tiki, const char * name );
-   const char *   (*Tag_NameForNum) (dtiki_t* tiki, int num );
-   void (*ForceUpdatePose)(refEntity_t* model);
-   orientation_t (*TIKI_Orientation)(refEntity_t* model, int tagNum);
-   qboolean (*TIKI_IsOnGround)(refEntity_t* model, int tagNum, float threshold);
+        // SURFACE SPECIFIC STUFF
+        int (*Surface_NameToNum)(dtiki_t *tiki, const char *name);
+        //const char *   (*Surface_NumToName) (dtiki_t* tiki, int num );
+        //int                (*Surface_Flags) (dtiki_t* tiki, int num );
+        //int                (*Surface_NumSkins) (dtiki_t* tiki, int num );
 
-   // MISCELLANEOUS SPECIFIC STUFF
-   void (*UI_ShowScoreBoard)(const char* menuName);
-   void (*UI_HideScoreBoard)();
-   void (*UI_SetScoreBoardItem)(int itemNumber, const char* data1,
-                                const char* data2, const char* data3,
-                                const char* data4, const char* data5,
-                                const char* data6, const char* data7,
-                                const char* data8, const vec4_t textColor,
-                                const vec4_t backColor, qboolean isHeader);
-   void (*UI_DeleteScoreBoardItems)(int maxIndex);
-   void (*UI_ToggleDMMessageConsole)(int consoleMode);
-   dtiki_t* (*TIKI_FindTiki)(const char* path);
-   void (*LoadResource)(const char* name);
-   void (*FS_CanonicalFilename)(char* name);
+        // TAG SPECIFIC STUFF
+        int (*Tag_NumForName)(dtiki_t *tiki, const char *name);
+        const char *(*Tag_NameForNum)(dtiki_t *tiki, int num);
+        void (*ForceUpdatePose)(refEntity_t *model);
+        orientation_t (*TIKI_Orientation)(refEntity_t *model, int tagNum);
+        qboolean (*TIKI_IsOnGround)(refEntity_t *model, int tagNum, float threshold);
 
-   cvar_t* fsDebug;
-   hdelement_t* HudDrawElements;
-   clientAnim_t* anim;
-   stopWatch_t* stopWatch;
+        // MISCELLANEOUS SPECIFIC STUFF
+        void (*UI_ShowScoreBoard)(const char *menuName);
+        void (*UI_HideScoreBoard)();
+        void (*UI_SetScoreBoardItem)(
+            int          itemNumber,
+            const char  *data1,
+            const char  *data2,
+            const char  *data3,
+            const char  *data4,
+            const char  *data5,
+            const char  *data6,
+            const char  *data7,
+            const char  *data8,
+            const vec4_t textColor,
+            const vec4_t backColor,
+            qboolean     isHeader
+        );
+        void (*UI_DeleteScoreBoardItems)(int maxIndex);
+        void (*UI_ToggleDMMessageConsole)(int consoleMode);
+        void (*CL_InitRadar)(radarClient_t* radars, qhandle_t* shaders, int clientNum); // Added in 2.0
+        dtiki_t *(*TIKI_FindTiki)(const char *path);
+        void (*LoadResource)(const char *name);
+        void (*FS_CanonicalFilename)(char *name);
+        void (*CL_RestoreSavedCgameState)();
+        void (*CL_ClearSavedCgameState)();
 
-} clientGameImport_t;
+        cvar_t       *fsDebug;
+        hdelement_t  *HudDrawElements;
+        clientAnim_t *anim;
+        stopWatch_t  *stopWatch;
 
+    } clientGameImport_t;
 
-/*
+    /*
 ==================================================================
 
 functions exported to the main executable
@@ -371,54 +445,84 @@ functions exported to the main executable
 ==================================================================
 */
 
-typedef struct {
-    void     (*CG_Init)( clientGameImport_t *imported, int serverMessageNum, int serverCommandSequence, int clientNum );
-   void     (*CG_Shutdown)( void );
-   void     (*CG_DrawActiveFrame)( int serverTime, int frameTime, stereoFrame_t stereoView, qboolean demoPlayback );
-   qboolean (*CG_ConsoleCommand)( void );
-   void     (*CG_GetRendererConfig)( void );
-   void     (*CG_Draw2D)( void );
-   void     (*CG_EyePosition)(vec3_t* eyePos);
-   void     (*CG_EyeOffset)(vec3_t* eyeOffset);
-   void     (*CG_EyeAngles)(vec3_t* eyeAngles);
-   float    (*CG_SensitivityScale)();
-   void     (*CG_ParseCGMessage)();
-   void     (*CG_RefreshHudDrawElements)();
-   void     (*CG_HudDrawShader)(int info);
-   void     (*CG_HudDrawFont)(int info);
-   int      (*CG_GetParent)(int entNum);
-   float    (*CG_GetObjectiveAlpha)();
-   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_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);
-   void     (*CG_EndTiki)(dtiki_t* tiki);
-   const char*    (*CG_GetColumnName)(int columnNum, int* columnWidth);
-   void     (*CG_GetScoreBoardColor)(float* red, float* green, float* blue, float* alpha);
-   void     (*CG_GetScoreBoardFontColor)(float* red, float* green, float* blue, float* alpha);
-   int      (*CG_GetScoreBoardDrawHeader)();
-   void     (*CG_GetScoreBoardPosition)(float* x, float* y, float* width, float* height);
-   int      (*CG_WeaponCommandButtonBits)();
-   int      (*CG_CheckCaptureKey)(int key, qboolean down, unsigned int time);
+    typedef struct {
+        void (*CG_Init)(clientGameImport_t *imported, int serverMessageNum, int serverCommandSequence, int clientNum);
+        void (*CG_Shutdown)(void);
+        void (*CG_DrawActiveFrame)(int serverTime, int frameTime, stereoFrame_t stereoView, qboolean demoPlayback);
+        qboolean (*CG_ConsoleCommand)(void);
+        void (*CG_GetRendererConfig)(void);
+        void (*CG_Draw2D)(void);
+        void (*CG_EyePosition)(vec3_t *eyePos);
+        void (*CG_EyeOffset)(vec3_t *eyeOffset);
+        void (*CG_EyeAngles)(vec3_t *eyeAngles);
+        float (*CG_SensitivityScale)();
+        void (*CG_ParseCGMessage)();
+        void (*CG_RefreshHudDrawElements)();
+        void (*CG_HudDrawShader)(int info);
+        void (*CG_HudDrawFont)(int info);
+        int (*CG_GetParent)(int entNum);
+        float (*CG_GetObjectiveAlpha)();
+        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_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);
+        void (*CG_EndTiki)(dtiki_t *tiki);
+        const char *(*CG_GetColumnName)(int columnNum, int *columnWidth);
+        void (*CG_GetScoreBoardColor)(float *red, float *green, float *blue, float *alpha);
+        void (*CG_GetScoreBoardFontColor)(float *red, float *green, float *blue, float *alpha);
+        int (*CG_GetScoreBoardDrawHeader)();
+        void (*CG_GetScoreBoardPosition)(float *x, float *y, float *width, float *height);
+        int (*CG_WeaponCommandButtonBits)();
+        int (*CG_CheckCaptureKey)(int key, qboolean down, unsigned int time);
 
-   // FIXME
-   //prof_cgame_t* profStruct;
+        //
+        // Added in 2.0
+        //
+		void (*CG_ReadNonPVSClient)(radarUnpacked_t* radarUnpacked);
+		void (*CG_UpdateRadar)();
+		size_t (*CG_SaveStateToBuffer)(void** out, int svsTime);
+		qboolean (*CG_LoadStateToBuffer)(void* state, size_t size, int svsTime);
+		void (*CG_CleanUpTempModels)();
 
-   qboolean (*CG_Command_ProcessFile)(const char* name, qboolean quiet, dtiki_t* curTiki);
+        // FIXME
+        //prof_cgame_t* profStruct;
 
-} clientGameExport_t;
+        qboolean (*CG_Command_ProcessFile)(const char *name, qboolean quiet, dtiki_t *curTiki);
+
+    } clientGameExport_t;
 
 #ifdef CGAME_DLL
-#ifdef WIN32
-__declspec(dllexport)
-#else
-__attribute__((visibility("default")))
+#    ifdef WIN32
+    __declspec(dllexport)
+#    else
+    __attribute__((visibility("default")))
+#    endif
 #endif
-#endif
-clientGameExport_t* GetCGameAPI(void);
+        clientGameExport_t *GetCGameAPI(void);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __CG_PUBLIC_H__

code/cgame/cg_radar.cpp

@@ -0,0 +1,168 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cg_local.h"
+#include "cg_radar.h"
+
+void CG_InitRadar()
+{
+	int i;
+
+	cg.radarShaders[0] = cgi.R_RegisterShader("textures/hud/radar_allies.tga");
+	cg.radarShaders[1] = cgi.R_RegisterShader("textures/hud/radar_axis.tga");
+
+	for (i = 0; i < MAX_CLIENTS; i++)
+	{
+		cg.radars[i].time = 0;
+		cg.radars[i].lastSpeakTime = 0;
+	}
+
+	cgi.CL_InitRadar(cg.radars, cg.radarShaders, cg.snap->ps.clientNum);
+}
+
+bool CG_InTeamGame(centity_t *ent)
+{
+	return ent->currentState.solid && cg.clientinfo[ent->currentState.number].team;
+}
+
+bool CG_SameTeam(centity_t *ent)
+{
+	return cg.clientinfo[ent->currentState.number].team == cg.clientinfo[cg.snap->ps.clientNum].team;
+}
+
+bool CG_IsTeamGame()
+{
+	return cgs.gametype >= GT_TEAM;
+}
+
+bool CG_ValidRadarClient(centity_t *ent)
+{
+	if (!cg.snap) {
+		return qfalse;
+	}
+
+	if (!CG_IsTeamGame()) {
+		return false;
+	}
+
+	if (!CG_InTeamGame(&cg_entities[cg.snap->ps.clientNum])) {
+		return false;
+	}
+
+	if (!CG_InTeamGame(ent)) {
+		return false;
+	}
+
+	return CG_SameTeam(ent);
+}
+
+int CG_RadarIcon()
+{
+	switch (cg.clientinfo[cg.snap->ps.clientNum].team)
+	{
+	case TEAM_ALLIES:
+		return 0;
+	default:
+	case TEAM_AXIS:
+		return 1;
+	}
+}
+
+void CG_UpdateRadarClient(centity_t* ent)
+{
+	radarClient_t* radar;
+
+	radar = &cg.radars[ent->currentState.number];
+	if (!CG_ValidRadarClient(ent)) {
+		radar->time = 0;
+		return;
+	}
+
+	radar->time = cg.time;
+	radar->teamShader = CG_RadarIcon();
+	if (cg.snap->ps.clientNum == ent->currentState.number)
+	{
+		radar->origin[0] = cg.refdef.vieworg[0];
+		radar->origin[1] = cg.refdef.vieworg[1];
+		radar->axis[0] = cg.refdef.viewaxis[0][0];
+		radar->axis[1] = cg.refdef.viewaxis[0][1];
+		VectorNormalize2D(radar->axis);
+	}
+	else
+	{
+		float axis[2];
+
+		radar->origin[0] = ent->currentState.origin[0];
+		radar->origin[1] = ent->currentState.origin[1];
+		YawToAxis(ent->currentState.angles[1], axis);
+
+		radar->axis[0] = axis[0];
+		radar->axis[1] = axis[1];
+		VectorNormalize2D(radar->axis);
+	}
+}
+
+void CG_ReadNonPVSClient(radarUnpacked_t* radarUnpacked)
+{
+	radarClient_t* radar;
+	float axis[2];
+
+	if (!CG_ValidRadarClient(&cg_entities[radarUnpacked->clientNum])) {
+		return;
+	}
+
+	radar = &cg.radars[radarUnpacked->clientNum];
+	radar->time = cg.time;
+	radar->teamShader = CG_RadarIcon();
+	// copy origin
+	radar->origin[0] = radarUnpacked->x;
+	radar->origin[1] = radarUnpacked->y;
+	// copy yaw
+	YawToAxis(radarUnpacked->yaw, axis);
+	radar->axis[0] = axis[0];
+	radar->axis[1] = axis[1];
+	VectorNormalize2D(radar->axis);
+}
+
+void CG_UpdateRadar()
+{
+	int i;
+
+	for (i = 0; i < MAX_CLIENTS; i++)
+	{
+		if (cg.radars[i].time)
+		{
+			if (!CG_ValidRadarClient(&cg_entities[i])) {
+				cg.radars[i].time = 0;
+			}
+		}
+	}
+}
+
+void CG_RadarClientSpeaks(int num)
+{
+	if (!CG_ValidRadarClient(&cg_entities[num])) {
+		return;
+	}
+
+	cg.radars[num].lastSpeakTime = cg.time;
+}

code/cgame/cg_radar.h

@@ -1,38 +1,42 @@
 /*
 ===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2023 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 Foobar; 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
 ===========================================================================
 */
-#if !( defined __linux__ || defined __FreeBSD__ )
-#error You should include this file only on Linux/FreeBSD platforms
+
+// DESCRIPTION:
+// Radar client
+
+#pragma once
+
+#include "cg_local.h"
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-#ifndef __GLW_LINUX_H__
-#define __GLW_LINUX_H__
-
-typedef struct
-{
-	void *OpenGLLib; // instance of OpenGL library
-
-	FILE *log_fp;
-} glwstate_t;
-
-extern glwstate_t glw_state;
+void CG_InitRadar();
+void CG_UpdateRadarClient(centity_t* ent);
+void CG_ReadNonPVSClient(radarUnpacked_t* radarUnpacked);
+void CG_UpdateRadar();
+void CG_RadarClientSpeaks(int num);
 
+#ifdef __cplusplus
+}
 #endif

code/cgame/cg_servercmds.c

@@ -24,12 +24,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // cg_servercmds.c -- text commands sent by the server
 
 #include "cg_local.h"
+#include "../fgame/bg_voteoptions.h"
 
-static const char* IsWeaponAllowed(int dmFlags, int flags) {
+static const char *IsWeaponAllowed(int dmFlags, int flags)
+{
     return (dmFlags & flags) ? "0" : "1";
 }
 
-static qboolean QueryLandminesAllowed2(const char* mapname, int dmflags) {
+static qboolean QueryLandminesAllowed2(const char *mapname, int dmflags)
+{
     if (dmflags & DF_WEAPON_NO_LANDMINE) {
         return qfalse;
     }
@@ -38,43 +41,61 @@ static qboolean QueryLandminesAllowed2(const char* mapname, int dmflags) {
         return qtrue;
     }
 
-	if (!Q_stricmpn(mapname, "obj/obj_", 8u))
-		return qfalse;
-	if (!Q_stricmpn(mapname, "dm/mohdm", 8u))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Bahnhof_DM"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "obj/MP_Ardennes_TOW"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Bazaar_DM"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "obj/MP_Berlin_TOW"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Brest_DM"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "obj/MP_Druckkammern_TOW"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Gewitter_DM"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "obj/MP_Flughafen_TOW"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Holland_DM"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Malta_DM"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Stadt_DM"))
-		return qfalse;
-	if (!Q_stricmp(mapname, "DM/MP_Unterseite_DM"))
-		return qfalse;
-    if (!Q_stricmp(mapname, "DM/MP_Verschneit_DM"))
+    if (!Q_stricmpn(mapname, "obj/obj_", 8u)) {
         return qfalse;
-    if (!Q_stricmp(mapname, "lib/mp_ship_lib"))
+    }
+    if (!Q_stricmpn(mapname, "dm/mohdm", 8u)) {
         return qfalse;
-    if (!Q_stricmp(mapname, "DM/MP_Verschneit_DM"))
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Bahnhof_DM")) {
         return qfalse;
-    if (!Q_stricmp(mapname, "lib/mp_ship_lib"))
+    }
+    if (!Q_stricmp(mapname, "obj/MP_Ardennes_TOW")) {
         return qfalse;
-	return qtrue;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Bazaar_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "obj/MP_Berlin_TOW")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Brest_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "obj/MP_Druckkammern_TOW")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Gewitter_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "obj/MP_Flughafen_TOW")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Holland_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Malta_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Stadt_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Unterseite_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Verschneit_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "lib/mp_ship_lib")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "DM/MP_Verschneit_DM")) {
+        return qfalse;
+    }
+    if (!Q_stricmp(mapname, "lib/mp_ship_lib")) {
+        return qfalse;
+    }
+    return qtrue;
 }
 
 /*
@@ -87,25 +108,26 @@ and whenever the server updates any serverinfo flagged cvars
 */
 void CG_ParseServerinfo(void)
 {
-    const char* info;
-    const char* mapname;
-    char map[MAX_QPATH];
-    char* spawnpos;
-    const char* version;
+    const char *info;
+    const char *mapname;
+    char        map[MAX_QPATH];
+    char       *spawnpos;
+    const char *version;
+    const char *mapChecksumStr;
 
-    info = CG_ConfigString(CS_SERVERINFO);
-    cgs.gametype = atoi(Info_ValueForKey(info, "g_gametype"));
-    cgs.dmflags = atoi(Info_ValueForKey(info, "dmflags"));
-    cgs.teamflags = atoi(Info_ValueForKey(info, "teamflags"));
-    cgs.fraglimit = atoi(Info_ValueForKey(info, "fraglimit"));
-    cgs.timelimit = atoi(Info_ValueForKey(info, "timelimit"));
+    info           = CG_ConfigString(CS_SERVERINFO);
+    cgs.gametype   = atoi(Info_ValueForKey(info, "g_gametype"));
+    cgs.dmflags    = atoi(Info_ValueForKey(info, "dmflags"));
+    cgs.teamflags  = atoi(Info_ValueForKey(info, "teamflags"));
+    cgs.fraglimit  = atoi(Info_ValueForKey(info, "fraglimit"));
+    cgs.timelimit  = atoi(Info_ValueForKey(info, "timelimit"));
     cgs.maxclients = atoi(Info_ValueForKey(info, "sv_maxclients"));
 
     version = Info_ValueForKey(info, "version");
     if (strstr(version, "Spearhead")) {
         cgi.Cvar_Set("g_servertype", "1");
     } else {
-		cgi.Cvar_Set("g_servertype", "2");
+        cgi.Cvar_Set("g_servertype", "2");
     }
 
     cgi.Cvar_Set("cg_gametype", Info_ValueForKey(info, "g_gametype"));
@@ -115,12 +137,23 @@ void CG_ParseServerinfo(void)
     cgi.Cvar_Set("cg_obj_alliedtext1", Info_ValueForKey(info, "g_obj_alliedtext1"));
     cgi.Cvar_Set("cg_obj_alliedtext2", Info_ValueForKey(info, "g_obj_alliedtext2"));
     cgi.Cvar_Set("cg_obj_alliedtext3", Info_ValueForKey(info, "g_obj_alliedtext3"));
-    cgi.Cvar_Set("cg_obj_axistext1", Info_ValueForKey(info, "cg_obj_axistext1"));
-    cgi.Cvar_Set("cg_obj_axistext2", Info_ValueForKey(info, "cg_obj_axistext2"));
-    cgi.Cvar_Set("cg_obj_axistext3", Info_ValueForKey(info, "cg_obj_axistext3"));
+    cgi.Cvar_Set("cg_obj_alliedtext4", Info_ValueForKey(info, "g_obj_alliedtext4"));
+    cgi.Cvar_Set("cg_obj_alliedtext5", Info_ValueForKey(info, "g_obj_alliedtext5"));
+    cgi.Cvar_Set("cg_obj_axistext1", Info_ValueForKey(info, "g_obj_axistext1"));
+    cgi.Cvar_Set("cg_obj_axistext2", Info_ValueForKey(info, "g_obj_axistext2"));
+    cgi.Cvar_Set("cg_obj_axistext3", Info_ValueForKey(info, "g_obj_axistext3"));
+    cgi.Cvar_Set("cg_obj_axistext4", Info_ValueForKey(info, "g_obj_axistext4"));
+    cgi.Cvar_Set("cg_obj_axistext5", Info_ValueForKey(info, "g_obj_axistext5"));
     cgi.Cvar_Set("cg_scoreboardpic", Info_ValueForKey(info, "g_scoreboardpic"));
     cgi.Cvar_Set("cg_scoreboardpicover", Info_ValueForKey(info, "g_scoreboardpicover"));
-    cgs.mapChecksum = atoi(Info_ValueForKey(info, "sv_mapChecksum"));
+    mapChecksumStr = Info_ValueForKey(info, "sv_mapChecksum");
+    if (mapChecksumStr && mapChecksumStr[0]) {
+        cgs.mapChecksum = atoi(mapChecksumStr);
+        cgs.useMapChecksum = qtrue;
+    } else {
+        cgs.mapChecksum = 0;
+        cgs.useMapChecksum = qfalse;
+    }
 
     mapname = Info_ValueForKey(info, "mapname");
 
@@ -142,22 +175,16 @@ void CG_ParseServerinfo(void)
     Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s.bsp", map);
 
     // hide/show huds
-    if (cgs.gametype)
-    {
+    if (cgs.gametype) {
         cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_timelimit\n");
-        if (cgs.fraglimit)
-        {
+        if (cgs.fraglimit) {
             cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_fraglimit\n");
             cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_score\n");
-        }
-        else
-        {
+        } else {
             cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_score\n");
             cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fraglimit\n");
         }
-    }
-    else
-    {
+    } else {
         cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_timelimit\n");
         cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fraglimit\n");
         cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_score\n");
@@ -170,17 +197,13 @@ CG_ConfigStringModified
 
 ================
 */
-static void CG_ConfigStringModified(void)
+static void CG_ConfigStringModified(int num, qboolean modelOnly)
 {
-    int num;
-
-    num = atoi(cgi.Argv(1));
-
     // get the gamestate from the client system, which will have the
     // new configstring already integrated
     cgi.GetGameState(&cgs.gameState);
 
-    CG_ProcessConfigString(num);
+    CG_ProcessConfigString(num, modelOnly);
 }
 
 /*
@@ -219,32 +242,29 @@ CG_Stopwatch_f
 
 ================
 */
-#if TARGET_GAME_PROTOCOL >= 15
-
 static void CG_Stopwatch_f()
 {
-	if (cgi.Argc() < 3) {
-		Com_Error(ERR_DROP, "stopwatch didn't have 2 parameters");
-	}
+    if (cgi.Argc() < 3) {
+        Com_Error(ERR_DROP, "stopwatch didn't have 2 parameters");
+    }
 
-	cgi.stopWatch->iStartTime = atoi(cgi.Argv(1));
-	cgi.stopWatch->iEndTime = cgi.stopWatch->iStartTime + 1000 * atoi(cgi.Argv(2));
+    if (cg_protocol >= PROTOCOL_MOHTA_MIN) {
+        cgi.stopWatch->iStartTime = atoi(cgi.Argv(1));
+
+        if (cgi.Argc() > 3) {
+            cgi.stopWatch->eType = atoi(cgi.Argv(3));
+        } else {
+            // Normal stop watch
+            cgi.stopWatch->eType = SWT_NORMAL;
+        }
+    } else {
+        // The base game has it wrong
+        cgi.stopWatch->iStartTime = 1000 * atoi(cgi.Argv(1));
+    }
+
+    cgi.stopWatch->iEndTime = cgi.stopWatch->iStartTime + 1000 * atoi(cgi.Argv(2));
 }
 
-#else
-
-static void CG_Stopwatch_f()
-{
-	if (cgi.Argc() < 3) {
-		Com_Error(ERR_DROP, "stopwatch didn't have 2 parameters");
-	}
-
-	cgi.stopWatch->iStartTime = 1000 * atoi(cgi.Argv(1));
-	cgi.stopWatch->iEndTime = cgi.stopWatch->iStartTime + 1000 * atoi(cgi.Argv(2));
-}
-
-#endif
-
 /*
 ================
 CG_ServerLag_f
@@ -264,9 +284,9 @@ The string has been tokenized and can be retrieved with
 Cmd_Argc() / Cmd_Argv()
 =================
 */
-static void CG_ServerCommand(void)
+static void CG_ServerCommand(qboolean modelOnly)
 {
-    const char* cmd;
+    const char *cmd;
 
     cmd = cgi.Argv(0);
 
@@ -276,7 +296,11 @@ static void CG_ServerCommand(void)
     }
 
     if (!strcmp(cmd, "cs")) {
-        CG_ConfigStringModified();
+        CG_ConfigStringModified(atoi(cgi.Argv(1)), modelOnly);
+        return;
+    }
+
+    if (modelOnly) {
         return;
     }
 
@@ -286,52 +310,47 @@ static void CG_ServerCommand(void)
             CG_HudPrint_f();
         }
         return;
-    }
-    else if (!strcmp(cmd, "printdeathmsg")) {
-        const char* s1, * s2, * s3, * s4, * s5;
-        const char* result1, * result2;
-        int hudColor;
+    } else if (!strcmp(cmd, "printdeathmsg")) {
+        const char *s1, *s2, * attackerName, * victimName, *type;
+        const char *result1, *result2;
+        int         hudColor;
 
-		result1 = NULL;
-		result2 = NULL;
-		s1 = cgi.Argv(1);
-		s2 = cgi.Argv(2);
-		s3 = cgi.Argv(3);
-		s4 = cgi.Argv(4);
-		s5 = cgi.Argv(5);
+        result1 = NULL;
+        result2 = NULL;
+        s1           = cgi.Argv(1);
+        s2           = cgi.Argv(2);
+        attackerName = cgi.Argv(3);
+        victimName   = cgi.Argv(4);
+        type         = cgi.Argv(5);
 
-        if (*s5 == tolower(*s5)) {
+        if (*type == tolower(*type)) {
             hudColor = 4;
         } else {
-			hudColor = 5;
+            hudColor = 5;
         }
 
-		if (*s1 != 'x')
-			result1 = cgi.LV_ConvertString(s1);
-		if (*s2 != 'x')
-			result2 = cgi.LV_ConvertString(s2);
-		if (tolower(*s5) == 's')
-		{
-			cgi.Printf("%c%s %s\n", hudColor, s4, result1);
-		}
-		else if (tolower(*s5) == 'p')
-		{
-			if (*s2 == 'x')
-				cgi.Printf("%c%s %s %s\n", hudColor, s4, result1, s3);
-			else
-				cgi.Printf("%c%s %s %s%s\n", hudColor, s4, result1, s3, result2);
-		}
-		else if (tolower(*s5) == 'w')
-		{
-			cgi.Printf("%c%s %s\n", hudColor, s4, result1);
-		}
-		else
-		{
-			cgi.Printf("%s", cgi.Argv(1));
-		}
+        if (*s1 != 'x') {
+            result1 = cgi.LV_ConvertString(s1);
+        }
+        if (*s2 != 'x') {
+            result2 = cgi.LV_ConvertString(s2);
+        }
+        if (tolower(*type) == 's') {
+            cgi.Printf("%c%s %s\n", hudColor, victimName, result1);
+        } else if (tolower(*type) == 'p') {
+            if (*s2 == 'x') {
+                cgi.Printf("%c%s %s %s\n", hudColor, victimName, result1, attackerName);
+            } else {
+                cgi.Printf("%c%s %s %s%s\n", hudColor, victimName, result1, attackerName, result2);
+            }
+        } else if (tolower(*type) == 'w') {
+            cgi.Printf("%c%s %s\n", hudColor, victimName, result1);
+        } else {
+            cgi.Printf("%s", cgi.Argv(1));
+        }
         return;
     }
-    
+
     if (!strcmp(cmd, "stufftext")) {
         cgi.Cmd_Stuff(cgi.Argv(1));
         cgi.Cmd_Stuff("\n");
@@ -358,6 +377,28 @@ static void CG_ServerCommand(void)
         return;
     }
 
+    if (!strcmp(cmd, "voteresult")) {
+        cmd = cgi.Argv(1);
+        if (*cmd) {
+            strcmp(cmd, "passed");
+        }
+    }
+
+    if (!strcmp(cmd, "vo0")) {
+        CG_VoteOptions_StartReadFromServer(cgi.Argv(1));
+        return;
+    }
+
+    if (!strcmp(cmd, "vo1")) {
+        CG_VoteOptions_ContinueReadFromServer(cgi.Argv(1));
+        return;
+    }
+
+    if (!strcmp(cmd, "vo2")) {
+        CG_VoteOptions_FinishReadFromServer(cgi.Argv(1));
+        return;
+    }
+
     cgi.Printf("Unknown client game command: %s\n", cmd);
 }
 
@@ -371,9 +412,20 @@ with this this snapshot.
 */
 void CG_ExecuteNewServerCommands(int latestSequence, qboolean differentServer)
 {
+    int lastServerCommandSequence;
+
+    lastServerCommandSequence = cgs.serverCommandSequence;
+
     while (cgs.serverCommandSequence < latestSequence) {
         if (cgi.GetServerCommand(++cgs.serverCommandSequence, differentServer)) {
-            CG_ServerCommand();
+            CG_ServerCommand(qtrue);
+        }
+    }
+
+    cgs.serverCommandSequence = lastServerCommandSequence;
+    while (cgs.serverCommandSequence < latestSequence) {
+        if (cgi.GetServerCommand(++cgs.serverCommandSequence, differentServer)) {
+            CG_ServerCommand(qfalse);
         }
     }
 }

code/cgame/cg_snapshot.c

@@ -23,8 +23,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // DESCRIPTION:
 // things that happen on snapshot transition, not necessarily every
 // single frame
+//
+// ADDITIONS:
+// - CG_TransitionSnapshot() footer: set ps.walking to true if the ps has a ground entity
 
 #include "cg_local.h"
+#include "cg_radar.h"
 #include "tiki.h"
 
 /*
@@ -32,10 +36,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 CG_ResetEntity
 ==================
 */
-static void CG_ResetEntity(centity_t* cent)
+static void CG_ResetEntity(centity_t *cent)
 {
-    dtiki_t* tiki;
-    int i;
+    dtiki_t *tiki;
+    int      i;
 
     VectorCopy(cent->currentState.origin, cent->lerpOrigin);
 
@@ -62,7 +66,7 @@ static void CG_ResetEntity(centity_t* cent)
 
     // Reset splash info
     cent->splash_last_spawn_time = 0;
-    cent->splash_still_count = -1;
+    cent->splash_still_count     = -1;
 
     tiki = cgi.R_Model_GetHandle(cgs.model_draw[cent->currentState.modelindex]);
     // reset client command
@@ -71,7 +75,7 @@ static void CG_ResetEntity(centity_t* cent)
     // reset the animation for the entities
     if (tiki && tiki->a->bIsCharacter) {
         for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            cent->animLast[i] = cent->currentState.frameInfo[i].index;
+            cent->animLast[i]      = cent->currentState.frameInfo[i].index;
             cent->animLastTimes[i] = cent->currentState.frameInfo[i].time;
             if (cent->currentState.frameInfo[i].weight) {
                 cent->animLastWeight |= 1 << i;
@@ -89,8 +93,8 @@ static void CG_ResetEntity(centity_t* cent)
         cent->animLastWeight = 0;
     }
 
-    cent->usageIndexLast = 0;
-    cent->bFootOnGround_Left = qtrue;
+    cent->usageIndexLast      = 0;
+    cent->bFootOnGround_Left  = qtrue;
     cent->bFootOnGround_Right = qtrue;
 
     if (cent->currentState.eType == ET_PLAYER) {
@@ -105,7 +109,7 @@ CG_TransitionEntity
 cent->nextState is moved to cent->currentState and events are fired
 ===============
 */
-static void CG_TransitionEntity(centity_t* cent)
+static void CG_TransitionEntity(centity_t *cent)
 {
     cent->currentState = cent->nextState;
     cent->currentValid = qtrue;
@@ -134,11 +138,11 @@ on tourney restarts.  All other times will use
 CG_TransitionSnapshot instead.
 ==================
 */
-void CG_SetInitialSnapshot(snapshot_t* snap)
+void CG_SetInitialSnapshot(snapshot_t *snap)
 {
-    int i;
-    centity_t* cent;
-    entityState_t* state;
+    int            i;
+    centity_t     *cent;
+    entityState_t *state;
 
     cg.snap = snap;
 
@@ -149,20 +153,21 @@ void CG_SetInitialSnapshot(snapshot_t* snap)
 
     for (i = 0; i < cg.snap->numEntities; i++) {
         state = &cg.snap->entities[i];
-        cent = &cg_entities[state->number];
+        cent  = &cg_entities[state->number];
 
         cent->currentState = *state;
-        cent->interpolate = qfalse;
+        cent->interpolate  = qfalse;
         cent->currentValid = qtrue;
 
         CG_ResetEntity(cent);
     }
 
-    cgi.MUSIC_UpdateMood(snap->ps.current_music_mood,
-                         snap->ps.fallback_music_mood);
-    cgi.MUSIC_UpdateVolume(snap->ps.music_volume,
-                           snap->ps.music_volume_fade_time);
+    cgi.MUSIC_UpdateMood(snap->ps.current_music_mood, snap->ps.fallback_music_mood);
+    cgi.MUSIC_UpdateVolume(snap->ps.music_volume, snap->ps.music_volume_fade_time);
     cgi.S_SetReverb(snap->ps.reverb_type, snap->ps.reverb_level);
+
+    CG_InitRadar();
+    cgi.CL_RestoreSavedCgameState();
 }
 
 /*
@@ -174,9 +179,9 @@ The transition point from snap to nextSnap has passed
 */
 static void CG_TransitionSnapshot(qboolean differentServer)
 {
-    centity_t* cent;
-    snapshot_t* oldFrame;
-    int i;
+    centity_t  *cent;
+    snapshot_t *oldFrame;
+    int         i;
 
     if (differentServer) {
         CG_ServerRestarted();
@@ -187,13 +192,13 @@ static void CG_TransitionSnapshot(qboolean differentServer)
 
     // clear the currentValid flag for all entities in the existing snapshot
     for (i = 0; i < cg.snap->numEntities; i++) {
-        cent = &cg_entities[cg.snap->entities[i].number];
+        cent               = &cg_entities[cg.snap->entities[i].number];
         cent->currentValid = qfalse;
     }
 
     // move nextSnap to snap and do the transitions
     oldFrame = cg.snap;
-    cg.snap = cg.nextSnap;
+    cg.snap  = cg.nextSnap;
 
     // FAKK: Commented out to make our stuff work
     // cg_entities[ cg.snap->ps.clientNum ].interpolate = qfalse;
@@ -202,9 +207,12 @@ static void CG_TransitionSnapshot(qboolean differentServer)
         cent = &cg_entities[cg.snap->entities[i].number];
         if (differentServer) {
             cent->interpolate = qfalse;
-            cent->teleported = qfalse;
+            cent->teleported  = qfalse;
         }
         CG_TransitionEntity(cent);
+
+        // remember time of snapshot this entity was last updated in
+        cent->snapShotTime = cg.snap->serverTime;
     }
 
     for (i = 0; i < cg.snap->number_of_sounds; i++) {
@@ -220,31 +228,37 @@ static void CG_TransitionSnapshot(qboolean differentServer)
         playerState_t *ops, *ps;
 
         ops = &oldFrame->ps;
-        ps = &cg.snap->ps;
+        ps  = &cg.snap->ps;
 
         // teleporting checks are irrespective of prediction
         if (ps->pm_flags & PMF_RESPAWNED) {
             cg.thisFrameTeleport = qtrue;
         }
 
-        if ((ops->music_volume != ps->music_volume) ||
-            (ops->music_volume_fade_time != ps->music_volume_fade_time)) {
-            cgi.MUSIC_UpdateVolume(ps->music_volume,
-                                   ps->music_volume_fade_time);
+        if ((ops->music_volume != ps->music_volume) || (ops->music_volume_fade_time != ps->music_volume_fade_time)) {
+            cgi.MUSIC_UpdateVolume(ps->music_volume, ps->music_volume_fade_time);
         }
 
-        if ((ops->reverb_type != ps->reverb_type) ||
-            (ops->reverb_level != ps->reverb_level)) {
+        if ((ops->reverb_type != ps->reverb_type) || (ops->reverb_level != ps->reverb_level)) {
             cgi.S_SetReverb(ps->reverb_type, ps->reverb_level);
         }
 
         // if we are not doing client side movement prediction for any
         // reason, then the client events and view changes will be issued now
-        if (cg.demoPlayback || (cg.snap->ps.pm_flags & PMF_NO_PREDICTION) ||
-            cg_nopredict->integer || cg_synchronousClients->integer) {
+        if (cg.demoPlayback || (cg.snap->ps.pm_flags & PMF_NO_PREDICTION) || cg_nopredict->integer
+            || cg_synchronousClients->integer) {
             CG_TransitionPlayerState(ps, ops);
         }
     }
+
+    if (differentServer) {
+        cgi.CL_RestoreSavedCgameState();
+    } else {
+        cgi.CL_ClearSavedCgameState();
+    }
+
+    // this allows the view model to still look normal when the player is on ground
+    cg.snap->ps.walking = cg.snap->ps.groundEntityNum != ENTITYNUM_NONE;
 }
 
 /*
@@ -254,11 +268,11 @@ CG_SetNextSnap
 A new snapshot has just been read in from the client system.
 ===================
 */
-static void CG_SetNextSnap(snapshot_t* snap)
+static void CG_SetNextSnap(snapshot_t *snap)
 {
-    int num;
-    entityState_t* es;
-    centity_t* cent;
+    int            num;
+    entityState_t *es;
+    centity_t     *cent;
 
     cg.nextSnap = snap;
 
@@ -266,17 +280,15 @@ static void CG_SetNextSnap(snapshot_t* snap)
 
     // check for extrapolation errors
     for (num = 0; num < snap->numEntities; num++) {
-        es = &snap->entities[num];
+        es   = &snap->entities[num];
         cent = &cg_entities[es->number];
 
         cent->nextState = *es;
 
         // if this frame is a teleport, or the entity wasn't in the
         // previous frame, don't interpolate
-        if (!cent->currentValid ||
-            ((cent->currentState.eFlags ^ es->eFlags) & EF_TELEPORT_BIT) ||
-            (cent->currentState.parent != es->parent) ||
-            (cent->currentState.modelindex != es->modelindex)) {
+        if (!cent->currentValid || ((cent->currentState.eFlags ^ es->eFlags) & EF_TELEPORT_BIT)
+            || (cent->currentState.parent != es->parent) || (cent->currentState.modelindex != es->modelindex)) {
             cent->interpolate = qfalse;
             // if this isn't the first frame and we have valid data, set the
             // teleport flag
@@ -302,8 +314,7 @@ static void CG_SetNextSnap(snapshot_t* snap)
     }
 
     // if the camera cut bit changed, than the next frame is a camera cut
-    if ((cg.nextSnap->ps.camera_flags & CF_CAMERA_CUT_BIT) !=
-        (cg.snap->ps.camera_flags & CF_CAMERA_CUT_BIT)) {
+    if ((cg.nextSnap->ps.camera_flags & CF_CAMERA_CUT_BIT) != (cg.snap->ps.camera_flags & CF_CAMERA_CUT_BIT)) {
         cg.nextFrameCameraCut = qtrue;
     } else {
         cg.nextFrameCameraCut = qfalse;
@@ -329,14 +340,15 @@ times if the client system fails to return a
 valid snapshot.
 ========================
 */
-static snapshot_t* CG_ReadNextSnapshot(void)
+static snapshot_t *CG_ReadNextSnapshot(void)
 {
-    qboolean r;
-    snapshot_t* dest;
+    qboolean    r;
+    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.Error(
+            ERR_DROP, "CG_ReadNextSnapshot: way out of range, %i > %i", cg.latestSnapshotNum, cgs.processedSnapshotNum
+        );
     }
 
     while (cgs.processedSnapshotNum < cg.latestSnapshotNum) {
@@ -394,17 +406,16 @@ of an interpolating one)
 */
 void CG_ProcessSnapshots(void)
 {
-    snapshot_t* snap;
-    int n;
-    qboolean differentServer;
+    snapshot_t *snap;
+    int         n;
+    qboolean    differentServer;
 
     // see what the latest snapshot the client system has is
     cgi.GetCurrentSnapshotNumber(&n, &cg.latestSnapshotTime);
     if (n != cg.latestSnapshotNum) {
         if (n < cg.latestSnapshotNum) {
             // this should never happen
-            cgi.Error(ERR_DROP,
-                      "CG_ProcessSnapshots: n < cg.latestSnapshotNum");
+            cgi.Error(ERR_DROP, "CG_ProcessSnapshots: n < cg.latestSnapshotNum");
         }
         cg.latestSnapshotNum = n;
     }
@@ -445,11 +456,8 @@ void CG_ProcessSnapshots(void)
             // if time went backwards, we have a level restart
             if (cg.nextSnap->serverTime < cg.snap->serverTime) {
                 // only drop if this is not a restart or loadgame
-                if (!((cg.nextSnap->snapFlags ^ cg.snap->snapFlags) &
-                      SNAPFLAG_SERVERCOUNT)) {
-                    cgi.Error(
-                        ERR_DROP,
-                        "CG_ProcessSnapshots: Server time went backwards");
+                if (!((cg.nextSnap->snapFlags ^ cg.snap->snapFlags) & SNAPFLAG_SERVERCOUNT)) {
+                    cgi.Error(ERR_DROP, "CG_ProcessSnapshots: Server time went backwards");
                 }
             }
         }
@@ -457,9 +465,7 @@ void CG_ProcessSnapshots(void)
         differentServer = cg.snap->serverTime <= cgi.GetServerStartTime();
 
         // if our time is < nextFrame's, we have a nice interpolating state
-        if (cg.time >= cg.snap->serverTime &&
-            cg.time < cg.nextSnap->serverTime &&
-            !differentServer) {
+        if (cg.time >= cg.snap->serverTime && cg.time < cg.nextSnap->serverTime && !differentServer) {
             break;
         }
 
@@ -477,7 +483,6 @@ void CG_ProcessSnapshots(void)
         cgi.SetTime(cg.time);
     }
     if (cg.nextSnap != NULL && cg.nextSnap->serverTime <= cg.time) {
-        cgi.Error(ERR_DROP,
-                  "CG_ProcessSnapshots: cg.nextSnap->serverTime <= cg.time");
+        cgi.Error(ERR_DROP, "CG_ProcessSnapshots: cg.nextSnap->serverTime <= cg.time");
     }
 }

code/cgame/cg_sound.cpp

@@ -25,15 +25,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_local.h"
 
-void CG_ProcessSound( server_sound_t *sound )
-	{
-	if ( sound->stop_flag )
-		{
-		cgi.S_StopSound( sound->entity_number, sound->channel );
-		}
-	else
-		{
-		cgi.S_StartSound( sound->origin, sound->entity_number, sound->channel, cgs.sound_precache[sound->sound_index], 
-				sound->volume, sound->min_dist, sound->pitch, sound->maxDist, sound->streamed );
-		}
-	}
+void CG_ProcessSound(server_sound_t *sound)
+{
+    if (sound->stop_flag) {
+        cgi.S_StopSound(sound->entity_number, sound->channel);
+    } else {
+        cgi.S_StartSound(
+            sound->origin,
+            sound->entity_number,
+            sound->channel,
+            cgs.sound_precache[sound->sound_index],
+            sound->volume,
+            sound->min_dist,
+            sound->pitch,
+            sound->maxDist,
+            sound->streamed
+        );
+    }
+}

code/cgame/cg_specialfx.h

@@ -31,11 +31,127 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define MAX_SPECIAL_EFFECT_COMMANDS 32
 
-class specialeffectcommand_t : public Class {
+typedef enum {
+    SFX_BHIT_PAPER_LITE,
+    SFX_BHIT_PAPER_HARD,
+    SFX_BHIT_WOOD_LITE,
+    SFX_BHIT_WOOD_HARD,
+    SFX_BHIT_METAL_LITE,
+    SFX_BHIT_METAL_HARD,
+    SFX_BHIT_STONE_LITE,
+    SFX_BHIT_STONE_HARD,
+    SFX_BHIT_DIRT_LITE,
+    SFX_BHIT_DIRT_HARD,
+    SFX_BHIT_GRILL_LITE,
+    SFX_BHIT_GRILL_HARD,
+    SFX_BHIT_GRASS_LITE,
+    SFX_BHIT_GRASS_HARD,
+    SFX_BHIT_MUD_LITE,
+    SFX_BHIT_MUD_HARD,
+    SFX_BHIT_PUDDLE_LITE,
+    SFX_BHIT_PUDDLE_HARD,
+    SFX_BHIT_GLASS_LITE,
+    SFX_BHIT_GLASS_HARD,
+    SFX_BHIT_GRAVEL_LITE,
+    SFX_BHIT_GRAVEL_HARD,
+    SFX_BHIT_SAND_LITE,
+    SFX_BHIT_SAND_HARD,
+    SFX_BHIT_FOLIAGE_LITE,
+    SFX_BHIT_FOLIAGE_HARD,
+    SFX_BHIT_SNOW_LITE,
+    SFX_BHIT_SNOW_HARD,
+    SFX_BHIT_CARPET_LITE,
+    SFX_BHIT_CARPET_HARD,
+    SFX_BHIT_HUMAN_UNIFORM_LITE,
+    SFX_BHIT_HUMAN_UNIFORM_HARD,
+    SFX_WATER_TRAIL_BUBBLE,
+    SFX_VFX_PAPER_LITE,
+    SFX_VFX_PAPER_HARD,
+    SFX_VFX_WOOD_LITE,
+    SFX_VFX_WOOD_HARD,
+    SFX_VFX_METAL_LITE,
+    SFX_VFX_METAL_HARD,
+    SFX_VFX_STONE_LITE,
+    SFX_VFX_STONE_HARD,
+    SFX_VFX_DIRT_LITE,
+    SFX_VFX_DIRT_HARD,
+    SFX_VFX_GRILL_LITE,
+    SFX_VFX_GRILL_HARD,
+    SFX_VFX_GRASS_LITE,
+    SFX_VFX_GRASS_HARD,
+    SFX_VFX_MUD_LITE,
+    SFX_VFX_MUD_HARD,
+    SFX_VFX_PUDDLE_LITE,
+    SFX_VFX_PUDDLE_HARD,
+    SFX_VFX_GLASS_LITE,
+    SFX_VFX_GLASS_HARD,
+    SFX_VFX_GRAVEL_LITE,
+    SFX_VFX_GRAVEL_HARD,
+    SFX_VFX_SAND_LITE,
+    SFX_VFX_SAND_HARD,
+    SFX_VFX_FOLIAGE_LITE,
+    SFX_VFX_FOLIAGE_HARD,
+    SFX_VFX_SNOW_LITE,
+    SFX_VFX_SNOW_HARD,
+    SFX_VFX_CARPET_LITE,
+    SFX_VFX_CARPET_HARD,
+    SFX_EXP_GREN_BASE,
+    SFX_EXP_BAZOOKA_BASE,
+    SFX_EXP_HEAVYSHELL_BASE,
+    SFX_EXP_TANK_BASE,
+    SFX_EXP_GREN_PAPER,
+    SFX_EXP_GREN_WOOD,
+    SFX_EXP_GREN_METAL,
+    SFX_EXP_GREN_STONE,
+    SFX_EXP_GREN_DIRT,
+    SFX_EXP_GREN_GRILL,
+    SFX_EXP_GREN_GRASS,
+    SFX_EXP_GREN_MUD,
+    SFX_EXP_GREN_PUDDLE,
+    SFX_EXP_GREN_GLASS,
+    SFX_EXP_GREN_GRAVEL,
+    SFX_EXP_GREN_SAND,
+    SFX_EXP_GREN_FOLIAGE,
+    SFX_EXP_GREN_SNOW,
+    SFX_EXP_GREN_CARPET,
+    SFX_EXP_HEAVYSHELL_DIRT,
+    SFX_EXP_HEAVYSHELL_STONE,
+    SFX_EXP_HEAVYSHELL_SNOW,
+    SFX_EXP_TANK_DIRT,
+    SFX_EXP_TANK_STONE,
+    SFX_EXP_TANK_SNOW,
+    SFX_EXP_BAZOOKA_DIRT,
+    SFX_EXP_BAZOOKA_STONE,
+    SFX_EXP_BAZOOKA_SNOW,
+    SFX_WATER_RIPPLE_STILL,
+    SFX_WATER_RIPPLE_MOVING,
+    SFX_OIL_LEAK_BIG,
+    SFX_OIL_LEAK_MEDIUM,
+    SFX_OIL_LEAK_SMALL,
+    SFX_OIL_LEAK_SPLAT,
+    SFX_WATER_LEAK_BIG,
+    SFX_WATER_LEAK_MEDIUM,
+    SFX_WATER_LEAK_SMALL,
+    SFX_WATER_LEAK_SPLAT,
+    SFX_FOOT_LIGHT_DUST,
+    SFX_FOOT_HEAVY_DUST,
+    SFX_FOOT_DIRT,
+    SFX_FOOT_GRASS,
+    SFX_FOOT_MUD,
+    SFX_FOOT_PUDDLE,
+    SFX_FOOT_SAND,
+    SFX_FOOT_SNOW,
+    SFX_FENCE_WOOD,
+    SFX_TEST_EFFECT,
+    SFX_COUNT
+} SpecialEffects;
+
+class specialeffectcommand_t : public Class
+{
 public:
-    spawnthing_t* emitter;
+    spawnthing_t *emitter;
     float fCommandTime;
-    void (*endfcn)();
+    void (ClientGameCommandManager::*endfcn)();
     Event *pEvent;
 
 public:
@@ -45,39 +161,40 @@ public:
 class specialeffect_t : public Class
 {
 public:
-    int m_iCommandCount;
-    specialeffectcommand_t* m_commands[MAX_SPECIAL_EFFECT_COMMANDS];
+    int                     m_iCommandCount;
+    specialeffectcommand_t *m_commands[MAX_SPECIAL_EFFECT_COMMANDS];
 
 public:
     specialeffect_t();
 
-    specialeffectcommand_t* AddNewCommand();
+    specialeffectcommand_t *AddNewCommand();
 };
 
 #define MAX_SPECIAL_EFFECTS 99
 #define SPECIAL_EFFECT_TEST MAX_SPECIAL_EFFECTS - 1
 
-class ClientSpecialEffectsManager : public Listener {
+class ClientSpecialEffectsManager : public Listener
+{
     specialeffect_t m_effects[99];
-    qboolean m_bEffectsLoaded;
-    int m_iNumPendingEvents;
+    qboolean        m_bEffectsLoaded;
+    int             m_iNumPendingEvents;
 
 public:
     CLASS_PROTOTYPE(ClientSpecialEffectsManager);
 
 private:
-    void ContinueEffectExecution(Event* ev);
+    void ContinueEffectExecution(Event *ev);
     void ExecuteEffect(int iEffect, int iStartCommand, Vector vPos, Vector vAngles, float axis[3][3]);
 
 public:
     ClientSpecialEffectsManager();
 
-    void LoadEffects();
-    qboolean EffectsPending();
-    void MakeEffect_Normal(int iEffect, Vector vPos, Vector vNormal);
-    void MakeEffect_Angles(int iEffect, Vector vPos, Vector vAngles);
-    void MakeEffect_Axis(int iEffect, Vector vPos, float axis[3][3]);
-    specialeffect_t* GetTestEffectPointer();
+    void             LoadEffects();
+    qboolean         EffectsPending();
+    void             MakeEffect_Normal(int iEffect, Vector vPos, Vector vNormal);
+    void             MakeEffect_Angles(int iEffect, Vector vPos, Vector vAngles);
+    void             MakeEffect_Axis(int iEffect, Vector vPos, float axis[3][3]);
+    specialeffect_t *GetTestEffectPointer();
 };
 
 extern ClientSpecialEffectsManager sfxManager;

code/cgame/cg_swipe.cpp

@@ -25,256 +25,228 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_commands.h"
 
-swipething_t m_swipes[MAX_SWIPES];
-extern int current_entity_number;
+swipething_t        m_swipes[MAX_SWIPES];
+extern int          current_entity_number;
 extern refEntity_t *current_entity;
-extern dtiki_t* current_tiki;
-extern centity_t *current_centity;
+extern dtiki_t     *current_tiki;
+extern centity_t   *current_centity;
 
-void ClientGameCommandManager::SwipeOn
-   (
-   Event *ev
-   )
+void ClientGameCommandManager::SwipeOn(Event *ev)
 
-   {
-   // Make a swipe for this if available
-   int i;
-   int freeswipe = -1;
-   str tagname_start,tagname_end;
-   qhandle_t shader;
+{
+    // Make a swipe for this if available
+    int       i;
+    int       freeswipe = -1;
+    str       tagname_start, tagname_end;
+    qhandle_t shader;
 
-   if ( ev->NumArgs () != 4 )
-      return;
+    if (ev->NumArgs() != 4) {
+        return;
+    }
 
-   shader         = cgi.R_RegisterShader( ev->GetString( 1 ) );
-   tagname_start  = ev->GetString( 2 );
-   tagname_end    = ev->GetString( 3 );
-   
-   for ( i=0; i < MAX_SWIPES; i++ )
-      {
-      swipething_t &swipe = m_swipes[i];
+    shader        = cgi.R_RegisterShader(ev->GetString(1));
+    tagname_start = ev->GetString(2);
+    tagname_end   = ev->GetString(3);
 
-      if ( !swipe.enabled || 
-            (
-            ( swipe.entitynum == current_entity_number ) && 
-            ( tagname_start == swipe.tagname_start ) && 
-            ( tagname_end == swipe.tagname_end ) && 
-            ( shader == swipe.shader )
-            )
-         )
-         {
-         freeswipe = i;
-         break;
-         }
-      }
+    for (i = 0; i < MAX_SWIPES; i++) {
+        swipething_t& swipe = m_swipes[i];
 
-   if ( freeswipe == -1 )
-      return;
+        if (!swipe.enabled
+            || ((swipe.entitynum == current_entity_number) && (tagname_start == swipe.tagname_start)
+                && (tagname_end == swipe.tagname_end) && (shader == swipe.shader))) {
+            freeswipe = i;
+            break;
+        }
+    }
 
-   swipething_t &swipe = m_swipes[freeswipe];
+    if (freeswipe == -1) {
+        return;
+    }
 
-   if ( !swipe.enabled )
-      {
-      swipe.Init ();
-      swipe.enabled = qtrue;
-      swipe.entitynum = current_entity_number;
-      }
+    swipething_t& swipe = m_swipes[freeswipe];
 
-   swipe.shader = cgi.R_RegisterShader( ev->GetString( 1 ) );
-   swipe.tagname_start = ev->GetString ( 2 );
-   swipe.tagname_end   = ev->GetString ( 3 );
-   swipe.life = ev->GetFloat ( 4 ) * 1000.f;
+    if (!swipe.enabled) {
+        swipe.Init();
+        swipe.enabled   = qtrue;
+        swipe.entitynum = current_entity_number;
+    }
 
-   if ( current_centity )
-      current_centity->clientFlags |= CF_UPDATESWIPE;
-   }
+    swipe.shader        = cgi.R_RegisterShader(ev->GetString(1));
+    swipe.tagname_start = ev->GetString(2);
+    swipe.tagname_end   = ev->GetString(3);
+    swipe.life          = ev->GetFloat(4) * 1000.f;
 
-void ClientGameCommandManager::SwipeOff
-   (
-   Event *ev 
-   )
+    if (current_centity) {
+        current_centity->clientFlags |= CF_UPDATESWIPE;
+    }
+}
 
-   {
-   qboolean was_enabled;
-   int i;
+void ClientGameCommandManager::SwipeOff(Event *ev)
 
-   was_enabled = qfalse;
-   for ( i=0; i < MAX_SWIPES; i++ )
-      {
-      swipething_t &swipe = m_swipes[i];
+{
+    qboolean was_enabled;
+    int      i;
 
-      if ( swipe.enabled && swipe.entitynum == current_entity_number )
-         {
-         swipe.enabled = qfalse;
-         was_enabled = qtrue;
-         }
-      }
+    was_enabled = qfalse;
+    for (i = 0; i < MAX_SWIPES; i++) {
+        swipething_t& swipe = m_swipes[i];
 
-   if ( was_enabled )
-      {
-      //cgi.R_SwipeBegin ( 0.f, 0.f, -1 );
-      //cgi.R_SwipeEnd ();
+        if (swipe.enabled && swipe.entitynum == current_entity_number) {
+            swipe.enabled = qfalse;
+            was_enabled   = qtrue;
+        }
+    }
 
-      if ( current_centity )
-         current_centity->clientFlags &= ~CF_UPDATESWIPE;
-      }
-   }
+    if (was_enabled) {
+        //cgi.R_SwipeBegin ( 0.f, 0.f, -1 );
+        //cgi.R_SwipeEnd ();
 
-void ClientGameCommandManager::Swipe
-   (
-   Event *ev
-   )
+        if (current_centity) {
+            current_centity->clientFlags &= ~CF_UPDATESWIPE;
+        }
+    }
+}
 
-   {
-   // This does a swipe effect on the entity
-   int            i,swipenum;
-   orientation_t  _or;
-   int            tagnum_start,tagnum_end;
-   qboolean       add_cnt_point = qfalse;
-   vec3_t         tmp;
+void ClientGameCommandManager::Swipe(Event *ev)
 
-   assert(current_entity);
-   assert(current_tiki);
+{
+    // This does a swipe effect on the entity
+    int           i, swipenum;
+    orientation_t _or;
+    int           tagnum_start, tagnum_end;
+    qboolean      add_cnt_point = qfalse;
+    vec3_t        tmp;
 
-   if (!current_entity || !current_tiki)
-   {
-       return;
-   }
+    assert(current_entity);
+    assert(current_tiki);
 
-   // Let's find us a new (or current) swipe
-   for ( swipenum=0; swipenum < MAX_SWIPES; swipenum++ )
-      {
-      swipething_t &swipe = m_swipes[swipenum];
+    if (!current_entity || !current_tiki) {
+        return;
+    }
 
-      if ( swipe.enabled && swipe.entitynum == current_entity_number )
-         {         
-         while ( swipe.num_live_swipes > 1 )
-            {
-            i = ( swipe.first_swipe + 1 ) % MAX_SWIPE_POINTS;
-            swipepoint_t &swipepoint = swipe.swipepoints[i];
+    // Let's find us a new (or current) swipe
+    for (swipenum = 0; swipenum < MAX_SWIPES; swipenum++) {
+        swipething_t& swipe = m_swipes[swipenum];
 
-            if ( swipepoint.time < cg.time - swipe.life )
-               {
-               // then let's delete the previous
-               swipe.first_swipe = ( swipe.first_swipe + 1 ) % MAX_SWIPE_POINTS;
-               swipe.num_live_swipes--;
-               }
-            else
-               {
-               break;
-               }
+        if (swipe.enabled && swipe.entitynum == current_entity_number) {
+            while (swipe.num_live_swipes > 1) {
+                i                        = (swipe.first_swipe + 1) % MAX_SWIPE_POINTS;
+                swipepoint_t& swipepoint = swipe.swipepoints[i];
+
+                if (swipepoint.time < cg.time - swipe.life) {
+                    // then let's delete the previous
+                    swipe.first_swipe = (swipe.first_swipe + 1) % MAX_SWIPE_POINTS;
+                    swipe.num_live_swipes--;
+                } else {
+                    break;
+                }
             }
 
-         if ( swipe.num_live_swipes == 1 )
-            {
-            swipepoint_t &swipepoint = swipe.swipepoints[swipe.first_swipe];
-            if ( swipepoint.time < cg.time - swipe.life )
-               {
-               swipe.num_live_swipes = 0;
-               }
+            if (swipe.num_live_swipes == 1) {
+                swipepoint_t& swipepoint = swipe.swipepoints[swipe.first_swipe];
+                if (swipepoint.time < cg.time - swipe.life) {
+                    swipe.num_live_swipes = 0;
+                }
             }
 
-         swipe.cntPoint.time = cg.time;
-         VectorCopy ( current_entity->origin, swipe.cntPoint.points[0] );
+            swipe.cntPoint.time = cg.time;
+            VectorCopy(current_entity->origin, swipe.cntPoint.points[0]);
 
-         tagnum_start = cgi.Tag_NumForName( current_tiki, swipe.tagname_start.c_str() );
-         _or = cgi.TIKI_Orientation(current_entity, tagnum_start);
+            tagnum_start = cgi.Tag_NumForName(current_tiki, swipe.tagname_start.c_str());
+            _or          = cgi.TIKI_Orientation(current_entity, tagnum_start);
 
-         // Clear out the points
-         VectorClear ( tmp );
-         VectorClear ( swipe.cntPoint.points[0] );
-         VectorClear ( swipe.cntPoint.points[1] );
+            // Clear out the points
+            VectorClear(tmp);
+            VectorClear(swipe.cntPoint.points[0]);
+            VectorClear(swipe.cntPoint.points[1]);
 
-         if ( ev->NumArgs() > 0 )
-            VectorCopy( ev->GetVector( 1 ), tmp );
-         else
-            VectorCopy ( current_entity->origin, tmp );
-   
-         // Transform the origin of the tag by the axis of the entity and add it to the origin of the entity
-         for ( i = 0; i < 3; i++ )
-            {
-            VectorMA ( tmp, _or.origin[i], current_entity->axis[i], tmp );
+            if (ev->NumArgs() > 0) {
+                VectorCopy(ev->GetVector(1), tmp);
+            } else {
+                VectorCopy(current_entity->origin, tmp);
             }
 
-         // Copy tmp into the startpoint
-         VectorCopy ( tmp, swipe.cntPoint.points[0] );
-
-         tagnum_end = cgi.Tag_NumForName( current_tiki, swipe.tagname_end.c_str() );
-         _or = cgi.TIKI_Orientation(current_entity, tagnum_end);
-
-         if ( ev->NumArgs() > 0 )
-            VectorCopy( ev->GetVector( 1 ), tmp );
-         else
-            VectorCopy ( current_entity->origin, tmp );
-   
-         // Transform the origin of the tag by the axis of the entity and add it to the origin of the entity
-         for ( i = 0; i < 3; i++ )
-            {
-            VectorMA ( tmp, _or.origin[i], current_entity->axis[i], tmp );
+            // Transform the origin of the tag by the axis of the entity and add it to the origin of the entity
+            for (i = 0; i < 3; i++) {
+                VectorMA(tmp, _or.origin[i], current_entity->axis[i], tmp);
             }
 
-         // Copy tmp into the startpoint
-         VectorCopy ( tmp, swipe.cntPoint.points[1] );
+            // Copy tmp into the startpoint
+            VectorCopy(tmp, swipe.cntPoint.points[0]);
 
-         if ( swipe.num_live_swipes == 0 )
-            add_cnt_point = qtrue;
-         else 
-            {
-            float deltime = swipe.life / float ( MAX_SWIPES );
-            swipepoint_t &lastpoint = swipe.swipepoints[ ( swipe.first_swipe + swipe.num_live_swipes - 1 ) % MAX_SWIPE_POINTS];
+            tagnum_end = cgi.Tag_NumForName(current_tiki, swipe.tagname_end.c_str());
+            _or        = cgi.TIKI_Orientation(current_entity, tagnum_end);
 
-            if ( swipe.cntPoint.time - lastpoint.time >= deltime )
-               add_cnt_point = qtrue;
+            if (ev->NumArgs() > 0) {
+                VectorCopy(ev->GetVector(1), tmp);
+            } else {
+                VectorCopy(current_entity->origin, tmp);
             }
 
-         cgi.R_SwipeBegin ( cg.time, swipe.life, swipe.shader );
-
-         if ( add_cnt_point )
-            {
-            swipepoint_t &swipepoint = swipe.swipepoints[ ( swipe.first_swipe + swipe.num_live_swipes ) % MAX_SWIPE_POINTS];
-
-            swipepoint = swipe.cntPoint;
-      
-            if ( swipe.num_live_swipes == MAX_SWIPE_POINTS )
-               swipe.first_swipe = ( swipe.first_swipe + 1 ) % MAX_SWIPE_POINTS;
-            else
-               swipe.num_live_swipes++;
+            // Transform the origin of the tag by the axis of the entity and add it to the origin of the entity
+            for (i = 0; i < 3; i++) {
+                VectorMA(tmp, _or.origin[i], current_entity->axis[i], tmp);
             }
 
-         for ( i = 0; i != swipe.num_live_swipes; i++ )
-            {
-            swipepoint_t &swipepoint = swipe.swipepoints[ ( swipe.first_swipe + i ) % MAX_SWIPE_POINTS];
+            // Copy tmp into the startpoint
+            VectorCopy(tmp, swipe.cntPoint.points[1]);
 
-            cgi.R_SwipePoint ( swipepoint.points[0], swipepoint.points[1], swipepoint.time );
+            if (swipe.num_live_swipes == 0) {
+                add_cnt_point = qtrue;
+            } else {
+                float         deltime = swipe.life / float(MAX_SWIPES);
+                swipepoint_t& lastpoint =
+                    swipe.swipepoints[(swipe.first_swipe + swipe.num_live_swipes - 1) % MAX_SWIPE_POINTS];
+
+                if (swipe.cntPoint.time - lastpoint.time >= deltime) {
+                    add_cnt_point = qtrue;
+                }
             }
 
-         if ( !add_cnt_point )
-            cgi.R_SwipePoint ( swipe.cntPoint.points[0], swipe.cntPoint.points[1], swipe.cntPoint.time );
+            cgi.R_SwipeBegin(cg.time, swipe.life, swipe.shader);
 
-         cgi.R_SwipeEnd ();
-         }
-      }
-   }
+            if (add_cnt_point) {
+                swipepoint_t& swipepoint =
+                    swipe.swipepoints[(swipe.first_swipe + swipe.num_live_swipes) % MAX_SWIPE_POINTS];
 
-void ClientGameCommandManager::ClearSwipes
-   (
-   void
-   )
+                swipepoint = swipe.cntPoint;
 
-   {
-   int i;
+                if (swipe.num_live_swipes == MAX_SWIPE_POINTS) {
+                    swipe.first_swipe = (swipe.first_swipe + 1) % MAX_SWIPE_POINTS;
+                } else {
+                    swipe.num_live_swipes++;
+                }
+            }
 
-   for ( i=0; i < MAX_SWIPES; i++ )
-      {
-      swipething_t &swipe = m_swipes[i];
+            for (i = 0; i != swipe.num_live_swipes; i++) {
+                swipepoint_t& swipepoint = swipe.swipepoints[(swipe.first_swipe + i) % MAX_SWIPE_POINTS];
 
-      swipe.enabled = qfalse;
-      }
+                cgi.R_SwipePoint(swipepoint.points[0], swipepoint.points[1], swipepoint.time);
+            }
 
-   cgi.R_SwipeBegin ( 0.f, 0.f, -1 );
-   cgi.R_SwipeEnd ();
-   }
+            if (!add_cnt_point) {
+                cgi.R_SwipePoint(swipe.cntPoint.points[0], swipe.cntPoint.points[1], swipe.cntPoint.time);
+            }
 
+            cgi.R_SwipeEnd();
+        }
+    }
+}
+
+void ClientGameCommandManager::ClearSwipes(void)
+
+{
+    int i;
+
+    for (i = 0; i < MAX_SWIPES; i++) {
+        swipething_t& swipe = m_swipes[i];
+
+        swipe.enabled = qfalse;
+    }
+
+    cgi.R_SwipeBegin(0.f, 0.f, -1);
+    cgi.R_SwipeEnd();
+}
 
 /*
 ===================
@@ -283,7 +255,7 @@ CG_ClearSwipes
 This is called at startup and for tournement restarts
 ===================
 */
-void CG_ClearSwipes( void ) 
-   {
-   commandManager.ClearSwipes();
-   }
+void CG_ClearSwipes(void)
+{
+    commandManager.ClearSwipes();
+}

code/cgame/cg_testemitter.cpp

@@ -26,103 +26,103 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_commands.h"
 #include "cg_specialfx.h"
 
-cvar_t* cg_te_alpha;
-cvar_t* cg_te_dietouch;
-cvar_t* cg_te_bouncefactor;
-cvar_t* cg_te_scale;
-cvar_t* cg_te_scalemin;
-cvar_t* cg_te_scalemax;
-cvar_t* cg_te_model;
-cvar_t* cg_te_life;
-cvar_t* cg_te_color_r;
-cvar_t* cg_te_color_g;
-cvar_t* cg_te_color_b;
-cvar_t* cg_te_accel_x;
-cvar_t* cg_te_accel_y;
-cvar_t* cg_te_accel_z;
-cvar_t* cg_te_count;
-cvar_t* cg_te_fade;
-cvar_t* cg_te_fadedelay;
-cvar_t* cg_te_fadein;
-cvar_t* cg_te_spawnrate;
-cvar_t* cg_te_offsbase_x;
-cvar_t* cg_te_offsbase_y;
-cvar_t* cg_te_offsbase_z;
-cvar_t* cg_te_offsamp_x;
-cvar_t* cg_te_offsamp_y;
-cvar_t* cg_te_offsamp_z;
-cvar_t* cg_te_scalerate;
-cvar_t* cg_te_circle;
-cvar_t* cg_te_sphere;
-cvar_t* cg_te_insphere;
-cvar_t* cg_te_radius;
-cvar_t* cg_te_align;
-cvar_t* cg_te_flickeralpha;
-cvar_t* cg_te_collision;
-cvar_t* cg_te_randomroll;
-cvar_t* cg_te_anglesbase_p;
-cvar_t* cg_te_anglesbase_y;
-cvar_t* cg_te_anglesbase_r;
-cvar_t* cg_te_anglesamp_p;
-cvar_t* cg_te_anglesamp_y;
-cvar_t* cg_te_anglesamp_r;
-cvar_t* cg_te_forwardvel;
-cvar_t* cg_te_randvelbase_x;
-cvar_t* cg_te_randvelbase_y;
-cvar_t* cg_te_randvelbase_z;
-cvar_t* cg_te_randvelamp_x;
-cvar_t* cg_te_randvelamp_y;
-cvar_t* cg_te_randvelamp_z;
-cvar_t* cg_te_clampvelmin_x;
-cvar_t* cg_te_clampvelmax_x;
-cvar_t* cg_te_clampvelmin_y;
-cvar_t* cg_te_clampvelmax_y;
-cvar_t* cg_te_clampvelmin_z;
-cvar_t* cg_te_clampvelmax_z;
-cvar_t* cg_te_clampvelaxis;
-cvar_t* cg_te_volumetric;
-cvar_t* cg_te_randaxis;
-cvar_t* cg_te_axisoffsbase_x;
-cvar_t* cg_te_axisoffsbase_y;
-cvar_t* cg_te_axisoffsbase_z;
-cvar_t* cg_te_axisoffsamp_x;
-cvar_t* cg_te_axisoffsamp_y;
-cvar_t* cg_te_axisoffsamp_z;
-cvar_t* cg_te_swarm_freq;
-cvar_t* cg_te_swarm_maxspeed;
-cvar_t* cg_te_swarm_delta;
-cvar_t* cg_te_avelbase_p;
-cvar_t* cg_te_avelbase_y;
-cvar_t* cg_te_avelbase_r;
-cvar_t* cg_te_avelamp_p;
-cvar_t* cg_te_avelamp_y;
-cvar_t* cg_te_avelamp_r;
-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_varycolor;
-cvar_t* cg_te_spritegridlighting;
-cvar_t* cg_te_cone_height;
-cvar_t* cg_te_alignstretch_scale;
-cvar_t* cg_te_spawnrange_a;
-cvar_t* cg_te_spawnrange_b;
-cvar_t* cg_te_command_time;
-cvar_t* cg_te_singlelinecommand;
-cvar_t* cg_te_tag;
-cvar_t* cg_te_xangles;
-cvar_t* cg_te_yangles;
-cvar_t* cg_te_zangles;
+cvar_t *cg_te_alpha;
+cvar_t *cg_te_dietouch;
+cvar_t *cg_te_bouncefactor;
+cvar_t *cg_te_scale;
+cvar_t *cg_te_scalemin;
+cvar_t *cg_te_scalemax;
+cvar_t *cg_te_model;
+cvar_t *cg_te_life;
+cvar_t *cg_te_color_r;
+cvar_t *cg_te_color_g;
+cvar_t *cg_te_color_b;
+cvar_t *cg_te_accel_x;
+cvar_t *cg_te_accel_y;
+cvar_t *cg_te_accel_z;
+cvar_t *cg_te_count;
+cvar_t *cg_te_fade;
+cvar_t *cg_te_fadedelay;
+cvar_t *cg_te_fadein;
+cvar_t *cg_te_spawnrate;
+cvar_t *cg_te_offsbase_x;
+cvar_t *cg_te_offsbase_y;
+cvar_t *cg_te_offsbase_z;
+cvar_t *cg_te_offsamp_x;
+cvar_t *cg_te_offsamp_y;
+cvar_t *cg_te_offsamp_z;
+cvar_t *cg_te_scalerate;
+cvar_t *cg_te_circle;
+cvar_t *cg_te_sphere;
+cvar_t *cg_te_insphere;
+cvar_t *cg_te_radius;
+cvar_t *cg_te_align;
+cvar_t *cg_te_flickeralpha;
+cvar_t *cg_te_collision;
+cvar_t *cg_te_randomroll;
+cvar_t *cg_te_anglesbase_p;
+cvar_t *cg_te_anglesbase_y;
+cvar_t *cg_te_anglesbase_r;
+cvar_t *cg_te_anglesamp_p;
+cvar_t *cg_te_anglesamp_y;
+cvar_t *cg_te_anglesamp_r;
+cvar_t *cg_te_forwardvel;
+cvar_t *cg_te_randvelbase_x;
+cvar_t *cg_te_randvelbase_y;
+cvar_t *cg_te_randvelbase_z;
+cvar_t *cg_te_randvelamp_x;
+cvar_t *cg_te_randvelamp_y;
+cvar_t *cg_te_randvelamp_z;
+cvar_t *cg_te_clampvelmin_x;
+cvar_t *cg_te_clampvelmax_x;
+cvar_t *cg_te_clampvelmin_y;
+cvar_t *cg_te_clampvelmax_y;
+cvar_t *cg_te_clampvelmin_z;
+cvar_t *cg_te_clampvelmax_z;
+cvar_t *cg_te_clampvelaxis;
+cvar_t *cg_te_volumetric;
+cvar_t *cg_te_randaxis;
+cvar_t *cg_te_axisoffsbase_x;
+cvar_t *cg_te_axisoffsbase_y;
+cvar_t *cg_te_axisoffsbase_z;
+cvar_t *cg_te_axisoffsamp_x;
+cvar_t *cg_te_axisoffsamp_y;
+cvar_t *cg_te_axisoffsamp_z;
+cvar_t *cg_te_swarm_freq;
+cvar_t *cg_te_swarm_maxspeed;
+cvar_t *cg_te_swarm_delta;
+cvar_t *cg_te_avelbase_p;
+cvar_t *cg_te_avelbase_y;
+cvar_t *cg_te_avelbase_r;
+cvar_t *cg_te_avelamp_p;
+cvar_t *cg_te_avelamp_y;
+cvar_t *cg_te_avelamp_r;
+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_varycolor;
+cvar_t *cg_te_spritegridlighting;
+cvar_t *cg_te_cone_height;
+cvar_t *cg_te_alignstretch_scale;
+cvar_t *cg_te_spawnrange_a;
+cvar_t *cg_te_spawnrange_b;
+cvar_t *cg_te_command_time;
+cvar_t *cg_te_singlelinecommand;
+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;
+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;
 specialeffect_t *pTesteffect;
 
 #define MAX_TESTEMITTERS_SAVE 32
@@ -212,94 +212,94 @@ str cg_te_command_timeG[MAX_TESTEMITTERS_SAVE];
 str cg_te_singlelinecommandG[MAX_TESTEMITTERS_SAVE];
 str cg_te_tagG[MAX_TESTEMITTERS_SAVE];
 
-spawnthing_t* testspawnthing = NULL;
+spawnthing_t *testspawnthing = NULL;
 
 void CG_SaveEffectCommandCvars(int iCommand)
 {
-    cg_te_alphaG[iCommand] = cg_te_alpha->string;
-    cg_te_dietouchG[iCommand] = cg_te_dietouch->string;
-    cg_te_bouncefactorG[iCommand] = cg_te_bouncefactor->string;
-    cg_te_scaleG[iCommand] = cg_te_scale->string;
-    cg_te_scaleminG[iCommand] = cg_te_scalemin->string;
-    cg_te_scalemaxG[iCommand] = cg_te_scalemax->string;
-    cg_te_modelG[iCommand] = cg_te_model->string;
-    cg_te_lifeG[iCommand] = cg_te_life->string;
-    cg_te_color_rG[iCommand] = cg_te_color_r->string;
-    cg_te_color_gG[iCommand] = cg_te_color_g->string;
-    cg_te_color_bG[iCommand] = cg_te_color_b->string;
-    cg_te_accel_xG[iCommand] = cg_te_accel_x->string;
-    cg_te_accel_yG[iCommand] = cg_te_accel_y->string;
-    cg_te_accel_zG[iCommand] = cg_te_accel_z->string;
-    cg_te_countG[iCommand] = cg_te_count->string;
-    cg_te_fadeG[iCommand] = cg_te_fade->string;
-    cg_te_fadedelayG[iCommand] = cg_te_fadedelay->string;
-    cg_te_fadeinG[iCommand] = cg_te_fadein->string;
-    cg_te_spawnrateG[iCommand] = cg_te_spawnrate->string;
-    cg_te_offsbase_xG[iCommand] = cg_te_offsbase_x->string;
-    cg_te_offsbase_yG[iCommand] = cg_te_offsbase_y->string;
-    cg_te_offsbase_zG[iCommand] = cg_te_offsbase_z->string;
-    cg_te_offsamp_xG[iCommand] = cg_te_offsamp_x->string;
-    cg_te_offsamp_yG[iCommand] = cg_te_offsamp_y->string;
-    cg_te_offsamp_zG[iCommand] = cg_te_offsamp_z->string;
-    cg_te_scalerateG[iCommand] = cg_te_scalerate->string;
-    cg_te_circleG[iCommand] = cg_te_circle->string;
-    cg_te_sphereG[iCommand] = cg_te_sphere->string;
-    cg_te_insphereG[iCommand] = cg_te_insphere->string;
-    cg_te_radiusG[iCommand] = cg_te_radius->string;
-    cg_te_alignG[iCommand] = cg_te_align->string;
-    cg_te_flickeralphaG[iCommand] = cg_te_flickeralpha->string;
-    cg_te_collisionG[iCommand] = cg_te_collision->string;
-    cg_te_randomrollG[iCommand] = cg_te_randomroll->string;
-    cg_te_anglesbase_pG[iCommand] = cg_te_anglesbase_p->string;
-    cg_te_anglesbase_yG[iCommand] = cg_te_anglesbase_y->string;
-    cg_te_anglesbase_rG[iCommand] = cg_te_anglesbase_r->string;
-    cg_te_anglesamp_pG[iCommand] = cg_te_anglesamp_p->string;
-    cg_te_anglesamp_yG[iCommand] = cg_te_anglesamp_y->string;
-    cg_te_anglesamp_rG[iCommand] = cg_te_anglesamp_r->string;
-    cg_te_forwardvelG[iCommand] = cg_te_forwardvel->string;
-    cg_te_randvelbase_xG[iCommand] = cg_te_randvelbase_x->string;
-    cg_te_randvelbase_yG[iCommand] = cg_te_randvelbase_y->string;
-    cg_te_randvelbase_zG[iCommand] = cg_te_randvelbase_z->string;
-    cg_te_randvelamp_xG[iCommand] = cg_te_randvelamp_x->string;
-    cg_te_randvelamp_yG[iCommand] = cg_te_randvelamp_y->string;
-    cg_te_randvelamp_zG[iCommand] = cg_te_randvelamp_z->string;
-    cg_te_clampvelmin_xG[iCommand] = cg_te_clampvelmin_x->string;
-    cg_te_clampvelmax_xG[iCommand] = cg_te_clampvelmax_x->string;
-    cg_te_clampvelmin_yG[iCommand] = cg_te_clampvelmin_y->string;
-    cg_te_clampvelmax_yG[iCommand] = cg_te_clampvelmax_y->string;
-    cg_te_clampvelmin_zG[iCommand] = cg_te_clampvelmin_z->string;
-    cg_te_clampvelmax_zG[iCommand] = cg_te_clampvelmax_z->string;
-    cg_te_clampvelaxisG[iCommand] = cg_te_clampvelaxis->string;
-    cg_te_volumetricG[iCommand] = cg_te_volumetric->string;
-    cg_te_randaxisG[iCommand] = cg_te_randaxis->string;
-    cg_te_axisoffsbase_xG[iCommand] = cg_te_axisoffsbase_x->string;
-    cg_te_axisoffsbase_yG[iCommand] = cg_te_axisoffsbase_y->string;
-    cg_te_axisoffsbase_zG[iCommand] = cg_te_axisoffsbase_z->string;
-    cg_te_axisoffsamp_xG[iCommand] = cg_te_axisoffsamp_x->string;
-    cg_te_axisoffsamp_yG[iCommand] = cg_te_axisoffsamp_y->string;
-    cg_te_axisoffsamp_zG[iCommand] = cg_te_axisoffsamp_z->string;
-    cg_te_swarm_freqG[iCommand] = cg_te_swarm_freq->string;
-    cg_te_swarm_maxspeedG[iCommand] = cg_te_swarm_maxspeed->string;
-    cg_te_swarm_deltaG[iCommand] = cg_te_swarm_delta->string;
-    cg_te_avelbase_pG[iCommand] = cg_te_avelbase_p->string;
-    cg_te_avelbase_yG[iCommand] = cg_te_avelbase_y->string;
-    cg_te_avelbase_rG[iCommand] = cg_te_avelbase_r->string;
-    cg_te_avelamp_pG[iCommand] = cg_te_avelamp_p->string;
-    cg_te_avelamp_yG[iCommand] = cg_te_avelamp_y->string;
-    cg_te_avelamp_rG[iCommand] = cg_te_avelamp_r->string;
-    cg_te_radial_scaleG[iCommand] = cg_te_radial_scale->string;
-    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_varycolorG[iCommand] = cg_te_varycolor->string;
+    cg_te_alphaG[iCommand]              = cg_te_alpha->string;
+    cg_te_dietouchG[iCommand]           = cg_te_dietouch->string;
+    cg_te_bouncefactorG[iCommand]       = cg_te_bouncefactor->string;
+    cg_te_scaleG[iCommand]              = cg_te_scale->string;
+    cg_te_scaleminG[iCommand]           = cg_te_scalemin->string;
+    cg_te_scalemaxG[iCommand]           = cg_te_scalemax->string;
+    cg_te_modelG[iCommand]              = cg_te_model->string;
+    cg_te_lifeG[iCommand]               = cg_te_life->string;
+    cg_te_color_rG[iCommand]            = cg_te_color_r->string;
+    cg_te_color_gG[iCommand]            = cg_te_color_g->string;
+    cg_te_color_bG[iCommand]            = cg_te_color_b->string;
+    cg_te_accel_xG[iCommand]            = cg_te_accel_x->string;
+    cg_te_accel_yG[iCommand]            = cg_te_accel_y->string;
+    cg_te_accel_zG[iCommand]            = cg_te_accel_z->string;
+    cg_te_countG[iCommand]              = cg_te_count->string;
+    cg_te_fadeG[iCommand]               = cg_te_fade->string;
+    cg_te_fadedelayG[iCommand]          = cg_te_fadedelay->string;
+    cg_te_fadeinG[iCommand]             = cg_te_fadein->string;
+    cg_te_spawnrateG[iCommand]          = cg_te_spawnrate->string;
+    cg_te_offsbase_xG[iCommand]         = cg_te_offsbase_x->string;
+    cg_te_offsbase_yG[iCommand]         = cg_te_offsbase_y->string;
+    cg_te_offsbase_zG[iCommand]         = cg_te_offsbase_z->string;
+    cg_te_offsamp_xG[iCommand]          = cg_te_offsamp_x->string;
+    cg_te_offsamp_yG[iCommand]          = cg_te_offsamp_y->string;
+    cg_te_offsamp_zG[iCommand]          = cg_te_offsamp_z->string;
+    cg_te_scalerateG[iCommand]          = cg_te_scalerate->string;
+    cg_te_circleG[iCommand]             = cg_te_circle->string;
+    cg_te_sphereG[iCommand]             = cg_te_sphere->string;
+    cg_te_insphereG[iCommand]           = cg_te_insphere->string;
+    cg_te_radiusG[iCommand]             = cg_te_radius->string;
+    cg_te_alignG[iCommand]              = cg_te_align->string;
+    cg_te_flickeralphaG[iCommand]       = cg_te_flickeralpha->string;
+    cg_te_collisionG[iCommand]          = cg_te_collision->string;
+    cg_te_randomrollG[iCommand]         = cg_te_randomroll->string;
+    cg_te_anglesbase_pG[iCommand]       = cg_te_anglesbase_p->string;
+    cg_te_anglesbase_yG[iCommand]       = cg_te_anglesbase_y->string;
+    cg_te_anglesbase_rG[iCommand]       = cg_te_anglesbase_r->string;
+    cg_te_anglesamp_pG[iCommand]        = cg_te_anglesamp_p->string;
+    cg_te_anglesamp_yG[iCommand]        = cg_te_anglesamp_y->string;
+    cg_te_anglesamp_rG[iCommand]        = cg_te_anglesamp_r->string;
+    cg_te_forwardvelG[iCommand]         = cg_te_forwardvel->string;
+    cg_te_randvelbase_xG[iCommand]      = cg_te_randvelbase_x->string;
+    cg_te_randvelbase_yG[iCommand]      = cg_te_randvelbase_y->string;
+    cg_te_randvelbase_zG[iCommand]      = cg_te_randvelbase_z->string;
+    cg_te_randvelamp_xG[iCommand]       = cg_te_randvelamp_x->string;
+    cg_te_randvelamp_yG[iCommand]       = cg_te_randvelamp_y->string;
+    cg_te_randvelamp_zG[iCommand]       = cg_te_randvelamp_z->string;
+    cg_te_clampvelmin_xG[iCommand]      = cg_te_clampvelmin_x->string;
+    cg_te_clampvelmax_xG[iCommand]      = cg_te_clampvelmax_x->string;
+    cg_te_clampvelmin_yG[iCommand]      = cg_te_clampvelmin_y->string;
+    cg_te_clampvelmax_yG[iCommand]      = cg_te_clampvelmax_y->string;
+    cg_te_clampvelmin_zG[iCommand]      = cg_te_clampvelmin_z->string;
+    cg_te_clampvelmax_zG[iCommand]      = cg_te_clampvelmax_z->string;
+    cg_te_clampvelaxisG[iCommand]       = cg_te_clampvelaxis->string;
+    cg_te_volumetricG[iCommand]         = cg_te_volumetric->string;
+    cg_te_randaxisG[iCommand]           = cg_te_randaxis->string;
+    cg_te_axisoffsbase_xG[iCommand]     = cg_te_axisoffsbase_x->string;
+    cg_te_axisoffsbase_yG[iCommand]     = cg_te_axisoffsbase_y->string;
+    cg_te_axisoffsbase_zG[iCommand]     = cg_te_axisoffsbase_z->string;
+    cg_te_axisoffsamp_xG[iCommand]      = cg_te_axisoffsamp_x->string;
+    cg_te_axisoffsamp_yG[iCommand]      = cg_te_axisoffsamp_y->string;
+    cg_te_axisoffsamp_zG[iCommand]      = cg_te_axisoffsamp_z->string;
+    cg_te_swarm_freqG[iCommand]         = cg_te_swarm_freq->string;
+    cg_te_swarm_maxspeedG[iCommand]     = cg_te_swarm_maxspeed->string;
+    cg_te_swarm_deltaG[iCommand]        = cg_te_swarm_delta->string;
+    cg_te_avelbase_pG[iCommand]         = cg_te_avelbase_p->string;
+    cg_te_avelbase_yG[iCommand]         = cg_te_avelbase_y->string;
+    cg_te_avelbase_rG[iCommand]         = cg_te_avelbase_r->string;
+    cg_te_avelamp_pG[iCommand]          = cg_te_avelamp_p->string;
+    cg_te_avelamp_yG[iCommand]          = cg_te_avelamp_y->string;
+    cg_te_avelamp_rG[iCommand]          = cg_te_avelamp_r->string;
+    cg_te_radial_scaleG[iCommand]       = cg_te_radial_scale->string;
+    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_varycolorG[iCommand]          = cg_te_varycolor->string;
     cg_te_spritegridlightingG[iCommand] = cg_te_spritegridlighting->string;
-    cg_te_spawnrange_aG[iCommand] = cg_te_spawnrange_a->string;
-    cg_te_spawnrange_bG[iCommand] = cg_te_spawnrange_b->string;
-    cg_te_cone_heightG[iCommand] = cg_te_cone_height->string;
+    cg_te_spawnrange_aG[iCommand]       = cg_te_spawnrange_a->string;
+    cg_te_spawnrange_bG[iCommand]       = cg_te_spawnrange_b->string;
+    cg_te_cone_heightG[iCommand]        = cg_te_cone_height->string;
     cg_te_alignstretch_scaleG[iCommand] = cg_te_alignstretch_scale->string;
-    cg_te_command_timeG[iCommand] = cg_te_command_time->string;
-    cg_te_singlelinecommandG[iCommand] = cg_te_singlelinecommand->string;
-    cg_te_tagG[iCommand] = cg_te_tag->string;
+    cg_te_command_timeG[iCommand]       = cg_te_command_time->string;
+    cg_te_singlelinecommandG[iCommand]  = cg_te_singlelinecommand->string;
+    cg_te_tagG[iCommand]                = cg_te_tag->string;
 }
 
 void CG_ResetEffectCommandCvars()
@@ -327,7 +327,7 @@ void CG_TriggerTestEmitter_f(void)
     // FIXME: unimplemented
 }
 
-void CG_DumpBaseAndAmplitude(str* buff, char* prefix, Vector* base, Vector* amplitude)
+void CG_DumpBaseAndAmplitude(str *buff, char *prefix, Vector *base, Vector *amplitude)
 {
     // FIXME: unimplemented
 }
@@ -337,7 +337,9 @@ void CG_DumpEmitter_f(void)
     // FIXME: unimplemented
 }
 
-void CG_LoadBaseAndAmplitude(char** pBufer, char* szCvarX, char* szCvarY, char* szCvarZ, char* szCvarXAmp, char* szCvarYAmp, char* szCvarZAmp)
+void CG_LoadBaseAndAmplitude(
+    char **pBufer, char *szCvarX, char *szCvarY, char *szCvarZ, char *szCvarXAmp, char *szCvarYAmp, char *szCvarZAmp
+)
 {
     // FIXME: unimplemented
 }
@@ -374,111 +376,111 @@ void CG_DeleteEmitterCommand_f(void)
 
 void CG_InitTestEmitter(void)
 {
-    cg_te_life = cgi.Cvar_Get("cg_te_life", "1", 0);
-    cg_te_alpha = cgi.Cvar_Get("cg_te_alpha", "1", 0);
-    cg_te_dietouch = cgi.Cvar_Get("cg_te_dietouch", "0", 0);
-    cg_te_bouncefactor = cgi.Cvar_Get("cg_te_bouncefactor", "0.3", 0);
-    cg_te_scale = cgi.Cvar_Get("cg_te_scale", "1", 0);
-    cg_te_scalemin = cgi.Cvar_Get("cg_te_scalemin", "0", 0);
-    cg_te_scalemax = cgi.Cvar_Get("cg_te_scalemax", "0", 0);
-    cg_te_model = cgi.Cvar_Get("cg_te_model", "none", 0);
-    cg_te_life = cgi.Cvar_Get("cg_te_life", "1", 0);
-    cg_te_color_r = cgi.Cvar_Get("cg_te_color_r", "1", 0);
-    cg_te_color_g = cgi.Cvar_Get("cg_te_color_g", "1", 0);
-    cg_te_color_b = cgi.Cvar_Get("cg_te_color_b", "1", 0);
-    cg_te_accel_x = cgi.Cvar_Get("cg_te_accel_x", "0", 0);
-    cg_te_accel_y = cgi.Cvar_Get("cg_te_accel_y", "0", 0);
-    cg_te_accel_z = cgi.Cvar_Get("cg_te_accel_z", "0", 0);
-    cg_te_count = cgi.Cvar_Get("cg_te_count", "1", 0);
-    cg_te_fade = cgi.Cvar_Get("cg_te_fade", "0", 0);
-    cg_te_fadedelay = cgi.Cvar_Get("cg_te_fadedelay", "0", 0);
-    cg_te_fadein = cgi.Cvar_Get("cg_te_fadein", "0", 0);
-    cg_te_spawnrate = cgi.Cvar_Get("cg_te_spawnrate", "1", 0);
-    cg_te_scalerate = cgi.Cvar_Get("cg_te_scalerate", "0", 0);
-    cg_te_circle = cgi.Cvar_Get("cg_te_circle", "0", 0);
-    cg_te_sphere = cgi.Cvar_Get("cg_te_sphere", "0", 0);
-    cg_te_insphere = cgi.Cvar_Get("cg_te_insphere", "0", 0);
-    cg_te_radius = cgi.Cvar_Get("cg_te_radius", "0", 0);
-    cg_te_align = cgi.Cvar_Get("cg_te_align", "0", 0);
-    cg_te_flickeralpha = cgi.Cvar_Get("cg_te_flickeralpha", "0", 0);
-    cg_te_collision = cgi.Cvar_Get("cg_te_collision", "0", 0);
-    cg_te_randomroll = cgi.Cvar_Get("cg_te_randomroll", "0", 0);
-    cg_te_offsbase_x = cgi.Cvar_Get("cg_te_offsbase_x", "0", 0);
-    cg_te_offsbase_y = cgi.Cvar_Get("cg_te_offsbase_y", "0", 0);
-    cg_te_offsbase_z = cgi.Cvar_Get("cg_te_offsbase_z", "0", 0);
-    cg_te_offsamp_x = cgi.Cvar_Get("cg_te_offsamp_x", "0", 0);
-    cg_te_offsamp_y = cgi.Cvar_Get("cg_te_offsamp_y", "0", 0);
-    cg_te_offsamp_z = cgi.Cvar_Get("cg_te_offsamp_z", "0", 0);
-    cg_te_anglesbase_p = cgi.Cvar_Get("cg_te_anglesbase_p", "0", 0);
-    cg_te_anglesbase_y = cgi.Cvar_Get("cg_te_anglesbase_y", "0", 0);
-    cg_te_anglesbase_r = cgi.Cvar_Get("cg_te_anglesbase_r", "0", 0);
-    cg_te_anglesamp_p = cgi.Cvar_Get("cg_te_anglesamp_p", "0", 0);
-    cg_te_anglesamp_y = cgi.Cvar_Get("cg_te_anglesamp_y", "0", 0);
-    cg_te_anglesamp_r = cgi.Cvar_Get("cg_te_anglesamp_r", "0", 0);
-    cg_te_randvelbase_x = cgi.Cvar_Get("cg_te_randvelbase_x", "0", 0);
-    cg_te_randvelbase_y = cgi.Cvar_Get("cg_te_randvelbase_y", "0", 0);
-    cg_te_randvelbase_z = cgi.Cvar_Get("cg_te_randvelbase_z", "0", 0);
-    cg_te_randvelamp_x = cgi.Cvar_Get("cg_te_randvelamp_x", "0", 0);
-    cg_te_randvelamp_y = cgi.Cvar_Get("cg_te_randvelamp_y", "0", 0);
-    cg_te_randvelamp_z = cgi.Cvar_Get("cg_te_randvelamp_z", "0", 0);
-    cg_te_clampvelmin_x = cgi.Cvar_Get("cg_te_clampvelmin_x", "-9999", 0);
-    cg_te_clampvelmax_x = cgi.Cvar_Get("cg_te_clampvelmax_x", "9999", 0);
-    cg_te_clampvelmin_y = cgi.Cvar_Get("cg_te_clampvelmin_y", "-9999", 0);
-    cg_te_clampvelmax_y = cgi.Cvar_Get("cg_te_clampvelmax_y", "9999", 0);
-    cg_te_clampvelmin_z = cgi.Cvar_Get("cg_te_clampvelmin_z", "-9999", 0);
-    cg_te_clampvelmax_z = cgi.Cvar_Get("cg_te_clampvelmax_z", "9999", 0);
-    cg_te_clampvelaxis = cgi.Cvar_Get("cg_te_clampvelaxis", "0", 0);
-    cg_te_forwardvel = cgi.Cvar_Get("cg_te_forwardvel", "0", 0);
-    cg_te_volumetric = cgi.Cvar_Get("cg_te_volumetric", "0", 0);
-    cg_te_randaxis = cgi.Cvar_Get("cg_te_randaxis", "0", 0);
-    cg_te_axisoffsbase_x = cgi.Cvar_Get("cg_te_axisoffsbase_x", "0", 0);
-    cg_te_axisoffsbase_y = cgi.Cvar_Get("cg_te_axisoffsbase_y", "0", 0);
-    cg_te_axisoffsbase_z = cgi.Cvar_Get("cg_te_axisoffsbase_z", "0", 0);
-    cg_te_axisoffsamp_x = cgi.Cvar_Get("cg_te_axisoffsamp_x", "0", 0);
-    cg_te_axisoffsamp_y = cgi.Cvar_Get("cg_te_axisoffsamp_y", "0", 0);
-    cg_te_axisoffsamp_z = cgi.Cvar_Get("cg_te_axisoffsamp_z", "0", 0);
-    cg_te_swarm_freq = cgi.Cvar_Get("cg_te_swarm_freq", "0", 0);
-    cg_te_swarm_maxspeed = cgi.Cvar_Get("cg_te_swarm_maxspeed", "0", 0);
-    cg_te_swarm_delta = cgi.Cvar_Get("cg_te_swarm_delta", "0", 0);
-    cg_te_avelbase_p = cgi.Cvar_Get("cg_te_avelbase_p", "0", 0);
-    cg_te_avelbase_y = cgi.Cvar_Get("cg_te_avelbase_y", "0", 0);
-    cg_te_avelbase_r = cgi.Cvar_Get("cg_te_avelbase_r", "0", 0);
-    cg_te_avelamp_p = cgi.Cvar_Get("cg_te_avelamp_p", "0", 0);
-    cg_te_avelamp_y = cgi.Cvar_Get("cg_te_avelamp_y", "0", 0);
-    cg_te_avelamp_r = cgi.Cvar_Get("cg_te_avelamp_r", "0", 0);
-    cg_te_radial_scale = cgi.Cvar_Get("cg_te_radial_scale", "0", 0);
-    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_varycolor = cgi.Cvar_Get("cg_te_varycolor", "0", 0);
+    cg_te_life               = cgi.Cvar_Get("cg_te_life", "1", 0);
+    cg_te_alpha              = cgi.Cvar_Get("cg_te_alpha", "1", 0);
+    cg_te_dietouch           = cgi.Cvar_Get("cg_te_dietouch", "0", 0);
+    cg_te_bouncefactor       = cgi.Cvar_Get("cg_te_bouncefactor", "0.3", 0);
+    cg_te_scale              = cgi.Cvar_Get("cg_te_scale", "1", 0);
+    cg_te_scalemin           = cgi.Cvar_Get("cg_te_scalemin", "0", 0);
+    cg_te_scalemax           = cgi.Cvar_Get("cg_te_scalemax", "0", 0);
+    cg_te_model              = cgi.Cvar_Get("cg_te_model", "none", 0);
+    cg_te_life               = cgi.Cvar_Get("cg_te_life", "1", 0);
+    cg_te_color_r            = cgi.Cvar_Get("cg_te_color_r", "1", 0);
+    cg_te_color_g            = cgi.Cvar_Get("cg_te_color_g", "1", 0);
+    cg_te_color_b            = cgi.Cvar_Get("cg_te_color_b", "1", 0);
+    cg_te_accel_x            = cgi.Cvar_Get("cg_te_accel_x", "0", 0);
+    cg_te_accel_y            = cgi.Cvar_Get("cg_te_accel_y", "0", 0);
+    cg_te_accel_z            = cgi.Cvar_Get("cg_te_accel_z", "0", 0);
+    cg_te_count              = cgi.Cvar_Get("cg_te_count", "1", 0);
+    cg_te_fade               = cgi.Cvar_Get("cg_te_fade", "0", 0);
+    cg_te_fadedelay          = cgi.Cvar_Get("cg_te_fadedelay", "0", 0);
+    cg_te_fadein             = cgi.Cvar_Get("cg_te_fadein", "0", 0);
+    cg_te_spawnrate          = cgi.Cvar_Get("cg_te_spawnrate", "1", 0);
+    cg_te_scalerate          = cgi.Cvar_Get("cg_te_scalerate", "0", 0);
+    cg_te_circle             = cgi.Cvar_Get("cg_te_circle", "0", 0);
+    cg_te_sphere             = cgi.Cvar_Get("cg_te_sphere", "0", 0);
+    cg_te_insphere           = cgi.Cvar_Get("cg_te_insphere", "0", 0);
+    cg_te_radius             = cgi.Cvar_Get("cg_te_radius", "0", 0);
+    cg_te_align              = cgi.Cvar_Get("cg_te_align", "0", 0);
+    cg_te_flickeralpha       = cgi.Cvar_Get("cg_te_flickeralpha", "0", 0);
+    cg_te_collision          = cgi.Cvar_Get("cg_te_collision", "0", 0);
+    cg_te_randomroll         = cgi.Cvar_Get("cg_te_randomroll", "0", 0);
+    cg_te_offsbase_x         = cgi.Cvar_Get("cg_te_offsbase_x", "0", 0);
+    cg_te_offsbase_y         = cgi.Cvar_Get("cg_te_offsbase_y", "0", 0);
+    cg_te_offsbase_z         = cgi.Cvar_Get("cg_te_offsbase_z", "0", 0);
+    cg_te_offsamp_x          = cgi.Cvar_Get("cg_te_offsamp_x", "0", 0);
+    cg_te_offsamp_y          = cgi.Cvar_Get("cg_te_offsamp_y", "0", 0);
+    cg_te_offsamp_z          = cgi.Cvar_Get("cg_te_offsamp_z", "0", 0);
+    cg_te_anglesbase_p       = cgi.Cvar_Get("cg_te_anglesbase_p", "0", 0);
+    cg_te_anglesbase_y       = cgi.Cvar_Get("cg_te_anglesbase_y", "0", 0);
+    cg_te_anglesbase_r       = cgi.Cvar_Get("cg_te_anglesbase_r", "0", 0);
+    cg_te_anglesamp_p        = cgi.Cvar_Get("cg_te_anglesamp_p", "0", 0);
+    cg_te_anglesamp_y        = cgi.Cvar_Get("cg_te_anglesamp_y", "0", 0);
+    cg_te_anglesamp_r        = cgi.Cvar_Get("cg_te_anglesamp_r", "0", 0);
+    cg_te_randvelbase_x      = cgi.Cvar_Get("cg_te_randvelbase_x", "0", 0);
+    cg_te_randvelbase_y      = cgi.Cvar_Get("cg_te_randvelbase_y", "0", 0);
+    cg_te_randvelbase_z      = cgi.Cvar_Get("cg_te_randvelbase_z", "0", 0);
+    cg_te_randvelamp_x       = cgi.Cvar_Get("cg_te_randvelamp_x", "0", 0);
+    cg_te_randvelamp_y       = cgi.Cvar_Get("cg_te_randvelamp_y", "0", 0);
+    cg_te_randvelamp_z       = cgi.Cvar_Get("cg_te_randvelamp_z", "0", 0);
+    cg_te_clampvelmin_x      = cgi.Cvar_Get("cg_te_clampvelmin_x", "-9999", 0);
+    cg_te_clampvelmax_x      = cgi.Cvar_Get("cg_te_clampvelmax_x", "9999", 0);
+    cg_te_clampvelmin_y      = cgi.Cvar_Get("cg_te_clampvelmin_y", "-9999", 0);
+    cg_te_clampvelmax_y      = cgi.Cvar_Get("cg_te_clampvelmax_y", "9999", 0);
+    cg_te_clampvelmin_z      = cgi.Cvar_Get("cg_te_clampvelmin_z", "-9999", 0);
+    cg_te_clampvelmax_z      = cgi.Cvar_Get("cg_te_clampvelmax_z", "9999", 0);
+    cg_te_clampvelaxis       = cgi.Cvar_Get("cg_te_clampvelaxis", "0", 0);
+    cg_te_forwardvel         = cgi.Cvar_Get("cg_te_forwardvel", "0", 0);
+    cg_te_volumetric         = cgi.Cvar_Get("cg_te_volumetric", "0", 0);
+    cg_te_randaxis           = cgi.Cvar_Get("cg_te_randaxis", "0", 0);
+    cg_te_axisoffsbase_x     = cgi.Cvar_Get("cg_te_axisoffsbase_x", "0", 0);
+    cg_te_axisoffsbase_y     = cgi.Cvar_Get("cg_te_axisoffsbase_y", "0", 0);
+    cg_te_axisoffsbase_z     = cgi.Cvar_Get("cg_te_axisoffsbase_z", "0", 0);
+    cg_te_axisoffsamp_x      = cgi.Cvar_Get("cg_te_axisoffsamp_x", "0", 0);
+    cg_te_axisoffsamp_y      = cgi.Cvar_Get("cg_te_axisoffsamp_y", "0", 0);
+    cg_te_axisoffsamp_z      = cgi.Cvar_Get("cg_te_axisoffsamp_z", "0", 0);
+    cg_te_swarm_freq         = cgi.Cvar_Get("cg_te_swarm_freq", "0", 0);
+    cg_te_swarm_maxspeed     = cgi.Cvar_Get("cg_te_swarm_maxspeed", "0", 0);
+    cg_te_swarm_delta        = cgi.Cvar_Get("cg_te_swarm_delta", "0", 0);
+    cg_te_avelbase_p         = cgi.Cvar_Get("cg_te_avelbase_p", "0", 0);
+    cg_te_avelbase_y         = cgi.Cvar_Get("cg_te_avelbase_y", "0", 0);
+    cg_te_avelbase_r         = cgi.Cvar_Get("cg_te_avelbase_r", "0", 0);
+    cg_te_avelamp_p          = cgi.Cvar_Get("cg_te_avelamp_p", "0", 0);
+    cg_te_avelamp_y          = cgi.Cvar_Get("cg_te_avelamp_y", "0", 0);
+    cg_te_avelamp_r          = cgi.Cvar_Get("cg_te_avelamp_r", "0", 0);
+    cg_te_radial_scale       = cgi.Cvar_Get("cg_te_radial_scale", "0", 0);
+    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_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);
-    cg_te_spawnrange_b = cgi.Cvar_Get("cg_te_spawnrange_b", "0", 0);
-    cg_te_cone_height = cgi.Cvar_Get("cg_te_cone_height", "0", 0);
+    cg_te_spawnrange_a       = cgi.Cvar_Get("cg_te_spawnrange_a", "0", 0);
+    cg_te_spawnrange_b       = cgi.Cvar_Get("cg_te_spawnrange_b", "0", 0);
+    cg_te_cone_height        = cgi.Cvar_Get("cg_te_cone_height", "0", 0);
     cg_te_alignstretch_scale = cgi.Cvar_Get("cg_te_alignstretch_scale", "0", 0);
-    cg_te_command_time = cgi.Cvar_Get("cg_te_command_time", "0", 0);
-    cg_te_singlelinecommand = cgi.Cvar_Get("cg_te_singlelinecommand", "", 0);
-    cg_te_tag = cgi.Cvar_Get("cg_te_tag", "", 0);
+    cg_te_command_time       = cgi.Cvar_Get("cg_te_command_time", "0", 0);
+    cg_te_singlelinecommand  = cgi.Cvar_Get("cg_te_singlelinecommand", "", 0);
+    cg_te_tag                = cgi.Cvar_Get("cg_te_tag", "", 0);
 
     for (int i = 0; i < MAX_TESTEMITTERS_SAVE; ++i) {
         CG_SaveEffectCommandCvars(i);
     }
 
-    cg_te_xangles = cgi.Cvar_Get("cg_te_xangles", "0", 0);
-    cg_te_yangles = cgi.Cvar_Get("cg_te_yangles", "0", 0);
-    cg_te_zangles = cgi.Cvar_Get("cg_te_zangles", "0", 0);
+    cg_te_xangles      = cgi.Cvar_Get("cg_te_xangles", "0", 0);
+    cg_te_yangles      = cgi.Cvar_Get("cg_te_yangles", "0", 0);
+    cg_te_zangles      = cgi.Cvar_Get("cg_te_zangles", "0", 0);
     cg_te_emittermodel = cgi.Cvar_Get("cg_te_emittermodel", "", 0);
-    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_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);
 
     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;
+    te_refEnt.scale      = 0.0;
+    cg_te_numCommands    = cgi.Cvar_Get("cg_te_numCommands", "0", 0);
+    te_iNumCommands      = 0;
+    te_iCurrCommand      = 0;
 
     pTesteffect = sfxManager.GetTestEffectPointer();
 }

code/cgame/cg_ui.cpp

@@ -62,8 +62,7 @@ void CG_MessageMode_Private_f(void)
     }
 
     clientNum = atoi(cgi.Argv(1)) - 1;
-    if (clientNum < 0 || clientNum >= MAX_CLIENTS)
-    {
+    if (clientNum < 0 || clientNum >= MAX_CLIENTS) {
         cgi.Printf(HUD_MESSAGE_CHAT_WHITE "Message Error: %s is a bad client number\n", cgi.Argv(1));
         return;
     }
@@ -79,8 +78,7 @@ void CG_MessageSingleAll_f(void)
 
     if (cgi.Argc() > 1) {
         cgi.SendClientCommand(va("dmmessage 0 %s\n", cgi.Args()));
-    }
-    else {
+    } else {
         cgi.UI_ToggleDMMessageConsole(-100);
     }
 }
@@ -93,8 +91,7 @@ void CG_MessageSingleTeam_f(void)
 
     if (cgi.Argc() > 1) {
         cgi.SendClientCommand(va("dmmessage -1 %s\n", cgi.Args()));
-    }
-    else {
+    } else {
         cgi.UI_ToggleDMMessageConsole(-200);
     }
 }
@@ -108,14 +105,12 @@ void CG_MessageSingleClient_f(void)
     }
 
     clientNum = atoi(cgi.Argv(1));
-    if (clientNum < 1 || clientNum > MAX_CLIENTS)
-    {
+    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;
     }
 
-    if (cgi.Argc() > 2)
-    {
+    if (cgi.Argc() > 2) {
         int i;
         str sString;
 
@@ -129,8 +124,7 @@ void CG_MessageSingleClient_f(void)
 
         sString += "\n";
         cgi.SendClientCommand(sString.c_str());
-    }
-    else {
+    } else {
         cgi.UI_ToggleDMMessageConsole(-clientNum);
     }
 }
@@ -195,7 +189,7 @@ void CG_InstaMessageGroupE_f(void)
 
 void CG_HudPrint_f(void)
 {
-    cgi.Printf("\x1%s", cgi.Argv(0));
+    cgi.Printf("\x1%s", cgi.Argv(1));
 }
 
 int CG_CheckCaptureKey(int key, qboolean down, unsigned int time)

code/cgame/cg_vehicle.cpp

@@ -26,17 +26,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "cg_commands.h"
 
-void CG_Vehicle(centity_t* cent)
-{
+void CG_Vehicle(centity_t *cent) {}
 
-}
-
-void ClientGameCommandManager::SpawnTreads(Event* ev)
+void ClientGameCommandManager::SpawnTreads(Event *ev)
 {
     // stub
 }
 
-void ClientGameCommandManager::TreadsOff(Event* ev)
+void ClientGameCommandManager::TreadsOff(Event *ev)
 {
     // stub
 }

code/cgame/cg_viewmodelanim.c

@@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "tiki.h"
 
-static const char* AnimPrefixList[] =
-{
+static const char *AnimPrefixList[] = {
     "",
     "papers",
     "colt45",
@@ -60,7 +59,6 @@ static const char* AnimPrefixList[] =
     "enfieldl42a1",
     "carcano",
     "delisle",
-    "thompson",
     "sten",
     "ppsh",
     "moschetto",
@@ -82,8 +80,7 @@ static const char* AnimPrefixList[] =
     "PIAT"
 };
 
-enum animPrefix_e
-{
+enum animPrefix_e {
     WPREFIX_NONE,
     WPREFIX_PAPERS,
     WPREFIX_COLT45,
@@ -102,191 +99,224 @@ enum animPrefix_e
     WPREFIX_BAZOOKA,
     WPREFIX_PANZERSCHRECK,
     WPREFIX_SHOTGUN,
-	WPREFIX_UNARMED,
-	//
-	// Team Assault and Team Tactics weapons
-	WPREFIX_MG42_PORTABLE,
-	WPREFIX_WEBLEY,
-	WPREFIX_NAGANTREV,
-	WPREFIX_BERETTA,
-	WPREFIX_ENFIELD,
-	WPREFIX_SVT,
-	WPREFIX_MOSIN,
-	WPREFIX_G43,
-	WPREFIX_ENFIELDL42A,
-	WPREFIX_CARCANO,
-	WPREFIX_DELISLE,
-	WPREFIX_STEN,
-	WPREFIX_PPSH,
-	WPREFIX_MOSCHETTO,
-	WPREFIX_FG42,
-	WPREFIX_VICKERS,
-	WPREFIX_BREDA,
-	WPREFIX_F1_GRENADE,
-	WPREFIX_MILLS_GRENADE,
-	WPREFIX_NEBELHANDGRANATE,
-	WPREFIX_M18_SMOKE_GRENADE,
-	WPREFIX_RDG1_SMOKE_GRENADE,
+    WPREFIX_UNARMED,
+    //
+    // Team Assault and Team Tactics weapons
+    WPREFIX_MG42_PORTABLE,
+    WPREFIX_WEBLEY,
+    WPREFIX_NAGANTREV,
+    WPREFIX_BERETTA,
+    WPREFIX_ENFIELD,
+    WPREFIX_SVT,
+    WPREFIX_MOSIN,
+    WPREFIX_G43,
+    WPREFIX_ENFIELDL42A,
+    WPREFIX_CARCANO,
+    WPREFIX_DELISLE,
+    WPREFIX_STEN,
+    WPREFIX_PPSH,
+    WPREFIX_MOSCHETTO,
+    WPREFIX_FG42,
+    WPREFIX_VICKERS,
+    WPREFIX_BREDA,
+    WPREFIX_F1_GRENADE,
+    WPREFIX_MILLS_GRENADE,
+    WPREFIX_NEBELHANDGRANATE,
+    WPREFIX_M18_SMOKE_GRENADE,
+    WPREFIX_RDG1_SMOKE_GRENADE,
     WPREFIX_BOMBA,
-	WPREFIX_BOMBA_BREDA,
-	WPREFIX_MINE,
-	WPREFIX_MINE_DETECTOR,
-	WPREFIX_MINE_DETECTOR_AXIS,
-	WPREFIX_DETONATOR,
-	WPREFIX_KAR98_MORTAR,
-	WPREFIX_PIAT
+    WPREFIX_BOMBA_BREDA,
+    WPREFIX_MINE,
+    WPREFIX_MINE_DETECTOR,
+    WPREFIX_MINE_DETECTOR_AXIS,
+    WPREFIX_DETONATOR,
+    WPREFIX_KAR98_MORTAR,
+    WPREFIX_PIAT
 };
 
 int CG_GetVMAnimPrefixIndex()
 {
-    const char* szWeaponName;
-    int iWeaponClass;
+    const char *szWeaponName;
+    int         iWeaponClass;
 
     iWeaponClass = cg.snap->ps.stats[STAT_EQUIPPED_WEAPON];
     szWeaponName = CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1]);
 
-    if (iWeaponClass & WEAPON_CLASS_ANY_ITEM)
-    {
-        if (!Q_stricmp(szWeaponName, "Papers"))
-			return WPREFIX_PAPERS;
-		if (!Q_stricmp(szWeaponName, "Packed MG42 Turret"))
-			return WPREFIX_MG42_PORTABLE;
-    }
-    else if (iWeaponClass & WEAPON_CLASS_PISTOL)
-    {
-        if (!Q_stricmp(szWeaponName, "Colt 45"))
+    if (iWeaponClass & WEAPON_CLASS_ANY_ITEM) {
+        if (!Q_stricmp(szWeaponName, "Papers")) {
+            return WPREFIX_PAPERS;
+        }
+        if (!Q_stricmp(szWeaponName, "Packed MG42 Turret")) {
+            return WPREFIX_MG42_PORTABLE;
+        }
+    } else if (iWeaponClass & WEAPON_CLASS_PISTOL) {
+        if (!Q_stricmp(szWeaponName, "Colt 45")) {
             return WPREFIX_COLT45;
-        if (!Q_stricmp(szWeaponName, "Walther P38"))
+        }
+        if (!Q_stricmp(szWeaponName, "Walther P38")) {
             return WPREFIX_P38;
-        if (!Q_stricmp(szWeaponName, "Hi-Standard Silenced"))
-			return WPREFIX_HISTANDARD;
-
-		//
-		// Team Assault and Team Tactics
-		//
-		if (!Q_stricmp(szWeaponName, "Webley Revolver"))
-			return WPREFIX_WEBLEY;
-		if (!Q_stricmp(szWeaponName, "Nagant Revolver"))
-			return WPREFIX_NAGANTREV;
-		if (!Q_stricmp(szWeaponName, "Beretta"))
-			return WPREFIX_BERETTA;
-
-        return WPREFIX_COLT45;
-    }
-    else if (iWeaponClass & WEAPON_CLASS_RIFLE)
-    {
-        if (!Q_stricmp(szWeaponName, "M1 Garand"))
-            return WPREFIX_GARAND;
-        if (!Q_stricmp(szWeaponName, "Mauser KAR 98K"))
-            return WPREFIX_KAR98;
-        if (!Q_stricmp(szWeaponName, "KAR98 - Sniper"))
-            return WPREFIX_KAR98SNIPER;
-        if (!Q_stricmp(szWeaponName, "Springfield '03 Sniper"))
-			return WPREFIX_SPRINGFIELD;
+        }
+        if (!Q_stricmp(szWeaponName, "Hi-Standard Silenced")) {
+            return WPREFIX_HISTANDARD;
+        }
 
         //
         // Team Assault and Team Tactics
         //
-		if (!Q_stricmp(szWeaponName, "Lee-Enfield"))
-			return WPREFIX_SPRINGFIELD;
-		if (!Q_stricmp(szWeaponName, "SVT 40"))
-			return WPREFIX_SVT;
-		if (!Q_stricmp(szWeaponName, "Mosin Nagant Rifle"))
-			return WPREFIX_MOSIN;
-		if (!Q_stricmp(szWeaponName, "G 43"))
-			return WPREFIX_G43;
-		if (!Q_stricmp(szWeaponName, "Enfield L42A1"))
-			return WPREFIX_ENFIELD;
-		if (!Q_stricmp(szWeaponName, "Carcano"))
-			return WPREFIX_CARCANO;
-		if (!Q_stricmp(szWeaponName, "DeLisle"))
-			return WPREFIX_DELISLE;
+        if (!Q_stricmp(szWeaponName, "Webley Revolver")) {
+            return WPREFIX_WEBLEY;
+        }
+        if (!Q_stricmp(szWeaponName, "Nagant Revolver")) {
+            return WPREFIX_NAGANTREV;
+        }
+        if (!Q_stricmp(szWeaponName, "Beretta")) {
+            return WPREFIX_BERETTA;
+        }
+
+        return WPREFIX_COLT45;
+    } else if (iWeaponClass & WEAPON_CLASS_RIFLE) {
+        if (!Q_stricmp(szWeaponName, "M1 Garand")) {
+            return WPREFIX_GARAND;
+        }
+        if (!Q_stricmp(szWeaponName, "Mauser KAR 98K")) {
+            return WPREFIX_KAR98;
+        }
+        if (!Q_stricmp(szWeaponName, "KAR98 - Sniper")) {
+            return WPREFIX_KAR98SNIPER;
+        }
+        if (!Q_stricmp(szWeaponName, "Springfield '03 Sniper")) {
+            return WPREFIX_SPRINGFIELD;
+        }
+
+        //
+        // Team Assault and Team Tactics
+        //
+        if (!Q_stricmp(szWeaponName, "Lee-Enfield")) {
+            return WPREFIX_ENFIELD;
+        }
+        if (!Q_stricmp(szWeaponName, "SVT 40")) {
+            return WPREFIX_SVT;
+        }
+        if (!Q_stricmp(szWeaponName, "Mosin Nagant Rifle")) {
+            return WPREFIX_MOSIN;
+        }
+        if (!Q_stricmp(szWeaponName, "G 43")) {
+            return WPREFIX_G43;
+        }
+        if (!Q_stricmp(szWeaponName, "Enfield L42A1")) {
+            return WPREFIX_ENFIELDL42A;
+        }
+        if (!Q_stricmp(szWeaponName, "Carcano")) {
+            return WPREFIX_CARCANO;
+        }
+        if (!Q_stricmp(szWeaponName, "DeLisle")) {
+            return WPREFIX_DELISLE;
+        }
 
         return WPREFIX_GARAND;
-    }
-    else if (iWeaponClass & WEAPON_CLASS_SMG)
-    {
-        if (!Q_stricmp(szWeaponName, "Thompson"))
+    } else if (iWeaponClass & WEAPON_CLASS_SMG) {
+        if (!Q_stricmp(szWeaponName, "Thompson")) {
             return WPREFIX_THOMPSON;
-        if (!Q_stricmp(szWeaponName, "MP40"))
-			return WPREFIX_MP40;
-		//
-		// Team Assault and Team Tactics
-		//
-		if (!Q_stricmp(szWeaponName, "Sten Mark II"))
-			return WPREFIX_STEN;
-		if (!Q_stricmp(szWeaponName, "PPSH SMG"))
-			return WPREFIX_PPSH;
-		if (!Q_stricmp(szWeaponName, "Moschetto"))
-			return WPREFIX_MOSCHETTO;
+        }
+        if (!Q_stricmp(szWeaponName, "MP40")) {
+            return WPREFIX_MP40;
+        }
+        //
+        // Team Assault and Team Tactics
+        //
+        if (!Q_stricmp(szWeaponName, "Sten Mark II")) {
+            return WPREFIX_STEN;
+        }
+        if (!Q_stricmp(szWeaponName, "PPSH SMG")) {
+            return WPREFIX_PPSH;
+        }
+        if (!Q_stricmp(szWeaponName, "Moschetto")) {
+            return WPREFIX_MOSCHETTO;
+        }
 
         return WPREFIX_THOMPSON;
-    }
-    else if (iWeaponClass & WEAPON_CLASS_MG)
-    {
-        if (!Q_stricmp(szWeaponName, "BAR"))
+    } else if (iWeaponClass & WEAPON_CLASS_MG) {
+        if (!Q_stricmp(szWeaponName, "BAR")) {
             return WPREFIX_BAR;
-        if (!Q_stricmp(szWeaponName, "StG 44"))
-			return WPREFIX_MP44;
-		//
-		// Team Assault and Team Tactics
-		//
-		if (!Q_stricmp(szWeaponName, "FG 42"))
-			return WPREFIX_MP44;
-		if (!Q_stricmp(szWeaponName, "Vickers-Berthier"))
-			return WPREFIX_MP44;
-		if (!Q_stricmp(szWeaponName, "Breda"))
-			return WPREFIX_MP44;
+        }
+        if (!Q_stricmp(szWeaponName, "StG 44")) {
+            return WPREFIX_MP44;
+        }
+        //
+        // Team Assault and Team Tactics
+        //
+        if (!Q_stricmp(szWeaponName, "FG 42")) {
+            return WPREFIX_MP44;
+        }
+        if (!Q_stricmp(szWeaponName, "Vickers-Berthier")) {
+            return WPREFIX_VICKERS;
+        }
+        if (!Q_stricmp(szWeaponName, "Breda")) {
+            return WPREFIX_BREDA;
+        }
 
         return WPREFIX_BAR;
-    }
-    else if (iWeaponClass & WEAPON_CLASS_GRENADE)
-    {
-        if (!Q_stricmp(szWeaponName, "Frag Grenade"))
+    } else if (iWeaponClass & WEAPON_CLASS_GRENADE) {
+        if (!Q_stricmp(szWeaponName, "Frag Grenade")) {
             return WPREFIX_FRAGGRENADE;
-        if (!Q_stricmp(szWeaponName, "Stielhandgranate"))
-			return WPREFIX_STIELHANDGRANATE;
-		//
-		// Team Assault and Team Tactics
-		//
-		if (!Q_stricmp(szWeaponName, "F1 Grenade"))
-			return WPREFIX_F1_GRENADE;
-		if (!Q_stricmp(szWeaponName, "Mills Grenade"))
-			return WPREFIX_MILLS_GRENADE;
-        if (!Q_stricmp(szWeaponName, "Nebelhandgranate"))
+        }
+        if (!Q_stricmp(szWeaponName, "Stielhandgranate")) {
+            return WPREFIX_STIELHANDGRANATE;
+        }
+        //
+        // Team Assault and Team Tactics
+        //
+        if (!Q_stricmp(szWeaponName, "F1 Grenade")) {
+            return WPREFIX_F1_GRENADE;
+        }
+        if (!Q_stricmp(szWeaponName, "Mills Grenade")) {
+            return WPREFIX_MILLS_GRENADE;
+        }
+        if (!Q_stricmp(szWeaponName, "Nebelhandgranate")) {
             return WPREFIX_NEBELHANDGRANATE;
-		if (!Q_stricmp(szWeaponName, "M18 Smoke Grenade"))
-			return WPREFIX_M18_SMOKE_GRENADE;
-		if (!Q_stricmp(szWeaponName, "RDG-1 Smoke Grenade"))
-			return WPREFIX_RDG1_SMOKE_GRENADE;
-        if (!Q_stricmp(szWeaponName, "Bomba A Mano"))
+        }
+        if (!Q_stricmp(szWeaponName, "M18 Smoke Grenade")) {
+            return WPREFIX_M18_SMOKE_GRENADE;
+        }
+        if (!Q_stricmp(szWeaponName, "RDG-1 Smoke Grenade")) {
+            return WPREFIX_RDG1_SMOKE_GRENADE;
+        }
+        if (!Q_stricmp(szWeaponName, "Bomba A Mano")) {
             return WPREFIX_BOMBA;
-		if (!Q_stricmp(szWeaponName, "Bomba A Mano Breda"))
-			return WPREFIX_BOMBA_BREDA;
-		if (!Q_stricmp(szWeaponName, "LandmineAllies"))
-			return WPREFIX_MINE;
-		if (!Q_stricmp(szWeaponName, "LandmineAxis"))
-			return WPREFIX_MINE;
-		if (!Q_stricmp(szWeaponName, "Minensuchgerat"))
-			return WPREFIX_MINE_DETECTOR_AXIS;
-		if (!Q_stricmp(szWeaponName, "Minedetector"))
-			return WPREFIX_MINE_DETECTOR;
+        }
+        if (!Q_stricmp(szWeaponName, "Bomba A Mano Breda")) {
+            return WPREFIX_BOMBA_BREDA;
+        }
+        if (!Q_stricmp(szWeaponName, "LandmineAllies")) {
+            return WPREFIX_MINE;
+        }
+        if (!Q_stricmp(szWeaponName, "LandmineAxis")) {
+            return WPREFIX_MINE;
+        }
+        if (!Q_stricmp(szWeaponName, "Minensuchgerat")) {
+            return WPREFIX_MINE_DETECTOR_AXIS;
+        }
+        if (!Q_stricmp(szWeaponName, "Minedetector")) {
+            return WPREFIX_MINE_DETECTOR;
+        }
 
         return WPREFIX_FRAGGRENADE;
-    }
-    else if (iWeaponClass & WEAPON_CLASS_HEAVY)
-    {
-        if (!Q_stricmp(szWeaponName, "Bazooka"))
+    } else if (iWeaponClass & WEAPON_CLASS_HEAVY) {
+        if (!Q_stricmp(szWeaponName, "Bazooka")) {
             return WPREFIX_BAZOOKA;
-        if (!Q_stricmp(szWeaponName, "Panzerschreck"))
+        }
+        if (!Q_stricmp(szWeaponName, "Panzerschreck")) {
             return WPREFIX_PANZERSCHRECK;
-        if (!Q_stricmp(szWeaponName, "Shotgun"))
-			return WPREFIX_SHOTGUN;
-		//
-		// Team Assault and Team Tactics
-		//
-		if (!Q_stricmp(szWeaponName, "PIAT"))
-			return WPREFIX_PIAT;
+        }
+        if (!Q_stricmp(szWeaponName, "Shotgun")) {
+            return WPREFIX_SHOTGUN;
+        }
+        //
+        // Team Assault and Team Tactics
+        //
+        if (!Q_stricmp(szWeaponName, "PIAT")) {
+            return WPREFIX_PIAT;
+        }
 
         return WPREFIX_BAZOOKA;
     }
@@ -294,63 +324,55 @@ int CG_GetVMAnimPrefixIndex()
     return WPREFIX_UNARMED;
 }
 
-void CG_ViewModelAnimation(refEntity_t* pModel)
+void CG_ViewModelAnimation(refEntity_t *pModel)
 {
-    int i;
-    int iAnimFlags;
-    float fCrossblendTime, fCrossblendFrac, fCrossblendAmount;
-    float fAnimLength;
-    int iAnimPrefixIndex;
-    const char* pszAnimSuffix;
-    char szAnimName[MAX_QPATH];
-    dtiki_t* pTiki;
-    qboolean bAnimChanged;
+    int         i;
+    int         iAnimFlags;
+    float       fCrossblendTime, fCrossblendFrac, fCrossblendAmount;
+    float       fAnimLength;
+    int         iAnimPrefixIndex;
+    const char *pszAnimSuffix;
+    char        szAnimName[MAX_QPATH];
+    dtiki_t    *pTiki;
+    qboolean    bAnimChanged;
 
     fCrossblendFrac = 0.0;
-    bAnimChanged = 0;
-    pTiki = pModel->tiki;
+    bAnimChanged    = 0;
+    pTiki           = pModel->tiki;
 
     if (cgi.anim->g_iLastEquippedWeaponStat == cg.snap->ps.stats[STAT_EQUIPPED_WEAPON]
-        && !strcmp(cgi.anim->g_szLastActiveItem, CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1])))
-    {
+        && !strcmp(cgi.anim->g_szLastActiveItem, CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1]))) {
         iAnimPrefixIndex = cgi.anim->g_iLastAnimPrefixIndex;
-    }
-    else
-    {
-        iAnimPrefixIndex = CG_GetVMAnimPrefixIndex();
+    } 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]));
         cgi.anim->g_iLastAnimPrefixIndex = iAnimPrefixIndex;
-        bAnimChanged = qtrue;
+        bAnimChanged                     = qtrue;
     }
 
-    if (cgi.anim->g_iLastVMAnim == -1)
-    {
+    if (cgi.anim->g_iLastVMAnim == -1) {
         sprintf(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)
-        {
+        if (cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index == -1) {
             cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index = cgi.Anim_NumForName(pTiki, "idle");
             cgi.DPrintf("Warning: Couldn't find view model animation %s\n", szAnimName);
         }
 
-        cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].time = 0.0;
+        cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].time   = 0.0;
         cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].weight = 1.0;
-        cgi.anim->g_iLastVMAnim = 0;
+        cgi.anim->g_iLastVMAnim                                        = 0;
     }
 
-    if (cg.snap->ps.iViewModelAnimChanged != cgi.anim->g_iLastVMAnimChanged)
-    {
-        bAnimChanged = qtrue;
-        cgi.anim->g_iLastVMAnim = cg.snap->ps.iViewModelAnim;
+    if (cg.snap->ps.iViewModelAnimChanged != cgi.anim->g_iLastVMAnimChanged) {
+        bAnimChanged                   = qtrue;
+        cgi.anim->g_iLastVMAnim        = cg.snap->ps.iViewModelAnim;
         cgi.anim->g_iLastVMAnimChanged = cg.snap->ps.iViewModelAnimChanged;
     }
 
-    if (bAnimChanged)
-    {
-        switch (cgi.anim->g_iLastVMAnim)
-        {
+    if (bAnimChanged) {
+        switch (cgi.anim->g_iLastVMAnim) {
         case VM_ANIM_CHARGE:
             pszAnimSuffix = "charge";
             break;
@@ -381,39 +403,35 @@ void CG_ViewModelAnimation(refEntity_t* pModel)
         case VM_ANIM_LADDERSTEP:
             pszAnimSuffix = "ladderstep";
             break;
-		case VM_ANIM_IDLE_0:
-			pszAnimSuffix = "idle0";
-			break;
-		case VM_ANIM_IDLE_1:
-			pszAnimSuffix = "idle1";
-			break;
-		case VM_ANIM_IDLE_2:
-			pszAnimSuffix = "idle2";
-			break;
-		case VM_ANIM_DISABLED:
-			pszAnimSuffix = "disabled";
-			break;
+        case VM_ANIM_IDLE_0:
+            pszAnimSuffix = "idle0";
+            break;
+        case VM_ANIM_IDLE_1:
+            pszAnimSuffix = "idle1";
+            break;
+        case VM_ANIM_IDLE_2:
+            pszAnimSuffix = "idle2";
+            break;
+        case VM_ANIM_DISABLED:
+            pszAnimSuffix = "disabled";
+            break;
         default:
-		case VM_ANIM_IDLE:
-			pszAnimSuffix = "idle";
-			break;
+        case VM_ANIM_IDLE:
+            pszAnimSuffix = "idle";
+            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;
 
-        if (fCrossblendAmount < fCrossblendTime && fCrossblendAmount > 0.0)
-        {
+        if (fCrossblendAmount < fCrossblendTime && fCrossblendAmount > 0.0) {
             fCrossblendFrac = fCrossblendAmount / fCrossblendTime;
-            for (i = 0; i < MAX_FRAMEINFOS; ++i)
-            {
-                if (cgi.anim->g_VMFrameInfo[i].weight)
-                {
+            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 {
+                    } else {
                         cgi.anim->g_VMFrameInfo[i].weight *= (1.0 - fCrossblendFrac);
                     }
                 }
@@ -423,94 +441,79 @@ void CG_ViewModelAnimation(refEntity_t* pModel)
         cgi.anim->g_iCurrentVMAnimSlot = (cgi.anim->g_iCurrentVMAnimSlot + 1) % MAX_FRAMEINFOS;
         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)
-        {
+        if (cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index == -1) {
             cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index = cgi.Anim_NumForName(pTiki, "idle");
             cgi.DPrintf("Warning: Couldn't find view model animation %s\n", szAnimName);
         }
 
-        cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].time = 0.0;
+        cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].time   = 0.0;
         cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].weight = 1.0;
-        cgi.anim->g_iCurrentVMDuration = 0;
+        cgi.anim->g_iCurrentVMDuration                                 = 0;
 
         fCrossblendTime = cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
-        if (!fCrossblendTime)
-        {
-            for (i = 0; i < MAX_FRAMEINFOS; ++i)
-            {
+        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
-        {
+        } else {
             cgi.anim->g_bCrossblending = qtrue;
         }
     }
 
     cgi.anim->g_iCurrentVMDuration += cg.frametime;
-    if (cgi.anim->g_bCrossblending)
-    {
+    if (cgi.anim->g_bCrossblending) {
         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)
-        {
+        if (fCrossblendAmount >= fCrossblendTime || fCrossblendAmount <= 0.0) {
             // clear crossblend values
-            for (i = 0; i < MAX_FRAMEINFOS; ++i)
-            {
+            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 {
+        } else {
             fCrossblendFrac = fCrossblendAmount / fCrossblendTime;
         }
     }
 
-    for (i = 0; i < MAX_FRAMEINFOS; ++i)
-    {
-        if (!cgi.anim->g_VMFrameInfo[i].weight)
-        {
+    for (i = 0; i < MAX_FRAMEINFOS; ++i) {
+        if (!cgi.anim->g_VMFrameInfo[i].weight) {
             // clear the weight values of the ref entity
-            pModel->frameInfo[i].index = 0;
-            pModel->frameInfo[i].time = 0.0;
+            pModel->frameInfo[i].index  = 0;
+            pModel->frameInfo[i].time   = 0.0;
             pModel->frameInfo[i].weight = 0.0;
-        }
-        else
-        {
+        } else {
             fAnimLength = cgi.Anim_Time(pTiki, cgi.anim->g_VMFrameInfo[i].index);
             cgi.anim->g_VMFrameInfo[i].time += cg.frametime / 1000.0;
 
-            if (cgi.anim->g_VMFrameInfo[i].time > fAnimLength)
-            {
-                if (cgi.Anim_Flags(pTiki, cgi.anim->g_VMFrameInfo[i].index) & TAF_DELTADRIVEN) {
-                    cgi.anim->g_VMFrameInfo[i].time -= fAnimLength;
-                }
-                else {
-                    cgi.anim->g_VMFrameInfo[i].time = fAnimLength;
+            if (cgi.anim->g_VMFrameInfo[i].time > fAnimLength) {
+                if (pTiki) {
+                    if (cgi.Anim_Flags(pTiki, cgi.anim->g_VMFrameInfo[i].index) & TAF_DELTADRIVEN) {
+                        cgi.anim->g_VMFrameInfo[i].time -= fAnimLength;
+                    } else {
+                        cgi.anim->g_VMFrameInfo[i].time = fAnimLength;
+                    }
+                } else {
+                    cgi.anim->g_VMFrameInfo[i].time = 0.f;
                 }
             }
 
             pModel->frameInfo[i].index = cgi.anim->g_VMFrameInfo[i].index;
-            pModel->frameInfo[i].time = cgi.anim->g_VMFrameInfo[i].time;
+            pModel->frameInfo[i].time  = cgi.anim->g_VMFrameInfo[i].time;
 
-            if (cgi.anim->g_bCrossblending)
-            {
+            if (cgi.anim->g_bCrossblending) {
                 if (i == cgi.anim->g_iCurrentVMAnimSlot) {
                     pModel->frameInfo[i].weight = fCrossblendFrac;
+                } else {
+                    pModel->frameInfo[i].weight = cgi.anim->g_VMFrameInfo[i].weight * (1.0 - fCrossblendFrac);
                 }
-                else {
-                    pModel->frameInfo[i].weight *= (1.0 - fCrossblendFrac);
-                }
-            }
-            else
-            {
+            } else {
                 pModel->frameInfo[i].weight = 1.0;
             }
         }
@@ -519,60 +522,48 @@ void CG_ViewModelAnimation(refEntity_t* pModel)
     pModel->actionWeight = 1.0;
 }
 
-void CG_CalcViewModelMovement(float fViewBobPhase, float fViewBobAmp, vec_t* vVelocity, vec_t* vMovement)
+void CG_CalcViewModelMovement(float fViewBobPhase, float fViewBobAmp, vec_t *vVelocity, vec_t *vMovement)
 {
-    int i;
-    float fPhase, fDelta;
+    int    i;
+    float  fPhase, fDelta;
     vec3_t vTargOfs;
     vec3_t vNorm;
 
-    fPhase = sin(fViewBobPhase + M_PI / 10) * fViewBobAmp * vm_sway_side->value;
+    fPhase       = sin(fViewBobPhase + M_PI / 10) * fViewBobAmp * vm_sway_side->value;
     vMovement[0] = fPhase * vm_sway_front->value;
     vMovement[1] = fPhase;
 
-    fPhase = sin(fViewBobPhase - 0.94 + fViewBobPhase - 0.94 + M_PI);
+    fPhase       = sin(fViewBobPhase - 0.94 + fViewBobPhase - 0.94 + M_PI);
     vMovement[2] = (sin((fViewBobPhase - 0.94) * 4.0 + M_PI / 2) * 0.125 + fPhase) * fViewBobAmp * vm_sway_up->value;
 
-    if (cg.predicted_player_state.walking)
-    {
-        if (cg.predicted_player_state.viewheight == CROUCH_EYE_HEIGHT)
-        {
-            if (cgi.anim->g_iLastAnimPrefixIndex == WPREFIX_BAZOOKA || cgi.anim->g_iLastAnimPrefixIndex == WPREFIX_PANZERSCHRECK)
-            {
+    if (cg.predicted_player_state.walking) {
+        if (cg.predicted_player_state.viewheight == CROUCH_EYE_HEIGHT) {
+            if (cgi.anim->g_iLastAnimPrefixIndex == WPREFIX_BAZOOKA
+                || cgi.anim->g_iLastAnimPrefixIndex == WPREFIX_PANZERSCHRECK) {
                 vTargOfs[0] = vm_offset_rocketcrouch_front->value;
                 vTargOfs[1] = vm_offset_rocketcrouch_side->value;
                 vTargOfs[2] = vm_offset_rocketcrouch_up->value;
-            }
-            else if (cgi.anim->g_iLastAnimPrefixIndex == WPREFIX_SHOTGUN)
-            {
+            } else if (cgi.anim->g_iLastAnimPrefixIndex == WPREFIX_SHOTGUN) {
                 vTargOfs[0] = vm_offset_shotguncrouch_front->value;
                 vTargOfs[1] = vm_offset_shotguncrouch_side->value;
                 vTargOfs[2] = vm_offset_shotguncrouch_up->value;
-            }
-            else
-            {
+            } else {
                 vTargOfs[0] = vm_offset_crouch_front->value;
                 vTargOfs[1] = vm_offset_crouch_side->value;
                 vTargOfs[2] = vm_offset_crouch_up->value;
             }
-        }
-        else
-        {
+        } else {
             memset(vTargOfs, 0, sizeof(vTargOfs));
         }
-    }
-    else
-    {
+    } else {
         vTargOfs[0] = vm_offset_air_front->value;
         vTargOfs[1] = vm_offset_air_side->value;
         vTargOfs[2] = vm_offset_air_up->value;
     }
 
-    if (cg.predicted_player_state.walking)
-    {
+    if (cg.predicted_player_state.walking) {
         fDelta = VectorLength(vVelocity) - vm_offset_vel_base->value;
-        if (fDelta > 0.0)
-        {
+        if (fDelta > 0.0) {
             if (fDelta > 250.0 - vm_offset_vel_base->value) {
                 fDelta = 250.0 - vm_offset_vel_base->value;
             }
@@ -582,23 +573,19 @@ void CG_CalcViewModelMovement(float fViewBobPhase, float fViewBobAmp, vec_t* vVe
             vTargOfs[1] += fPhase * vm_offset_vel_side->value;
             vTargOfs[2] += fPhase * vm_offset_vel_up->value;
         }
-    }
-    else if (vVelocity[2]) {
+    } else if (vVelocity[2]) {
         vTargOfs[2] -= vVelocity[2] * vm_offset_upvel->value;
     }
 
-    for (i = 0; i < 3; i++)
-    {
+    for (i = 0; i < 3; i++) {
         fDelta = vTargOfs[i] - cgi.anim->g_vCurrentVMPosOffset[i];
         cgi.anim->g_vCurrentVMPosOffset[i] += cg.frametime / 1000.0 * fDelta * vm_offset_speed->value;
 
-        if (fDelta > 0.0)
-        {
+        if (fDelta > 0.0) {
             if (cgi.anim->g_vCurrentVMPosOffset[i] > vTargOfs[i]) {
                 cgi.anim->g_vCurrentVMPosOffset[i] = vTargOfs[i];
             }
-        }
-        else if (fDelta < 0.0) {
+        } else if (fDelta < 0.0) {
             if (cgi.anim->g_vCurrentVMPosOffset[i] < vTargOfs[i]) {
                 cgi.anim->g_vCurrentVMPosOffset[i] = vTargOfs[i];
             }

code/cgame/memarchiver.cpp

@@ -0,0 +1,241 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cg_local.h"
+#include "memarchiver.h"
+#include "../qcommon/vector.h"
+#include "../qcommon/str.h"
+
+MemArchiver::MemArchiver()
+{
+    state = MEMARC_WRITING;
+    buffer = 0;
+    allocatedSize = 0;
+    bufferSize = 0;
+}
+
+MemArchiver::~MemArchiver()
+{
+    if (state == MEMARC_WRITING && buffer) {
+        cgi.Free(buffer);
+    }
+}
+
+void MemArchiver::SetupForWriting(size_t initialSize)
+{
+    state = MEMARC_WRITING;
+    buffer = (byte*)cgi.Malloc(initialSize);
+    allocatedSize = initialSize;
+    bufferSize = 0;
+}
+
+void MemArchiver::SetupForReading(byte* buffer, size_t size)
+{
+    state = MEMARC_READING;
+    buffer = buffer;
+    allocatedSize = size;
+    bufferSize = 0;
+}
+
+void MemArchiver::SetBaseTime(unsigned int time)
+{
+    svsTime = time;
+}
+
+size_t MemArchiver::BufferSize() const
+{
+    return bufferSize;
+}
+
+byte* MemArchiver::ConfiscateBuffer()
+{
+    byte* confiscatedBuffer = buffer;
+
+    buffer = NULL;
+    allocatedSize = 0;
+    bufferSize = 0;
+
+    return confiscatedBuffer;
+}
+
+bool MemArchiver::IsReading() const
+{
+    return !IsWriting();
+}
+
+bool MemArchiver::IsWriting() const
+{
+    return state == MEMARC_WRITING;
+}
+
+bool MemArchiver::FinishedReading() const
+{
+    return bufferSize == allocatedSize;
+}
+
+void MemArchiver::ArchiveByte(byte* value)
+{
+    ArchiveRaw(value, sizeof(byte));
+}
+
+void MemArchiver::ArchiveBoolean(qboolean* value)
+{
+    ArchiveRaw(value, sizeof(qboolean));
+}
+
+void MemArchiver::ArchiveChar(char* value)
+{
+    ArchiveRaw(value, sizeof(char));
+}
+
+void MemArchiver::ArchiveUChar(unsigned char* value)
+{
+    ArchiveRaw(value, sizeof(unsigned char));
+}
+
+void MemArchiver::ArchiveShort(short* value)
+{
+    ArchiveRaw(value, sizeof(short));
+}
+
+void MemArchiver::ArchiveInteger(int* value)
+{
+    ArchiveRaw(value, sizeof(int));
+}
+
+void MemArchiver::ArchiveSize(size_t* value)
+{
+    ArchiveRaw(value, sizeof(size_t));
+}
+
+void MemArchiver::ArchiveFloat(float* value)
+{
+    ArchiveRaw(value, sizeof(float));
+}
+
+void MemArchiver::ArchiveVec3(vec3_t value)
+{
+    ArchiveRaw(value, sizeof(vec3_t));
+}
+
+void MemArchiver::ArchiveVector(Vector* value)
+{
+    ArchiveFloat(&value->x);
+    ArchiveFloat(&value->y);
+    ArchiveFloat(&value->z);
+}
+
+void MemArchiver::ArchiveString(str* value)
+{
+    char tmp[4096];
+    int current = 0;
+
+    if (IsReading()) {
+        for (current = 0; current < 4096; current++) {
+            ArchiveReadRaw(&tmp[current], sizeof(char));
+            if (!tmp[current]) {
+                break;
+            }
+        }
+
+        if (current == 4096) {
+            tmp[current - 1] = 0;
+        }
+
+        *value = tmp;
+    } else {
+        ArchiveWriteRaw(value->c_str(), value->length() + 1);
+    }
+}
+
+void MemArchiver::ArchiveTime(int* value)
+{
+    int time;
+
+    if (IsReading()) {
+        ArchiveReadRaw(&time, sizeof(time));
+
+        if (time) {
+            time += svsTime;
+        }
+
+        *value = time;
+    } else {
+        time = *value;
+        if (time) {
+            time -= svsTime;
+        }
+
+        ArchiveWriteRaw(&time, sizeof(time));
+    }
+}
+
+void MemArchiver::ArchiveRaw(void* buffer, size_t size)
+{
+    if (IsReading()) {
+        ArchiveReadRaw(buffer, size);
+    } else {
+        ArchiveWriteRaw(buffer, size);
+    }
+}
+
+void MemArchiver::ArchiveReadRaw(void* buffer, size_t size)
+{
+    if (!size) {
+        return;
+    }
+
+    if (size + this->bufferSize > this->allocatedSize) {
+        Com_Error(ERR_DROP, "MemArchiver: tried to read past end of buffer");
+    }
+
+    memcpy(buffer, this->buffer + this->bufferSize, size);
+    this->bufferSize += size;
+}
+
+void MemArchiver::ArchiveWriteRaw(const void* buffer, size_t size)
+{
+    if (!size) {
+        return;
+    }
+
+    if (size + this->bufferSize > this->allocatedSize) {
+        if (!this->allocatedSize) {
+            this->allocatedSize = 1024;
+            this->buffer = (byte*)cgi.Malloc(this->allocatedSize);
+        } else {
+            byte* newBuffer;
+
+            do {
+                this->allocatedSize *= 2;
+            } while (size + this->bufferSize > this->allocatedSize);
+
+            newBuffer = (byte*)cgi.Malloc(this->allocatedSize);
+            memcpy(newBuffer, this->buffer, this->bufferSize);
+            cgi.Free(this->buffer);
+            this->buffer = newBuffer;
+        }
+    }
+
+    memcpy(this->buffer + this->bufferSize, buffer, size);
+    this->bufferSize += size;
+}

code/cgame/memarchiver.h

@@ -0,0 +1,72 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// DESCRIPTION:
+// In-memory archiver
+
+#include "cg_local.h"
+
+class Vector;
+class str;
+
+typedef enum {
+    MEMARC_WRITING,
+    MEMARC_READING
+} archiverState_e;
+
+class MemArchiver {
+public:
+    MemArchiver();
+    ~MemArchiver();
+
+    void SetupForWriting(size_t initialSize);
+    void SetupForReading(byte* buffer, size_t size);
+    void SetBaseTime(unsigned int time);
+    size_t BufferSize() const;
+    byte* ConfiscateBuffer();
+    bool IsReading() const;
+    bool IsWriting() const;
+    bool FinishedReading() const;
+
+    void ArchiveByte(byte* value);
+    void ArchiveBoolean(qboolean* value);
+    void ArchiveChar(char* value);
+    void ArchiveUChar(unsigned char* value);
+    void ArchiveShort(short* value);
+    void ArchiveInteger(int* value);
+    void ArchiveSize(size_t* value);
+    void ArchiveFloat(float* value);
+    void ArchiveVec3(vec3_t value);
+    void ArchiveVector(Vector* value);
+    void ArchiveString(str* value);
+    void ArchiveTime(int* value);
+    void ArchiveRaw(void* buffer, size_t size);
+    void ArchiveReadRaw(void* buffer, size_t size);
+    void ArchiveWriteRaw(const void* buffer, size_t size);
+
+private:
+    archiverState_e state;
+    byte* buffer;
+    size_t bufferSize;
+    size_t allocatedSize;
+    int svsTime;
+};

code/client/CMakeLists.txt

@@ -19,5 +19,4 @@ target_link_libraries(omohclient INTERFACE gcd)
 target_compile_definitions(omohclient INTERFACE USE_CODEC_MP3)
 
 add_subdirectory("../libmad-0.15.1b" "./libmad")
-target_link_libraries(omohclient INTERFACE libmad)
-target_include_directories(omohclient INTERFACE "../libmad-0.15.1b")
+target_link_libraries(omohclient INTERFACE libmad)

code/client/cl_cgame.cpp

@@ -23,8 +23,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "client.h"
 #include "cl_ui.h"
+#include "cl_uiradar.h"
 #include "../qcommon/tiki.h"
 #include "../qcommon/localization.h"
+#include "../qcommon/bg_compat.h"
 
 extern qboolean loadCamera(const char *name);
 extern void startCamera(int time);
@@ -290,19 +292,17 @@ void CL_CgameError( const char *string ) {
 CL_ConfigstringModified
 =====================
 */
-void CL_ConfigstringModified( void ) {
-	char		*old, *s;
-	int			i, index;
+void CL_ConfigstringModified(int index, char* s) {
+	char		*old;
+	int			i;
 	char		*dup;
 	gameState_t	oldGs;
 	size_t		len;
 
-	index = atoi( Cmd_Argv(1) );
+	index = CPT_NormalizeConfigstring(index);
 	if ( index < 0 || index >= MAX_CONFIGSTRINGS ) {
 		Com_Error( ERR_DROP, "configstring > MAX_CONFIGSTRINGS" );
 	}
-	// get everything after "cs <num>"
-	s = Cmd_ArgsFrom(2);
 
 	old = cl.gameState.stringData + cl.gameState.stringOffsets[ index ];
 	if ( !strcmp( old, s ) ) {
@@ -346,6 +346,46 @@ void CL_ConfigstringModified( void ) {
 
 }
 
+/*
+=====================
+CL_ProcessServerCommand
+=====================
+*/
+qboolean CL_ProcessServerCommand(const char* origString, const char* cmd, qboolean differentServer) {
+    if (!strcmp(cmd, "disconnect")) {
+		// Execute the disconnect command in the main loop
+		// Never call Com_Error there:
+		// because this function might be called from a module that would be unloaded
+		// inside Com_Error
+        UI_ForceMenuOff(1);
+        Cbuf_AddText("disconnect;pushmenu disconnected");
+        return qtrue;
+    }
+
+    if (!strcmp(cmd, "cs")) {
+        CL_ConfigstringModified(atoi(Cmd_Argv(1)), Cmd_ArgsFrom(2));
+        // reparse the string, because CL_ConfigstringModified may have done another Cmd_TokenizeString()
+        Cmd_TokenizeString(origString);
+        return qtrue;
+    }
+
+	if (!strcmp(cmd, "fadesound")) {
+		Com_Printf("CL_ProcessServerCommand: fadesound '%s'\n", Cmd_Argv(1));
+
+		if (differentServer) {
+			Com_Printf("^~^~^ fadesound from previous map ignored\n");
+			return qfalse;
+		}
+
+		S_FadeSound(atof(Cmd_Argv(1)));
+		return qfalse;
+	}
+
+    // we may want to put a "connect to other server" command here
+
+    // cgame can now act on the command
+    return qtrue;
+}
 
 /*
 ===================
@@ -358,7 +398,6 @@ qboolean CL_GetServerCommand( int serverCommandNumber, qboolean differentServer
 	char	*s;
 	char	*cmd;
 	static char bigConfigString[BIG_INFO_STRING];
-	int argc;
 
 	// if we have irretrievably lost a reliable command, drop the connection
 	if ( serverCommandNumber <= clc.serverCommandSequence - MAX_RELIABLE_COMMANDS ) {
@@ -382,31 +421,10 @@ qboolean CL_GetServerCommand( int serverCommandNumber, qboolean differentServer
 		Com_DPrintf( "serverCommand: %i : %s\n", serverCommandNumber, s );
 	}
 
-rescan:
 	Cmd_TokenizeString( s );
 	cmd = Cmd_Argv(0);
-	argc = Cmd_Argc();
 
-	if ( !strcmp( cmd, "disconnect" ) ) {
-		// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=552
-		// allow server to indicate why they were disconnected
-		if ( argc >= 2 )
-			Com_Error( ERR_SERVERDISCONNECT, "Server disconnected - %s", Cmd_Argv( 1 ) );
-		else
-			Com_Error( ERR_SERVERDISCONNECT, "Server disconnected\n" );
-	}
-
-	if ( !strcmp( cmd, "cs" ) ) {
-		CL_ConfigstringModified();
-		// reparse the string, because CL_ConfigstringModified may have done another Cmd_TokenizeString()
-		Cmd_TokenizeString( s );
-		return qtrue;
-	}
-
-	// we may want to put a "connect to other server" command here
-
-	// cgame can now act on the command
-	return qtrue;
+	return CL_ProcessServerCommand(s, cmd, differentServer);
 }
 
 
@@ -417,10 +435,10 @@ CL_CM_LoadMap
 Just adds default parameters that cgame doesn't need to know about
 ====================
 */
-void CL_CM_LoadMap( const char *mapname ) {
-	int		checksum;
-
-	CM_LoadMap( mapname, qtrue, &checksum );
+void CL_CM_LoadMap( const char *mapname, int *checksum ) {
+	CM_LoadMap( mapname, qtrue, checksum );
+	// prepare world vis data
+	re.SetWorldVisData(CM_VisibilityPointer());
 }
 
 /*
@@ -443,6 +461,16 @@ void CL_CG_Free( void *ptr )
 	Z_Free( ptr );
 }
 
+/*
+====================
+CL_CG_AddReliableCommand
+====================
+*/
+void CL_CG_AddReliableCommand(const char* cmd)
+{
+	CL_AddReliableCommand(cmd, qfalse);
+}
+
 /*
 ====================
 CL_R_AddPolyToScene
@@ -513,6 +541,29 @@ void CL_StartLocalSound(const char* soundName, qboolean forceLoad) {
 	S_StartLocalSound(soundName, qfalse );
 }
 
+/*
+====================
+CL_RestoreSavedCgameState
+====================
+*/
+void CL_RestoreSavedCgameState() {
+	if (cls.savedCgameState) {
+		cge->CG_LoadStateToBuffer(&cls.savedCgameState, cls.savedCgameStateSize, cl.snap.serverTime);
+	}
+}
+
+/*
+====================
+CL_ClearSavedCgameState
+====================
+*/
+void CL_ClearSavedCgameState() {
+	if (cls.savedCgameState) {
+		cls.savedCgameState = NULL;
+		cls.savedCgameStateSize = 0;
+	}
+}
+
 /*
 ====================
 CL_InitCGameDLL
@@ -529,6 +580,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 
 	cgi->Printf							= Com_Printf;
 	cgi->DPrintf						= Com_DPrintf;
+	cgi->DebugPrintf					= Com_DebugPrintf;
 
 	cgi->Malloc							= CL_CG_Malloc;
 	cgi->Free							= CL_CG_Free;
@@ -554,6 +606,8 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->FS_FreeFile					= FS_FreeFile;
 	cgi->FS_WriteFile					= FS_WriteFile;
 	cgi->FS_WriteTextFile				= FS_WriteTextFile;
+    cgi->FS_ListFilteredFiles			= FS_ListFilteredFiles;
+    cgi->FS_FreeFileList				= FS_FreeFileList;
 
 	cgi->SendConsoleCommand				= Cbuf_AddText;
 
@@ -572,7 +626,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->MSG_ReadCoord					= CL_MSG_ReadCoord;
 	cgi->MSG_ReadDir					= CL_MSG_ReadDir;
 
-	cgi->SendClientCommand				= CL_AddReliableCommand;
+	cgi->SendClientCommand				= CL_CG_AddReliableCommand;
 
 	cgi->CM_LoadMap						= CL_CM_LoadMap;
 	cgi->CM_NumInlineModels				= CM_NumInlineModels;
@@ -625,9 +679,11 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->R_RegisterModel			= re.RegisterModel;
 	cgi->R_SpawnEffectModel			= re.SpawnEffectModel;
 	cgi->R_RegisterServerModel		= re.RegisterServerModel;
+	cgi->R_GetModelName				= re.GetModelName;
 	cgi->R_UnregisterServerModel	= re.UnregisterServerModel;
 	cgi->R_RegisterShader			= re.RegisterShader;
 	cgi->R_RegisterShaderNoMip		= re.RegisterShaderNoMip;
+	cgi->R_GetShaderName			= re.GetShaderName;
 
 	cgi->R_AddRefEntityToScene		= re.AddRefEntityToScene;
 	cgi->R_AddRefSpriteToScene		= re.AddRefSpriteToScene;
@@ -718,11 +774,14 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->UI_SetScoreBoardItem		= UI_SetScoreBoardItem;
 	cgi->UI_DeleteScoreBoardItems	= UI_DeleteScoreBoardItems;
 	cgi->UI_ToggleDMMessageConsole	= UI_ToggleDMConsole;
+	cgi->CL_InitRadar				= CL_InitRadar;
 
 	cgi->TIKI_FindTiki				= TIKI_FindTiki;
 
 	cgi->LoadResource				= UI_LoadResource;
 	cgi->FS_CanonicalFilename		= FS_CanonicalFilename;
+	cgi->CL_RestoreSavedCgameState	= CL_RestoreSavedCgameState;
+	cgi->CL_ClearSavedCgameState	= CL_ClearSavedCgameState;
 
 	cgi->fsDebug					= fs_debug;
 	cgi->HudDrawElements			= cls.HudDrawElements;
@@ -877,8 +936,6 @@ qboolean CL_GameCommand( void ) {
 	return cge->CG_ConsoleCommand();
 }
 
-
-
 /*
 =====================
 CL_CGameRendering
@@ -893,6 +950,10 @@ void CL_CGameRendering( stereoFrame_t stereo ) {
 	cge->CG_DrawActiveFrame( cl.serverTime, cl.serverTime - cl.oldServerTime, stereo, clc.demoplaying );
 
 	cl.oldServerTime = cl.serverTime;
+	//
+	// Let cgame clean up temp models
+	//
+	cge->CG_CleanUpTempModels();
 }
 
 /*
@@ -1068,16 +1129,14 @@ void CL_SetCGameTime( void ) {
 		return;
 	}
 
-	// FIXME
-	//if( ( cl.snap.snapFlags ^ lastSnapFlags ) & SNAPFLAG_SERVERCOUNT ) {
-	//	CL_ServerRestarted();
-	//} else {
-
+	if( ( cl.snap.snapFlags ^ lastSnapFlags ) & SNAPFLAG_SERVERCOUNT ) {
+		CL_ServerRestarted();
+	} else {
 		if( cl.snap.serverTime < cl.oldFrameServerTime ) {
 			assert( 0 );
 			Com_Error( ERR_DROP, "cl.snap.serverTime < cl.oldFrameServerTime" );
 		}
-	//}
+	}
 
 	cl.oldFrameServerTime = cl.snap.serverTime;
 

code/client/cl_cin.cpp

@@ -1583,13 +1583,13 @@ void CIN_DrawCinematic (int handle) {
 
 		CIN_ResampleCinematic(handle, buf2);
 
-		re.DrawStretchRaw( x, y, w, h, 256, 256, (byte *)buf2, 0, qfalse);
+		re.DrawStretchRaw( x, y, w, h, 256, 256, 0, (byte *)buf2);
 		cinTable[handle].dirty = qfalse;
 		Hunk_FreeTempMemory(buf2);
 		return;
 	}
 
-	re.DrawStretchRaw( x, y, w, h, cinTable[handle].drawX, cinTable[handle].drawY, buf, 0, qfalse);
+	re.DrawStretchRaw( x, y, w, h, cinTable[handle].drawX, cinTable[handle].drawY, 0, buf);
 	cinTable[handle].dirty = qfalse;
 }
 
@@ -1612,7 +1612,7 @@ void CL_PlayCinematic_f(void) {
 		bits |= CIN_loop;
 	}
 
-	S_StopAllSounds( qtrue );
+	S_StopAllSounds2( qtrue );
 
 	CL_handle = CIN_PlayCinematic( arg, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, bits );
 	if (CL_handle >= 0) {
@@ -1639,7 +1639,7 @@ void SCR_RunCinematic (void)
 void SCR_StopCinematic(void) {
 	if (CL_handle >= 0 && CL_handle < MAX_VIDEO_HANDLES) {
 		CIN_StopCinematic(CL_handle);
-		S_StopAllSounds( qtrue );
+		S_StopAllSounds2( qtrue );
 		CL_handle = -1;
 	}
 }

code/client/cl_curl.cpp

@@ -1,330 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2006 Tony J. White (tjw@tjw.org)
-
-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
-===========================================================================
-*/
-
-#ifdef USE_CURL
-#include "client.h"
-cvar_t *cl_cURLLib;
-
-#ifdef USE_CURL_DLOPEN
-#include "../sys/sys_loadlib.h"
-
-char* (*qcurl_version)(void);
-
-CURL* (*qcurl_easy_init)(void);
-CURLcode (*qcurl_easy_setopt)(CURL *curl, CURLoption option, ...);
-CURLcode (*qcurl_easy_perform)(CURL *curl);
-void (*qcurl_easy_cleanup)(CURL *curl);
-CURLcode (*qcurl_easy_getinfo)(CURL *curl, CURLINFO info, ...);
-CURL* (*qcurl_easy_duphandle)(CURL *curl);
-void (*qcurl_easy_reset)(CURL *curl);
-const char *(*qcurl_easy_strerror)(CURLcode);
-
-CURLM* (*qcurl_multi_init)(void);
-CURLMcode (*qcurl_multi_add_handle)(CURLM *multi_handle,
-                                                CURL *curl_handle);
-CURLMcode (*qcurl_multi_remove_handle)(CURLM *multi_handle,
-                                                CURL *curl_handle);
-CURLMcode (*qcurl_multi_fdset)(CURLM *multi_handle,
-                                                fd_set *read_fd_set,
-                                                fd_set *write_fd_set,
-                                                fd_set *exc_fd_set,
-                                                int *max_fd);
-CURLMcode (*qcurl_multi_perform)(CURLM *multi_handle,
-                                                int *running_handles);
-CURLMcode (*qcurl_multi_cleanup)(CURLM *multi_handle);
-CURLMsg *(*qcurl_multi_info_read)(CURLM *multi_handle,
-                                                int *msgs_in_queue);
-const char *(*qcurl_multi_strerror)(CURLMcode);
-
-static void *cURLLib = NULL;
-
-/*
-=================
-GPA
-=================
-*/
-static void *GPA(char *str)
-{
-	void *rv;
-
-	rv = Sys_LoadFunction(cURLLib, str);
-	if(!rv)
-	{
-		Com_Printf("Can't load symbol %s\n", str);
-		clc.cURLEnabled = qfalse;
-		return NULL;
-	}
-	else
-	{
-		Com_DPrintf("Loaded symbol %s (0x%p)\n", str, rv);
-        return rv;
-	}
-}
-#endif /* USE_CURL_DLOPEN */
-
-/*
-=================
-CL_cURL_Init
-=================
-*/
-qboolean CL_cURL_Init()
-{
-#ifdef USE_CURL_DLOPEN
-	if(cURLLib)
-		return qtrue;
-
-
-	Com_Printf("Loading \"%s\"...", cl_cURLLib->string);
-	if( (cURLLib = Sys_LoadLibrary(cl_cURLLib->string)) == 0 )
-	{
-#ifdef _WIN32
-		return qfalse;
-#else
-		char fn[1024];
-		Q_strncpyz( fn, Sys_Cwd( ), sizeof( fn ) );
-		strncat(fn, "/", sizeof(fn)-strlen(fn)-1);
-		strncat(fn, cl_cURLLib->string, sizeof(fn)-strlen(fn)-1);
-
-		if( (cURLLib = Sys_LoadLibrary(fn)) == 0 )
-		{
-			return qfalse;
-		}
-#endif /* _WIN32 */
-	}
-
-	clc.cURLEnabled = qtrue;
-
-	qcurl_version = GPA("curl_version");
-
-	qcurl_easy_init = GPA("curl_easy_init");
-	qcurl_easy_setopt = GPA("curl_easy_setopt");
-	qcurl_easy_perform = GPA("curl_easy_perform");
-	qcurl_easy_cleanup = GPA("curl_easy_cleanup");
-	qcurl_easy_getinfo = GPA("curl_easy_getinfo");
-	qcurl_easy_duphandle = GPA("curl_easy_duphandle");
-	qcurl_easy_reset = GPA("curl_easy_reset");
-	qcurl_easy_strerror = GPA("curl_easy_strerror");
-	
-	qcurl_multi_init = GPA("curl_multi_init");
-	qcurl_multi_add_handle = GPA("curl_multi_add_handle");
-	qcurl_multi_remove_handle = GPA("curl_multi_remove_handle");
-	qcurl_multi_fdset = GPA("curl_multi_fdset");
-	qcurl_multi_perform = GPA("curl_multi_perform");
-	qcurl_multi_cleanup = GPA("curl_multi_cleanup");
-	qcurl_multi_info_read = GPA("curl_multi_info_read");
-	qcurl_multi_strerror = GPA("curl_multi_strerror");
-
-	if(!clc.cURLEnabled)
-	{
-		CL_cURL_Shutdown();
-		Com_Printf("FAIL One or more symbols not found\n");
-		return qfalse;
-	}
-	Com_Printf("OK\n");
-
-	return qtrue;
-#else
-	clc.cURLEnabled = qtrue;
-	return qtrue;
-#endif /* USE_CURL_DLOPEN */
-}
-
-/*
-=================
-CL_cURL_Shutdown
-=================
-*/
-void CL_cURL_Shutdown( void )
-{
-	CL_cURL_Cleanup();
-#ifdef USE_CURL_DLOPEN
-	if(cURLLib)
-	{
-		Sys_UnloadLibrary(cURLLib);
-		cURLLib = NULL;
-	}
-	qcurl_easy_init = NULL;
-	qcurl_easy_setopt = NULL;
-	qcurl_easy_perform = NULL;
-	qcurl_easy_cleanup = NULL;
-	qcurl_easy_getinfo = NULL;
-	qcurl_easy_duphandle = NULL;
-	qcurl_easy_reset = NULL;
-
-	qcurl_multi_init = NULL;
-	qcurl_multi_add_handle = NULL;
-	qcurl_multi_remove_handle = NULL;
-	qcurl_multi_fdset = NULL;
-	qcurl_multi_perform = NULL;
-	qcurl_multi_cleanup = NULL;
-	qcurl_multi_info_read = NULL;
-	qcurl_multi_strerror = NULL;
-#endif /* USE_CURL_DLOPEN */
-}
-
-void CL_cURL_Cleanup(void)
-{
-	if(clc.downloadCURLM) {
-		if(clc.downloadCURL) {
-			qcurl_multi_remove_handle(clc.downloadCURLM,
-				clc.downloadCURL);
-			qcurl_easy_cleanup(clc.downloadCURL);
-		}
-		qcurl_multi_cleanup(clc.downloadCURLM);
-		clc.downloadCURLM = NULL;
-		clc.downloadCURL = NULL;
-	}
-	else if(clc.downloadCURL) {
-		qcurl_easy_cleanup(clc.downloadCURL);
-		clc.downloadCURL = NULL;
-	}
-}
-
-static int CL_cURL_CallbackProgress( void *dummy, double dltotal, double dlnow,
-	double ultotal, double ulnow )
-{
-	clc.downloadSize = (int)dltotal;
-	Cvar_SetValue( "cl_downloadSize", clc.downloadSize );
-	clc.downloadCount = (int)dlnow;
-	Cvar_SetValue( "cl_downloadCount", clc.downloadCount );
-	return 0;
-}
-
-static int CL_cURL_CallbackWrite(void *buffer, size_t size, size_t nmemb,
-	void *stream)
-{
-	FS_Write( buffer, size*nmemb, ((fileHandle_t*)stream)[0] );
-	return size*nmemb;
-}
-
-void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
-{
-	clc.cURLUsed = qtrue;
-	Com_Printf("URL: %s\n", remoteURL);
-	Com_DPrintf("***** CL_cURL_BeginDownload *****\n"
-		"Localname: %s\n"
-		"RemoteURL: %s\n"
-		"****************************\n", localName, remoteURL);
-	CL_cURL_Cleanup();
-	Q_strncpyz(clc.downloadURL, remoteURL, sizeof(clc.downloadURL));
-	Q_strncpyz(clc.downloadName, localName, sizeof(clc.downloadName));
-	Com_sprintf(clc.downloadTempName, sizeof(clc.downloadTempName),
-		"%s.tmp", localName);
-
-	// Set so UI gets access to it
-	Cvar_Set("cl_downloadName", localName);
-	Cvar_Set("cl_downloadSize", "0");
-	Cvar_Set("cl_downloadCount", "0");
-	Cvar_SetValue("cl_downloadTime", cls.realtime);
-
-	clc.downloadBlock = 0; // Starting new file
-	clc.downloadCount = 0;
-
-	clc.downloadCURL = qcurl_easy_init();
-	if(!clc.downloadCURL) {
-		Com_Error(ERR_DROP, "CL_cURL_BeginDownload: qcurl_easy_init() "
-			"failed\n");
-		return;
-	}
-	clc.download = FS_SV_FOpenFileWrite(clc.downloadTempName);
-	if(!clc.download) {
-		Com_Error(ERR_DROP, "CL_cURL_BeginDownload: failed to open "
-			"%s for writing\n", clc.downloadTempName);
-		return;
-	}
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_WRITEDATA, clc.download);
-	if(developer->integer)
-		qcurl_easy_setopt(clc.downloadCURL, CURLOPT_VERBOSE, 1);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_URL, clc.downloadURL);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_TRANSFERTEXT, 0);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_REFERER, va("ioQ3://%s",
-		NET_AdrToString(clc.serverAddress)));
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_USERAGENT, va("%s %s",
-		Q3_VERSION, qcurl_version()));
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_WRITEFUNCTION,
-		CL_cURL_CallbackWrite);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_WRITEDATA, &clc.download);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_NOPROGRESS, 0);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_PROGRESSFUNCTION,
-		CL_cURL_CallbackProgress);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_PROGRESSDATA, NULL);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_FAILONERROR, 1);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 1);
-	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_MAXREDIRS, 5);
-	clc.downloadCURLM = qcurl_multi_init();	
-	if(!clc.downloadCURLM) {
-		qcurl_easy_cleanup(clc.downloadCURL);
-		clc.downloadCURL = NULL;
-		Com_Error(ERR_DROP, "CL_cURL_BeginDownload: qcurl_multi_init() "
-			"failed\n");
-		return;
-	}
-	qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
-
-	if(!(clc.sv_allowDownload & DLF_NO_DISCONNECT) &&
-		!clc.cURLDisconnected) {
-
-		CL_AddReliableCommand("disconnect");
-		CL_WritePacket();
-		CL_WritePacket();
-		CL_WritePacket();
-		clc.cURLDisconnected = qtrue;
-	}
-}
-
-void CL_cURL_PerformDownload(void)
-{
-	CURLMcode res;
-	CURLMsg *msg;
-	int c;
-	int i = 0;
-
-	res = qcurl_multi_perform(clc.downloadCURLM, &c);
-	while(res == CURLM_CALL_MULTI_PERFORM && i < 100) {
-		res = qcurl_multi_perform(clc.downloadCURLM, &c);
-		i++;
-	}
-	if(res == CURLM_CALL_MULTI_PERFORM)
-		return;
-	msg = qcurl_multi_info_read(clc.downloadCURLM, &c);
-	if(msg == NULL) {
-		return;
-	}
-	FS_FCloseFile(clc.download);
-	if(msg->msg == CURLMSG_DONE && msg->data.result == CURLE_OK) {
-		FS_SV_Rename(clc.downloadTempName, clc.downloadName);
-		clc.downloadRestart = qtrue;
-	}
-	else {
-		long code;
-
-		qcurl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE,
-			&code);	
-		Com_Error(ERR_DROP, "Download Error: %s Code: %ld URL: %s",
-			qcurl_easy_strerror(msg->data.result),
-			code, clc.downloadURL);
-	}
-	*clc.downloadTempName = *clc.downloadName = 0;
-	Cvar_Set( "cl_downloadName", "" );
-	CL_NextDownload();
-}
-#endif /* USE_CURL */

code/client/cl_input.cpp

@@ -1051,8 +1051,8 @@ void CL_InitInput( void ) {
 	Cmd_AddCommand("-leanleft", IN_LeanLeftUp);
 	Cmd_AddCommand("+leanright", IN_LeanRightDown);
 	Cmd_AddCommand("-leanright", IN_LeanRightUp);
-	Cmd_AddCommand("+speed", IN_SpeedUp);
-	Cmd_AddCommand("-speed", IN_SpeedDown);
+	Cmd_AddCommand("+speed", IN_SpeedDown);
+	Cmd_AddCommand("-speed", IN_SpeedUp);
 	Cmd_AddCommand("+button0", IN_Button0Down);
 	Cmd_AddCommand("-button0", IN_Button0Up);
 	Cmd_AddCommand("+button1", IN_Button1Down);

code/client/cl_keys.cpp

@@ -344,10 +344,6 @@ In game talk message
 ================
 */
 void Message_Key( int key ) {
-
-	char	buffer[MAX_STRING_CHARS];
-
-
 	if (key == K_ESCAPE) {
 		Key_SetCatcher( Key_GetCatcher( ) & ~KEYCATCH_MESSAGE );
 		return;
@@ -1157,7 +1153,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
 		}
 	}
 
-	if (!in_guimouse || key <= K_MOUSE3 || key > K_JOY1)
+	if (!in_guimouse || key <= K_MWHEELUP || key > K_JOY1)
 	{
 		// keys can still be used for bound actions
 		if (down && (key <= K_BACKSPACE || key == K_MOUSE4) &&

code/client/cl_main.cpp

@@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_ui.h"
 #include "../qcommon/tiki.h"
 #include "../qcommon/cm_terrain.h"
+#include "../qcommon/localization.h"
+#include "../qcommon/bg_compat.h"
 #include "../sys/sys_local.h"
 #ifdef USE_RENDERER_DLL
 #include "../sys/sys_loadlib.h"
@@ -102,6 +104,9 @@ cvar_t	*cl_inGameVideo;
 cvar_t	*cl_serverStatusResendTime;
 cvar_t	*cl_trn;
 cvar_t	*cl_langamerefreshstatus;
+cvar_t	*cl_radar_icon_size;
+cvar_t	*cl_radar_speak_time;
+cvar_t	*cl_radar_blink_time;
 
 cvar_t	*cl_lanForcePackets;
 
@@ -206,7 +211,7 @@ The given command will be transmitted to the server, and is gauranteed to
 not have future usercmd_t executed before it is executed
 ======================
 */
-void CL_AddReliableCommand( const char *cmd ) {
+void CL_AddReliableCommand( const char *cmd, qboolean isDisconnectCmd ) {
 	int		index;
 
 	// if we would be losing an old command that hasn't been acknowledged,
@@ -362,14 +367,14 @@ void CL_Record_f( void ) {
 	if ( Cmd_Argc() == 2 ) {
 		s = Cmd_Argv(1);
 		Q_strncpyz( demoName, s, sizeof( demoName ) );
-		Com_sprintf (name, sizeof(name), "demos/%s.dm_%d", demoName, PROTOCOL_VERSION );
+		Com_sprintf (name, sizeof(name), "demos/%s.dm_%d", demoName, com_protocol->integer );
 	} else {
 		int		number;
 
 		// scan for a free demo name
 		for ( number = 0 ; number <= 9999 ; number++ ) {
 			CL_DemoFilename( number, demoName );
-			Com_sprintf (name, sizeof(name), "demos/%s.dm_%d", demoName, PROTOCOL_VERSION );
+			Com_sprintf (name, sizeof(name), "demos/%s.dm_%d", demoName, com_protocol->integer );
 
 			if (!FS_FileExists(name))
 				break;	// file doesn't exist
@@ -404,8 +409,8 @@ void CL_Record_f( void ) {
 	// NOTE, MRE: all server->client messages now acknowledge
 	MSG_WriteLong( &buf, clc.reliableSequence );
 
-	MSG_WriteByte (&buf, svc_gamestate);
-	MSG_WriteLong (&buf, clc.serverCommandSequence );
+	MSG_WriteByte ( &buf, svc_gamestate );
+	MSG_WriteLong ( &buf, clc.serverCommandSequence );
 
 	// configstrings
 	for ( i = 0 ; i < MAX_CONFIGSTRINGS ; i++ ) {
@@ -413,21 +418,20 @@ void CL_Record_f( void ) {
 			continue;
 		}
 		s = cl.gameState.stringData + cl.gameState.stringOffsets[i];
-		MSG_WriteByte (&buf, svc_configstring);
-		MSG_WriteShort (&buf, i);
-		MSG_WriteBigString (&buf, s);
+		MSG_WriteByte ( &buf, svc_configstring );
+		MSG_WriteShort ( &buf, CPT_DenormalizeConfigstring( i ) );
+		MSG_WriteScrambledBigString ( &buf, s );
 	}
 
 	// baselines
-	Com_Memset (&nullstate, 0, sizeof(nullstate));
+	MSG_GetNullEntityState(&nullstate);
 	for ( i = 0; i < MAX_GENTITIES ; i++ ) {
 		ent = &cl.entityBaselines[i];
 		if ( !ent->number ) {
 			continue;
 		}
-		MSG_WriteByte (&buf, svc_baseline);
-		// FIXME
-		MSG_WriteDeltaEntity (&buf, &nullstate, ent, qtrue, 0.0 );
+		MSG_WriteByte ( &buf, svc_baseline );
+		MSG_WriteDeltaEntity ( &buf, &nullstate, ent, qtrue, cls.serverFrameTime );
 	}
 
 	MSG_WriteByte( &buf, svc_EOF );
@@ -437,7 +441,10 @@ void CL_Record_f( void ) {
 	// write the client num
 	MSG_WriteLong(&buf, clc.clientNum);
 	// write the checksum feed
-	MSG_WriteLong(&buf, clc.checksumFeed);
+    MSG_WriteLong(&buf, clc.checksumFeed);
+
+    // write the server frametime to the client (only on TA/TT)
+    MSG_WriteServerFrameTime( &buf, cls.serverFrameTime );
 
 	// finished writing the client packet
 	MSG_WriteByte( &buf, svc_EOF );
@@ -554,7 +561,7 @@ void CL_DemoCompleted( void )
 		}
 	}
 
-	CL_Disconnect( qtrue );
+	CL_Disconnect();
 	CL_NextDemo();
 }
 
@@ -592,7 +599,7 @@ void CL_ReadDemoMessage( void ) {
 		return;
 	}
 	buf.cursize = LittleLong( buf.cursize );
-	if ( buf.cursize == -1 ) {
+	if ( buf.cursize == (uint32_t)-1) {
 		CL_DemoCompleted ();
 		return;
 	}
@@ -658,7 +665,7 @@ void CL_PlayDemo_f( void ) {
 	// 2 means don't force disconnect of local client
 	Cvar_Set( "sv_killserver", "2" );
 
-	CL_Disconnect( qtrue );
+	CL_Disconnect();
 
 	// open the demo file
 	arg = Cmd_Argv(1);
@@ -756,7 +763,7 @@ void CL_NextDemo( void ) {
 CL_ShutdownAll
 =====================
 */
-void CL_ShutdownAll(void) {
+void CL_ShutdownAll(qboolean shutdownRef) {
 
 #ifdef USE_CURL
 	CL_cURL_Shutdown();
@@ -794,7 +801,7 @@ void CL_FlushMemory( void ) {
 
 	// shutdown all the client stuff
 	CL_ShutdownCGame();
-	S_StopAllSounds( qtrue );
+	S_StopAllSounds2( qtrue );
 	UI_ClearState();
 	cls.rendererRegistered = qfalse;
 }
@@ -816,6 +823,11 @@ void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 	UI_ClearState();
 	UI_ForceMenuOff(false);
 
+	if (!flush) {
+		// Don't do anything if it's not flushingb
+		return;
+	}
+
 	if (pszMapName) {
 		// if we are already connected to the local host, stay connected
 		if (clc.state >= CA_CONNECTED && !Q_stricmp(cls.servername, "localhost")) {
@@ -828,7 +840,7 @@ void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 		else {
 			// clear nextmap so the cinematic shutdown doesn't execute it
 			Cvar_Set("nextmap", "");
-			CL_Disconnect(qtrue);
+			CL_Disconnect();
 			Q_strncpyz(cls.servername, "localhost", sizeof(cls.servername));
 			clc.state = CA_CHALLENGING;		// so the connect screen is drawn
             clc.connectStartTime = cls.realtime;
@@ -856,7 +868,7 @@ void CL_ClearState( void )
 	CL_ShutdownCGame();
 
 	if( !com_sv_running->integer ) {
-		S_StopAllSounds( qtrue );
+		S_StopAllSounds2( qtrue );
 	}
 
 	UI_ClearState();
@@ -871,7 +883,7 @@ CL_UpdateGUID
 update cl_guid using QKEY_FILE and optional prefix
 ====================
 */
-static void CL_UpdateGUID( char *prefix, int prefix_len )
+static void CL_UpdateGUID( const char *prefix, int prefix_len )
 {
 	fileHandle_t f;
 	int len;
@@ -897,7 +909,7 @@ Sends a disconnect message to the server
 This is also called on Com_Error and Com_Quit, so it shouldn't cause any errors
 =====================
 */
-void CL_Disconnect( qboolean showMainMenu ) {
+void CL_Disconnect() {
 	if ( !com_cl_running || !com_cl_running->integer ) {
 		return;
 	}
@@ -927,7 +939,7 @@ void CL_Disconnect( qboolean showMainMenu ) {
 	// send a disconnect message to the server
 	// send it a few times in case one is dropped
 	if ( clc.state >= CA_CONNECTED ) {
-		CL_AddReliableCommand( "disconnect" );
+		CL_AddReliableCommand( "disconnect", qtrue );
 		CL_WritePacket();
 		CL_WritePacket();
 		CL_WritePacket();
@@ -955,6 +967,19 @@ void CL_Disconnect( qboolean showMainMenu ) {
 	CL_UpdateGUID( NULL, 0 );
 }
 
+/*
+===================
+CL_AbnormalDisconnect
+===================
+*/
+void CL_AbnormalDisconnect() {
+    CL_Disconnect();
+    UI_ServerLoaded();
+
+	if (developer->integer) {
+		UI_OpenConsole();
+	}
+}
 
 /*
 ===================
@@ -981,9 +1006,9 @@ void CL_ForwardCommandToServer( const char *string ) {
 	}
 
 	if ( Cmd_Argc() > 1 ) {
-		CL_AddReliableCommand( string );
+		CL_AddReliableCommand( string, qfalse );
 	} else {
-		CL_AddReliableCommand( cmd );
+		CL_AddReliableCommand( cmd, qfalse );
 	}
 }
 
@@ -1129,7 +1154,7 @@ void CL_ForwardToServer_f( void ) {
 
 	// don't forward the first argument
 	if ( Cmd_Argc() > 1 ) {
-		CL_AddReliableCommand( Cmd_Args() );
+		CL_AddReliableCommand( Cmd_Args(), qfalse );
 	}
 }
 
@@ -1174,10 +1199,28 @@ CL_Disconnect_f
 ==================
 */
 void CL_Disconnect_f( void ) {
-	SCR_StopCinematic();
-	Cvar_Set("ui_singlePlayerActive", "0");
-	if ( clc.state != CA_DISCONNECTED && clc.state != CA_CINEMATIC ) {
-		Com_Error (ERR_DISCONNECT, "Disconnected from server");
+	if ( clc.state != CA_DISCONNECTED ) {
+		qboolean bConsoleState = UI_ConsoleIsOpen();
+
+        Com_Printf("\nDisconnected from server\n");
+        SV_Shutdown("Disconnected from server\n");
+
+        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();
+		}
 	}
 }
 
@@ -1199,12 +1242,12 @@ void CL_Reconnect_f( void ) {
 
 /*
 ================
-CL_Connect_f
+CL_Connect
 
 ================
 */
-void CL_Connect( const char *server ) {
-	char	serverString[ 22 ];
+void CL_Connect( const char *server, netadrtype_t family ) {
+	const char *serverString;
 
 	Cvar_Set( "ui_singlePlayerActive", "0" );
 
@@ -1223,7 +1266,7 @@ void CL_Connect( const char *server ) {
 	Cvar_Set( "sv_killserver", "1" );
 	SV_Frame( 0 );
 
-	CL_Disconnect( qtrue );
+	CL_Disconnect();
 	UI_CloseConsole();
 
 	/* MrE: 2000-09-13: now called in CL_DownloadsComplete
@@ -1232,21 +1275,24 @@ void CL_Connect( const char *server ) {
 
 	Q_strncpyz( cls.servername, server, sizeof( cls.servername ) );
 
-	if( !NET_StringToAdr( cls.servername, &clc.serverAddress, NA_IP ) ) {
+	if( !NET_StringToAdr( cls.servername, &clc.serverAddress, family ) ) {
 		Com_Printf( "Bad server address\n" );
 		clc.state = CA_DISCONNECTED;
+		UI_PushMenu("badserveraddy");
 		return;
 	}
 	if( clc.serverAddress.port == 0 ) {
 		clc.serverAddress.port = BigShort( PORT_SERVER );
 	}
-	Com_sprintf( serverString, sizeof( serverString ), "%i.%i.%i.%i:%i",
-		clc.serverAddress.ip[ 0 ], clc.serverAddress.ip[ 1 ],
-		clc.serverAddress.ip[ 2 ], clc.serverAddress.ip[ 3 ],
-		BigShort( clc.serverAddress.port ) );
+	serverString = NET_AdrToStringwPort(clc.serverAddress);
 
 	Com_Printf( "%s resolved to %s\n", cls.servername, serverString );
 
+	if (cl_guidServerUniq->integer)
+		CL_UpdateGUID(serverString, strlen(serverString));
+	else
+		CL_UpdateGUID(NULL, 0);
+
 	// if we aren't playing on a lan, we need to authenticate
 	// with the cd key
 	// wombat: no authorization in mohaa. need to send challenge to server though
@@ -1255,11 +1301,14 @@ void CL_Connect( const char *server ) {
 	}
 	else {
 		clc.state = CA_CONNECTING;
+
+		// Set a client challenge number that ideally is mirrored back by the server.
+		clc.challenge = (((unsigned int)rand() << 16) ^ (unsigned int)rand()) ^ Com_Milliseconds();
 	}
 
 	clc.connectTime = -99999;	// CL_CheckForResend() will fire immediately
 	clc.connectPacketCount = 0;
-	clc.connectStartTime = 0;
+	clc.connectStartTime = cls.realtime;
 
 	// server connection string
 	Cvar_Set( "cl_currentServerAddress", server );
@@ -1272,17 +1321,36 @@ CL_Connect_f
 ================
 */
 // we have our own server provided to us by mohaaaa.co.uk
-void CL_Connect_f( void ) {
-	char	*server;
+void CL_Connect_f(void) {
+    const char *server;
+    int argc = Cmd_Argc();
+    netadrtype_t family = NA_UNSPEC;
 
 	if ( Cmd_Argc() != 2 ) {
 		Com_Printf( "usage: connect [server]\n");
 		return;
 	}
-	
-	server = Cmd_Argv (1);
 
-	CL_Connect( server );
+	if (argc != 2 && argc != 3) {
+		Com_Printf("usage: connect [-4|-6] server\n");
+		return;
+	}
+
+	if (argc == 2)
+		server = Cmd_Argv(1);
+	else
+	{
+		if (!strcmp(Cmd_Argv(1), "-4"))
+			family = NA_IP;
+		else if (!strcmp(Cmd_Argv(1), "-6"))
+			family = NA_IP6;
+		else
+			Com_Printf("warning: only -4 or -6 as address type understood.\n");
+
+		server = Cmd_Argv(2);
+	}
+
+	CL_Connect( server, family );
 }
 
 /*
@@ -1300,7 +1368,7 @@ void CL_MenuConnect_f( void ) {
 
 	server = Cmd_Argv( 1 );
 
-	CL_Connect( Cvar_VariableString( server ) );
+	CL_Connect( Cvar_VariableString( server ), NA_UNSPEC );
 }
 
 /*
@@ -1320,7 +1388,7 @@ void CL_FastConnect_f( void ) {
 			Com_Printf( "Server %i - '%s'\n", i, NET_AdrToString( cls.localServers[ i ].adr ) );
 		}
 
-		CL_Connect( cls.localServers[ 0 ].hostName );
+		CL_Connect( cls.localServers[ 0 ].hostName, NA_UNSPEC );
 		Cbuf_AddText( "popmenu 0 ; wait 500 ; popmenu 0 ; wait 500 ; popmenu 0\n" );
 		endTime = 123456789;
 	}
@@ -1367,7 +1435,8 @@ void CL_Rcon_f( void ) {
 	message[1] = -1;
 	message[2] = -1;
 	message[3] = -1;
-	message[4] = 0;
+	message[4] = 2; // direction
+	message[5] = 0;
 
 	Q_strcat (message, MAX_RCON_MESSAGE, "rcon ");
 
@@ -1417,7 +1486,7 @@ void CL_SendPureChecksums( void ) {
 	for (i = 0; i < 2; i++) {
 		cMsg[i] += 10;
 	}
-	CL_AddReliableCommand( cMsg );
+	CL_AddReliableCommand( cMsg, qfalse );
 }
 
 /*
@@ -1426,7 +1495,7 @@ CL_ResetPureClientAtServer
 =================
 */
 void CL_ResetPureClientAtServer( void ) {
-	CL_AddReliableCommand( va("vdr") );
+	CL_AddReliableCommand( va("vdr"), qfalse );
 }
 
 qboolean CL_Allowed_Vid_Restart() {
@@ -1452,7 +1521,7 @@ void CL_Vid_Restart_f( void ) {
 	cls.vid_restart = qtrue;
 
 	// don't let them loop during the restart
-	S_StopAllSounds(qtrue);
+	S_StopAllSounds2(qtrue);
 
 	SV_ClearSvsTimeFixups();
 
@@ -1466,18 +1535,26 @@ void CL_Vid_Restart_f( void ) {
 	CL_InitRef();
 	// 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();
+	CL_StartHunkUsers(qfalse);
 
 	SV_FinishSvsTimeFixups();
 
 	S_Init();
 
+	if (clc.state > CA_CONNECTED && clc.state != CA_CINEMATIC)
+	{
+		// send pure checksums
+		CL_SendPureChecksums();
+	}
+
 	cls.vid_restart = qfalse;
 	Com_Printf("----- finished CL_Vid_Restart_f ----\n");
 }
@@ -1602,7 +1679,7 @@ void CL_DownloadsComplete( void ) {
 		FS_Restart(clc.checksumFeed); // We possibly downloaded a pak, restart the file system to load it
 
 		// inform the server so we get new gamestate info
-		CL_AddReliableCommand( "donedl" );
+		CL_AddReliableCommand( "donedl", qfalse );
 
 		// by sending the donedl command we request a new gamestate
 		// so we don't want to load stuff yet
@@ -1612,11 +1689,18 @@ void CL_DownloadsComplete( void ) {
 	// let the client game init and load data
 	clc.state = CA_LOADING;
 
-    CL_StartHunkUsers();
+    CL_StartHunkUsers(qfalse);
     // Pump the loop, this may change gamestate!
     Com_EventLoop();
 
-    CL_StartHunkUsers();
+    CL_StartHunkUsers(qfalse);
+
+	// set pure checksums
+	CL_SendPureChecksums();
+
+	CL_WritePacket();
+	CL_WritePacket();
+	CL_WritePacket();
 }
 
 /*
@@ -1646,7 +1730,7 @@ void CL_BeginDownload( const char *localName, const char *remoteName ) {
 	clc.downloadBlock = 0; // Starting new file
 	clc.downloadCount = 0;
 
-	CL_AddReliableCommand( va("download %s", remoteName) );
+	CL_AddReliableCommand( va("download %s", remoteName), qfalse );
 }
 
 /*
@@ -1842,10 +1926,11 @@ 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", TARGET_GAME_VERSION);
-#if TARGET_GAME_PROTOCOL >= 15
-		Info_SetValueForKey(info, "clientType", "Breakthrough");
-#endif
+		Info_SetValueForKey(info, "version", com_shortversion->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 ");
     // TTimo adding " " around the userinfo string to avoid truncated userinfo on the server
@@ -1890,16 +1975,11 @@ void CL_DisconnectPacket( netadr_t from ) {
 		return;
 	}
 
-	// if we have received packets within three seconds, ignore it
-	// (it might be a malicious spoof)
-	if ( cls.realtime - clc.lastPacketTime < 3000 ) {
-		return;
-	}
-
 	// drop the connection
-	Com_Printf( "Server disconnected for unknown reason\n" );
-	Cvar_Set("com_errorMessage", "Server disconnected for unknown reason\n" );
-	CL_Disconnect( qtrue );
+    Com_Printf("Server disconnected for unknown reason\n");
+    CL_Disconnect_f();
+    UI_ForceMenuOff(qtrue);
+    UI_PushMenu("serverdisconnected");
 }
 
 
@@ -2203,15 +2283,26 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 		CL_ServersResponsePacket( from, msg );
 		return;
 	}
+
 	// wombat: mohaa servers send this to reject clients
-	// TODO: tell the UI to draw serverdisconnect.urc serverfull.urc or servertimeout.urc
 	if ( !Q_stricmp(c, "droperror") ) {
-		reason = MSG_ReadString( msg );
-		Com_Printf( "Server dropped connection. Reason: %s", reason );
-		Cvar_Set("com_errorMessage", reason );
-		CL_Disconnect( qtrue );
+        reason = MSG_ReadString(msg);
+        Com_Printf("Server dropped connection. Reason: %s", reason);
+		Cvar_Set("com_errorMessage", reason);
+        CL_Disconnect_f();
+        UI_ForceMenuOff(qtrue);
+        UI_PushMenu("errormessage");
 		return;
-	}
+    }
+
+    if (!Q_stricmp(c, "wrongver")) {
+        reason = MSG_ReadString(msg);
+        Cvar_Set("com_errorMessage", va("Server is version %s, you are using %s, from base '%s'", reason, com_target_version->string, Cvar_VariableString("fs_basegame")));
+        CL_Disconnect_f();
+        UI_ForceMenuOff(qtrue);
+        UI_PushMenu("errormessage");
+        return;
+    }
 
 	Com_DPrintf ("Unknown connectionless packet command: \"%s\".\n", c);
 }
@@ -2293,7 +2384,7 @@ void CL_CheckTimeout( void ) {
 		if (++cl.timeoutcount > 5) {	// timeoutcount saves debugger
 			Com_Printf ("\nServer connection timed out.\n");
 			Cbuf_AddText( "pushmenu servertimeout\n" );
-			CL_Disconnect( qtrue );
+			CL_Disconnect();
 			return;
 		}
 	} else {
@@ -2345,7 +2436,7 @@ void CL_CheckUserinfo( void ) {
 		}
 
 		cvar_modifiedFlags &= ~CVAR_USERINFO;
-		CL_AddReliableCommand( va("userinfo \"%s\"", Cvar_InfoString( CVAR_USERINFO ) ) );
+		CL_AddReliableCommand( va("userinfo \"%s\"", Cvar_InfoString( CVAR_USERINFO ) ), qfalse );
 	}
 }
 
@@ -2386,7 +2477,7 @@ void CL_Frame ( int msec ) {
 	if ( clc.state == CA_DISCONNECTED && !UI_MenuActive()
 		&& !com_sv_running->integer ) {
 		// if disconnected, bring up the menu
-		S_StopAllSounds( qtrue );
+		S_StopAllSounds2( qtrue );
 		UI_MenuEscape( "main" );
 	}
 
@@ -2566,7 +2657,7 @@ After the server has cleared the hunk, these will need to be restarted
 This is the only place that any of these functions are called from
 ============================
 */
-void CL_StartHunkUsers( void ) {
+void CL_StartHunkUsers( qboolean rendererOnly ) {
 	if( !com_cl_running ) {
 		return;
 	}
@@ -2602,6 +2693,15 @@ void *CL_RefMalloc(int size) {
 	return Z_TagMalloc( size, TAG_RENDERER );
 }
 
+/*
+============
+CL_RefFree
+============
+*/
+void CL_RefFree(void* ptr) {
+	Z_Free(ptr);
+}
+
 /*
 ============
 CL_RefClear
@@ -2758,8 +2858,9 @@ void CL_InitRef( void ) {
 	ri.Printf = CL_RefPrintf;
 	ri.Error = Com_Error;
 	ri.Milliseconds = CL_ScaledMilliseconds;
+	ri.LV_ConvertString = Sys_LV_CL_ConvertString;
 	ri.Malloc = CL_RefMalloc;
-	ri.Free = Z_Free;
+	ri.Free = CL_RefFree;
 	ri.Clear = CL_RefClear;
     ri.Hunk_Clear = CL_RefStaticClear;
 #ifdef HUNK_DEBUG
@@ -3087,7 +3188,7 @@ void CL_Init( void ) {
 	start = Sys_Milliseconds();
 
 	CL_ClearState ();
-	S_StopAllSounds( qtrue );
+	S_StopAllSounds2( qtrue );
 
 	clc.state = CA_DISCONNECTED;	// no longer CA_UNINITIALIZED
 	Key_SetCatcher(KEYCATCH_UI);
@@ -3201,6 +3302,9 @@ void CL_Init( void ) {
 	cl_motdString = Cvar_Get( "cl_motdString", "", CVAR_ROM );
 
 	cl_langamerefreshstatus = Cvar_Get( "cl_langamerefreshstatus", "Ready", 0 );
+	cl_radar_icon_size = Cvar_Get("cl_radar_icon_size", "10", CVAR_ARCHIVE);
+	cl_radar_speak_time = Cvar_Get("cl_radar_speak_time", "3", CVAR_ARCHIVE);
+	cl_radar_blink_time = Cvar_Get("cl_radar_blink_time", "0.333", CVAR_ARCHIVE);
 	cg_gametype = Cvar_Get( "cg_gametype", "0", 0 );
 
 	cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE);
@@ -3278,7 +3382,7 @@ void CL_Init( void ) {
 	Cmd_AddCommand ("stopvideo", CL_StopVideo_f );
 	CL_InitConsoleCommands();
 	CL_InitRef();
-	CL_StartHunkUsers();
+	CL_StartHunkUsers(qfalse);
 
 	SCR_Init ();
 
@@ -3286,7 +3390,6 @@ void CL_Init( void ) {
 
 	Cvar_Set( "cl_running", "1" );
 
-	NET_Init();
 	S_Init2();
 
 	// fixme: should we leave it?
@@ -3294,7 +3397,7 @@ void CL_Init( void ) {
 	Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM );
 	CL_UpdateGUID( NULL, 0 );
 
-	CL_StartHunkUsers();
+	CL_StartHunkUsers(qfalse);
 
 	end = Sys_Milliseconds();
 
@@ -3326,7 +3429,7 @@ void CL_Shutdown(const char* finalmsg, qboolean disconnect, qboolean quit) {
     noGameRestart = quit;
 
 	if(disconnect)
-		CL_Disconnect(qtrue);
+		CL_Disconnect();
 
 	S_Shutdown();
 	CL_ShutdownRef();
@@ -4209,7 +4312,7 @@ CL_ServerRestarted
 ==================
 */
 void CL_ServerRestarted( void ) {
-	S_StopAllSounds( qfalse );
+	S_StopAllSounds2( qfalse );
 
 	UI_ServerLoaded();
 	UI_ClearState();

code/client/cl_parse.cpp

@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "client.h"
 #include "cl_ui.h"
+#include "../qcommon/bg_compat.h"
 
 const char *svc_strings[256] = {
 	"svc_bad",
@@ -193,6 +194,69 @@ void CL_ParsePacketEntities( msg_t *msg, clSnapshot_t *oldframe, clSnapshot_t *n
 	}
 }
 
+/*
+================
+CL_UnpackNonPVSClient
+
+Unpack info about non-visible client.
+================
+*/
+qboolean CL_UnpackNonPVSClient(int* packed, radarUnpacked_t* unpacked) {
+	int x, y;
+	int yaw;
+	qboolean bValid;
+	float range;
+
+	unpacked->clientNum = *packed & (MAX_CLIENTS - 1);
+	if (unpacked->clientNum == cl.snap.ps.clientNum) {
+		return qfalse;
+	}
+
+	x = ((*packed >> 6) & 0x7F) - (MAX_CLIENTS - 1);
+	y = ((*packed >> 13) & 0x7F) - (MAX_CLIENTS - 1);
+	yaw = (*packed >> 20) & 0x1F;
+	bValid = (*packed >> 25) & 1;
+
+	if (com_radar_range && com_radar_range->value) {
+		range = com_radar_range->value;
+	} else {
+		range = 0;
+	}
+
+	unpacked->x = x * range / 63.f;
+	unpacked->y = y * range / 63.f;
+
+	if (!bValid)
+	{
+		unpacked->x = x * range / 63.f * 1024;
+		unpacked->y = y * range / 63.f * 1024;
+	}
+
+	unpacked->yaw = yaw * 11.25f;
+
+	return qtrue;
+}
+
+/*
+================
+CL_ReadNonPVSClient
+
+Reads packed info about non-visible client.
+================
+*/
+void CL_ReadNonPVSClient(int radarInfo) {
+	radarUnpacked_t unpacked;
+
+	if (!cge) {
+		return;
+	}
+
+	if (CL_UnpackNonPVSClient(&radarInfo, &unpacked)) {
+		unpacked.x += cl.snap.ps.origin[0];
+		unpacked.y += cl.snap.ps.origin[1];
+		cge->CG_ReadNonPVSClient(&unpacked);
+	}
+}
 
 /*
 ================
@@ -278,6 +342,9 @@ void CL_ParseSnapshot( msg_t *msg ) {
 	} else {
 		MSG_ReadDeltaPlayerstate( msg, NULL, &newSnap.ps, cls.serverFrameTime);
 	}
+	// get normalized flags
+	newSnap.ps.pm_flags = CPT_NormalizePlayerStateFlags(newSnap.ps.net_pm_flags);
+	newSnap.ps.iViewModelAnim = CPT_NormalizeViewModelAnim(newSnap.ps.iNetViewModelAnim);
 
 	// read packet entities
 	SHOWNET( msg, "packet entities" );
@@ -328,6 +395,9 @@ void CL_ParseSnapshot( msg_t *msg ) {
 	}
 
 	cl.newSnapshots = qtrue;
+	
+	// read radar info about invisible clients
+	CL_ReadNonPVSClient(cl.snap.ps.radarInfo);
 }
 
 
@@ -444,35 +514,13 @@ static void CL_ParseServerInfo(void)
 		sizeof(clc.sv_dlURL));
 }
 
-#if TARGET_GAME_PROTOCOL >= 15
-
-char* MSG_ReadGameStateChar(msg_t* msg) {
-	return MSG_ReadScrambledBigString(msg);
-}
-
-float MSG_ReadServerFrameTime(msg_t* msg) {
-	return MSG_ReadFloat(msg);
-}
-
-#else
-
-char* MSG_ReadGameStateChar(msg_t* msg) {
-	return MSG_ReadString(msg);
-}
-
-float MSG_ReadServerFrameTime(msg_t* msg) {
-	return 1.f / atof(Info_ValueForKey(cl.gameState.stringData + cl.gameState.stringOffsets[CS_SYSTEMINFO], "sv_fps"));
-}
-
-#endif
-
 /*
 ==================
 CL_ParseGamestate
 ==================
 */
 void CL_ParseGamestate( msg_t *msg ) {
-	int				i;
+	int				i, csNum;
 	entityState_t	*es;
 	int				newnum;
 	entityState_t	nullstate;
@@ -502,22 +550,24 @@ void CL_ParseGamestate( msg_t *msg ) {
 		}
 		
 		if ( cmd == svc_configstring ) {
-			int		len;
+            int		len;
 
-			i = MSG_ReadShort( msg );
-			if ( i < 0 || i >= MAX_CONFIGSTRINGS ) {
-				Com_Error( ERR_DROP, "configstring > MAX_CONFIGSTRINGS" );
-			}
-			s = MSG_ReadGameStateChar( msg );
-			len = strlen( s );
+            i = MSG_ReadShort(msg);
+            csNum = CPT_NormalizeConfigstring(i);
+            if (csNum < 0 || csNum >= MAX_CONFIGSTRINGS) {
+                Com_Error(ERR_DROP, "configstring > MAX_CONFIGSTRINGS");
+            }
+            s = MSG_ReadScrambledBigString(msg);
+            len = strlen(s);
 
-			if ( len + 1 + cl.gameState.dataCount > MAX_GAMESTATE_CHARS ) {
-				Com_Error( ERR_DROP, "MAX_GAMESTATE_CHARS exceeded" );
-			}
-			// append it to the gameState string buffer
-			cl.gameState.stringOffsets[ i ] = cl.gameState.dataCount;
-			Com_Memcpy( cl.gameState.stringData + cl.gameState.dataCount, s, len + 1 );
-			cl.gameState.dataCount += len + 1;
+            if (len + 1 + cl.gameState.dataCount > MAX_GAMESTATE_CHARS) {
+                Com_Error(ERR_DROP, "MAX_GAMESTATE_CHARS exceeded");
+            }
+
+            // append it to the gameState string buffer
+            cl.gameState.stringOffsets[csNum] = cl.gameState.dataCount;
+            Com_Memcpy(cl.gameState.stringData + cl.gameState.dataCount, s, len + 1);
+            cl.gameState.dataCount += len + 1;
 		} else if ( cmd == svc_baseline ) {
 			newnum = MSG_ReadEntityNum(msg);
 			if ( newnum < 0 || newnum >= MAX_GENTITIES ) {
@@ -536,7 +586,7 @@ void CL_ParseGamestate( msg_t *msg ) {
 	clc.clientNum = MSG_ReadLong(msg);
 	// read the checksum feed
 	clc.checksumFeed = MSG_ReadLong( msg );
-	cls.serverFrameTime = MSG_ReadServerFrameTime(msg);
+	cls.serverFrameTime = MSG_ReadServerFrameTime(msg, &cl.gameState);
 
 	// parse serverId and other cvars
 	CL_SystemInfoChanged();
@@ -546,7 +596,7 @@ void CL_ParseGamestate( msg_t *msg ) {
 		CL_StopRecord_f();
 	
 	// reinitialize the filesystem if the game directory has changed
-	FS_ConditionalRestart( clc.checksumFeed );
+	FS_ConditionalRestart( clc.checksumFeed, qfalse );
 
 	clc.state = CA_LOADING;
     if (!com_sv_running->integer)
@@ -651,7 +701,7 @@ void CL_ParseDownload ( msg_t *msg ) {
 
 	if (!*clc.downloadTempName) {
 		Com_Printf("Server sending download, but no download was requested\n");
-		CL_AddReliableCommand( "stopdl" );
+		CL_AddReliableCommand( "stopdl", qfalse );
 		return;
 	}
 
@@ -693,7 +743,7 @@ void CL_ParseDownload ( msg_t *msg ) {
 
 		if (!clc.download) {
 			Com_Printf( "Could not create %s\n", clc.downloadTempName );
-			CL_AddReliableCommand( "stopdl" );
+			CL_AddReliableCommand( "stopdl", qfalse );
 			CL_NextDownload();
 			return;
 		}
@@ -702,7 +752,7 @@ void CL_ParseDownload ( msg_t *msg ) {
 	if (size)
 		FS_Write( data, size, clc.download );
 
-	CL_AddReliableCommand( va("nextdl %d", clc.downloadBlock) );
+	CL_AddReliableCommand( va("nextdl %d", clc.downloadBlock), qfalse );
 	clc.downloadBlock++;
 
 	clc.downloadCount += size;
@@ -716,7 +766,7 @@ void CL_ParseDownload ( msg_t *msg ) {
 			clc.download = 0;
 
 			// rename the file
-			FS_SV_Rename ( clc.downloadTempName, clc.downloadName );
+			FS_SV_Rename ( clc.downloadTempName, clc.downloadName, qfalse );
 		}
 		*clc.downloadTempName = *clc.downloadName = 0;
 		Cvar_Set( "cl_downloadName", "" );

code/client/cl_scrn.cpp

@@ -531,7 +531,7 @@ void SCR_UpdateScreen( void ) {
 	}
 	recursive = 1;
 	
-	CL_StartHunkUsers();
+	CL_StartHunkUsers(qfalse);
 	SCR_SimpleUpdateScreen();
 
 	// set the fps value

code/client/cl_ui.h

@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,103 +20,129 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UI_H__
-#define __CL_UI_H__
+#pragma once
 
 #include "../uilib/ui_extern.h"
 #include "../uilib/uiwidget.h"
 
 typedef struct {
-	UIReggedMaterial *loading;
+    UIReggedMaterial *loading;
 } static_media_t;
 
+//
+// cvars
+//
+extern cvar_t *ui_health_start;
+extern cvar_t *ui_health_end;
+extern cvar_t *sound_overlay;
+
 //
 // initialization
 //
-void CL_FillUIDef( void );
-void CL_InitializeUI( void );
-void CL_ShutdownUI( void );
+void CL_FillUIDef(void);
+void CL_InitializeUI(void);
+void CL_ShutdownUI(void);
 
 //
 // general ui stuff
 //
 extern inventory_t client_inv;
-extern bind_t client_bind;
-extern cvar_t* cl_greenfps;
+extern bind_t      client_bind;
+extern cvar_t     *cl_greenfps;
 
-const char *CvarGetForUI( const char *name, const char *defval );
-void UI_ClearState( void );
-void CL_BeginRegistration( void );
-void CL_EndRegistration(void);
+const char *CvarGetForUI(const char *name, const char *defval);
+void        UI_ClearState(void);
+void        CL_BeginRegistration(void);
+void        CL_EndRegistration(void);
 
 //
 // menu
 //
 extern Menu *ui_pLoadingMenu;
 
-void UI_ShowMenu( const char *name, qboolean bForce );
-void UI_HideMenu( const char *name, qboolean bForce );
-void UI_ForceMenuOff( bool force );
-void UI_PushMenu( const char *name );
-void UI_ForceMenu( const char *name );
-qboolean UI_BindActive( void );
-void UI_ActivateView3D( void );
-void UI_MenuEscape( const char *name );
-void UI_CreateScoreboard( void );
-qboolean UI_MenuActive( void );
-qboolean UI_MenuUp( void );
-void UI_DrawConnect( void );
-void UI_CreateDialog( const char *title, char *cvarname, const char *command, const char *cancelCommand, int width, int height, const char *shader, const char *okshader, const char *cancelshader );
-void UI_ToggleDMConsole( int iMode );
-void UI_ShowScoreboard_f( const char *pszMenuName );
-void UI_HideScoreboard_f( void );
-void UI_SetScoreBoardItem( int iItemNumber,
-	const char *pszData1, const char *pszData2, const char *pszData3, const char *pszData4,
-	const char *pszData5, const char *pszData6, const char *pszData7, const char *pszData8,
-	const vec4_t pTextColor, const vec4_t pBackColor, qboolean bIsHeader );
-void UI_DeleteScoreBoardItems( int iMaxIndex );
+void     UI_ShowMenu(const char *name, qboolean bForce);
+void     UI_HideMenu(const char *name, qboolean bForce);
+void     UI_ForceMenuOff(bool force);
+void     UI_PushMenu(const char *name);
+void     UI_ForceMenu(const char *name);
+qboolean UI_BindActive(void);
+void     UI_SetReturnMenuToCurrent(void);
+void     UI_ActivateView3D(void);
+void     UI_MenuEscape(const char *name);
+void     UI_CreateScoreboard(void);
+qboolean UI_MenuActive(void);
+qboolean UI_MenuUp(void);
+void     UI_FocusMenuIfExists(void);
+void     UI_DrawConnect(void);
+void     UI_CreateDialog(
+        const char *title,
+        char       *cvarname,
+        const char *command,
+        const char *cancelCommand,
+        int         width,
+        int         height,
+        const char *shader,
+        const char *okshader,
+        const char *cancelshader
+    );
+void UI_ToggleDMConsole(int iMode);
+void UI_ShowScoreboard_f(const char *pszMenuName);
+void UI_HideScoreboard_f(void);
+void UI_SetScoreBoardItem(
+    int          iItemNumber,
+    const char  *pszData1,
+    const char  *pszData2,
+    const char  *pszData3,
+    const char  *pszData4,
+    const char  *pszData5,
+    const char  *pszData6,
+    const char  *pszData7,
+    const char  *pszData8,
+    const vec4_t pTextColor,
+    const vec4_t pBackColor,
+    qboolean     bIsHeader
+);
+void UI_DeleteScoreBoardItems(int iMaxIndex);
 
 //
 // ressources
 //
-void UI_BeginLoad( const char *pszMapName );
-void UI_EndLoad( void );
-void UI_AbortLoad( void );
-void UI_BeginLoadResource( void );
-void UI_EndLoadResource( void );
-void UI_EndLoadResource( const char *name );
-qboolean UI_IsResourceLoaded( const char *name );
-void UI_RegisterLoadResource( const char *name );
-void UI_ClearResource( void );
-void UI_LoadResource( const char *name );
+void     UI_BeginLoad(const char *pszMapName);
+void     UI_EndLoad(void);
+void     UI_AbortLoad(void);
+void     UI_BeginLoadResource(void);
+void     UI_EndLoadResource(void);
+void     UI_EndLoadResource(const char *name);
+qboolean UI_IsResourceLoaded(const char *name);
+void     UI_RegisterLoadResource(const char *name);
+void     UI_ClearResource(void);
+void     UI_LoadResource(const char *name);
 
 //
 // windows
 //
-void UI_DeactiveFloatingWindows( void );
+void UI_DeactiveFloatingWindows(void);
 
 //
 // console
 //
-void UI_OpenConsole( void );
-qboolean UI_ConsoleIsVisible( void );
-qboolean UI_ConsoleIsOpen( void );
-void UI_CloseConsole( void );
-void UI_ToggleConsole( void );
-void UI_OpenDMConsole( int iMode );
-void UI_CloseDMConsole( void );
-void UI_ToggleDMConsole( int iMode );
-void UI_OpenDeveloperConsole( void );
-void UI_CloseDeveloperConsole( void );
-void UI_PrintConsole(const char* msg);
+void     UI_OpenConsole(void);
+qboolean UI_ConsoleIsVisible(void);
+qboolean UI_ConsoleIsOpen(void);
+void     UI_CloseConsole(void);
+void     UI_ToggleConsole(void);
+void     UI_OpenDMConsole(int iMode);
+void     UI_CloseDMConsole(void);
+void     UI_ToggleDMConsole(int iMode);
+void     UI_OpenDeveloperConsole(void);
+void     UI_CloseDeveloperConsole(void);
+void     UI_PrintConsole(const char *msg);
 
 //
 // callbacks
 //
-void UI_Update( void );
-void UI_ServerLoaded( void );
-void UI_ResolutionChange( void );
-void UI_KeyEvent( int key, unsigned int time );
-void UI_CharEvent( int ch );
-
-#endif /* __CL_UI_H__ */
+void UI_Update(void);
+void UI_ServerLoaded(void);
+void UI_ResolutionChange(void);
+void UI_KeyEvent(int key, unsigned int time);
+void UI_CharEvent(int ch);

code/client/cl_uidmbox.cpp

@@ -161,10 +161,13 @@ void UIDMBox::PostDecayEvent( void )
 			}
 		}
 
-		//
-		// Bold as twice more decay
-		//
-		if (m_items[0].flags & DMBOX_ITEM_FLAG_BOLD) {
+        if (m_items[0].flags & DMBOX_ITEM_FLAG_BOLD) {
+            fDelayTime = iNumLines * 8.0;
+        }
+        //
+        // Bold as twice more decay
+        //
+		else if (m_items[0].flags & DMBOX_ITEM_FLAG_DEATH) {
 			fDelayTime = iNumLines * 6.0;
 		}
 		else {
@@ -285,7 +288,7 @@ void UIDMBox::Print( const char *text )
 {
 	const char* text1 = text;
 
-	if (m_numitems > 4)
+	if (m_numitems > 5)
 	{
 		//
 		// Overwrite an item
@@ -307,15 +310,15 @@ void UIDMBox::Print( const char *text )
 	{
 		m_items[m_numitems].color = ULightRed;
 		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
+		m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
 		text1 = text + 1;
 	}
 	else if (*text == MESSAGE_CHAT_GREEN)
 	{
 		m_items[m_numitems].color = UGreen;
-		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
+        m_items[m_numitems].font = m_fontbold;
+        m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
 		text1 = text + 1;
 	}
@@ -377,7 +380,7 @@ void UIDMBox::Draw( void )
 	float alpha;
 	float alphaScale;
 
-	alphaScale = 0.8;
+	alphaScale = 0.8f;
 	HandleBoxMoving();
 
 	if (!m_numitems) {

code/client/cl_uidmbox.h

@@ -23,7 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __CL_UIDMBOX_H__
 #define __CL_UIDMBOX_H__
 
-static constexpr unsigned int DMBOX_ITEM_FLAG_BOLD = 1u;
+static constexpr unsigned int DMBOX_ITEM_FLAG_BOLD = 2u;
+static constexpr unsigned int DMBOX_ITEM_FLAG_DEATH = 4u;
 
 typedef enum { box_moving_out, box_moving_in, box_out, box_in } boxstate_t;
 

code/client/cl_uiloadsave.h

@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UILOADSAVE_H__
-#define __CL_UILOADSAVE_H__
+#pragma once
 
 class UIFAKKLoadGameClass : public UIListCtrl { 
 	bool m_bRemovePending; 
@@ -43,15 +42,3 @@ public:
 
 	void	SetupFiles( void );
 };
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void UI_SetupFiles( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif 

code/client/cl_uiradar.cpp

@@ -0,0 +1,167 @@
+/*
+===========================================================================
+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
+===========================================================================
+*/
+
+// cl_uiradar.cpp: draw teammates
+// since 2.0
+
+#include "cl_uiradar.h"
+#include "client.h"
+
+radarClient_t* g_radarClients;
+qhandle_t* g_radarShaders;
+int g_radarClientNum;
+
+void CL_InitRadar(radarClient_t* radars, qhandle_t* shaders, int clientNum)
+{
+	g_radarClients = radars;
+	g_radarShaders = shaders;
+	g_radarClientNum = clientNum;
+}
+
+CLASS_DECLARATION( UIWidget, UIRadar, NULL )
+{
+	{ NULL, NULL }
+};
+
+UIRadar::UIRadar()
+{
+	m_fRadius = 32.f;
+	g_radarClients = NULL;
+}
+
+UIRadar::~UIRadar()
+{
+}
+
+void UIRadar::Draw(void)
+{
+	radarClient_t* radar;
+	float inv;
+	float iconSize;
+	int blinkTime, speakTime;
+	float origin[2], axis[2];
+	float halfScale;
+	int i;
+
+	if (!g_radarClients) {
+		return;
+	}
+
+	if (!cl.snap.valid) {
+		return;
+	}
+
+	if (g_radarClientNum < 0) {
+		return;
+	}
+
+	cge->CG_UpdateRadar();
+
+	radar = &g_radarClients[g_radarClientNum];
+	if (!radar->time) {
+		return;
+	}
+
+	if (com_radar_range && com_radar_range->value > 0) {
+		inv = 1.f / com_radar_range->value;
+	} else {
+		inv = 0;
+	}
+
+	if (cl_radar_icon_size->value > 0) {
+		iconSize = cl_radar_icon_size->value;
+	} else {
+		iconSize = 0;
+	}
+
+	axis[0] = radar->axis[0];
+	axis[1] = radar->axis[1];
+	origin[0] = radar->origin[0];
+	origin[1] = radar->origin[1];
+	blinkTime = cl_radar_blink_time->value * 1000;
+	speakTime = cl_radar_speak_time->value * 1000;
+
+	if (blinkTime < 100) blinkTime = 100;
+
+	halfScale = iconSize * 0.5f;
+
+	for (i = 0; i < MAX_CLIENTS; i++) {
+		float delta[2];
+		float newOrg[2];
+		float screenOrg[2];
+		float length;
+
+		radar = &g_radarClients[i];
+		if (i == g_radarClientNum) {
+			continue;
+		}
+
+		if (!g_radarClients[i].time) {
+			continue;
+		}
+
+		if (cl.snap.serverTime - radar->time >= 5000) {
+			continue;
+		}
+
+		if (radar->lastSpeakTime) {
+			int delta = cl.snap.serverTime - radar->lastSpeakTime;
+			// make the icon blink
+			if (delta >= 0 && delta < speakTime && ((delta / blinkTime) % 2) == 0) {
+				continue;
+			}
+		}
+
+		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;
+		newOrg[1] = (delta[0] * axis[1] + delta[1] * -axis[0]) * inv;
+		length = VectorLength2D(newOrg);
+
+		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);
+		}
+
+		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));
+
+		uii.Rend_DrawPicStretched2(
+			screenOrg[0],
+			screenOrg[1],
+			m_vVirtualScale[0] * iconSize,
+			m_vVirtualScale[1] * iconSize,
+			0,
+			0,
+			1,
+			1,
+			radar->axis[0] * axis[0] - (-radar->axis[1] * axis[1]),
+			radar->axis[0] * axis[1] + (-radar->axis[1] * axis[0]),
+			g_radarShaders[radar->teamShader]
+		);
+	}
+}
+
+
+

code/client/cl_uiradar.h

@@ -0,0 +1,40 @@
+/*
+===========================================================================
+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 "../uilib/uiwidget.h"
+#include "../cgame/cg_public.h"
+
+class UIRadar : public UIWidget {
+public:
+    CLASS_PROTOTYPE(UIRadar);
+
+public:
+    UIRadar();
+    ~UIRadar();
+
+    void Draw(void) override;
+
+private:
+    float m_fRadius;
+};
+
+void CL_InitRadar(radarClient_t* radars, qhandle_t* shaders, int clientNum);

code/client/cl_uiserverlist.h

@@ -20,20 +20,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UISERVERLIST_H__
-#define __CL_UISERVERLIST_H__
+#pragma once
 
 class UIFAKKServerList : public UIListCtrl {
 protected:
 	// need a new struct instead of gamespy
-	void *m_serverList;
+	struct GServerListImplementation *m_serverList[2];
 	bool m_bHasList;
 	bool m_bLANListing;
 
 public:
 	CLASS_PROTOTYPE( UIFAKKServerList );
 
-	bool m_bGettingList;
+	bool m_bGettingList[2];
 	bool m_bUpdatingList;
 
 protected:
@@ -54,5 +53,3 @@ public:
 	void		Draw( void ) override;
 	void		SortByColumn( int column ) override;
 };
-
-#endif /* __CL_UISERVERLIST_H__ */

code/client/cl_uistd.h

@@ -20,85 +20,86 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UISTD_H__
-#define __CL_UISTD_H__
+#pragma once
 
 typedef enum {
-	L_STATBAR_NONE,
-	L_STATBAR_HORIZONTAL,
-	L_STATBAR_VERTICAL,
-	L_STATBAR_VERTICAL_REVERSE,
-	L_STATBAR_VERTICAL_STAGGER_EVEN,
-	L_STATBAR_VERTICAL_STAGGER_ODD,
-	L_STATBAR_CIRCULAR,
-	L_STATBAR_NEEDLE,
-	L_STATBAR_ROTATOR,
-	L_STATBAR_COMPASS,
-	L_STATBAR_SPINNER,
-	L_STATBAR_HEADING_SPINNER
+    L_STATBAR_NONE,
+    L_STATBAR_HORIZONTAL,
+    L_STATBAR_VERTICAL,
+    L_STATBAR_VERTICAL_REVERSE,
+    L_STATBAR_VERTICAL_STAGGER_EVEN,
+    L_STATBAR_VERTICAL_STAGGER_ODD,
+    L_STATBAR_CIRCULAR,
+    L_STATBAR_NEEDLE,
+    L_STATBAR_ROTATOR,
+    L_STATBAR_COMPASS,
+    L_STATBAR_SPINNER,
+    L_STATBAR_HEADING_SPINNER
 } statbar_orientation_t;
 
-class UIFakkLabel : public UILabel {
+class UIFakkLabel : public UILabel
+{
 protected:
-	SafePtr<inventory_item_t> m_lastitem;
-	int m_lastitemindex;
-	int m_stat;
-	int m_stat_configstring;
-	int m_maxstat;
-	int m_itemindex;
-	int m_inventoryrendermodelindex;
-	str m_sDrawModelName;
-	qboolean m_rendermodel;
-	statbar_orientation_t m_statbar_or;
-	float m_statbar_min;
-	float m_statbar_max;
-	float m_lastfrac;
-	float m_flashtime;
-	vec3_t m_offset;
-	vec3_t m_rotateoffset;
-	vec3_t m_angles;
-	float m_scale;
-	str m_anim;
-	UIReggedMaterial *m_statbar_material;
-	UIReggedMaterial *m_statbar_material_flash;
+    SafePtr<inventory_item_t> m_lastitem;
+    int                       m_lastitemindex;
+    int                       m_stat;
+    int                       m_stat_alpha;
+    int                       m_stat_configstring;
+    int                       m_maxstat;
+    int                       m_itemindex;
+    int                       m_inventoryrendermodelindex;
+    str                       m_sDrawModelName;
+    qboolean                  m_rendermodel;
+    statbar_orientation_t     m_statbar_or;
+    float                     m_statbar_min;
+    float                     m_statbar_max;
+    float                     m_lastfrac;
+    float                     m_flashtime;
+    vec3_t                    m_offset;
+    vec3_t                    m_rotateoffset;
+    vec3_t                    m_angles;
+    float                     m_scale;
+    str                       m_anim;
+    UIReggedMaterial         *m_statbar_material;
+    UIReggedMaterial         *m_statbar_material_flash;
+	UIReggedMaterial         *m_statbar_material_marker;
 
 public:
-	CLASS_PROTOTYPE( UIFakkLabel );
+    CLASS_PROTOTYPE(UIFakkLabel);
 
-	UIFakkLabel();
+    UIFakkLabel();
 
-	void		LayoutPlayerStat( Event *ev );
-	void		LayoutPlayerStatConfigstring( Event *ev );
-	void		LayoutMaxPlayerStat( Event *ev );
-	void		LayoutItemIndex( Event *ev );
-	void		InventoryRenderModelIndex( Event *ev );
-	void		LayoutModelName( Event *ev );
-	void		ClearInvItemReference( Event *ev );
-	void		LayoutStatbar( Event *ev );
-	void		LayoutStatbarShader( Event *ev );
-	void		LayoutStatbarTileShader( Event *ev );
-	void		LayoutStatbarShader_Flash( Event *ev );
-	void		LayoutStatbarEndAngles( Event *ev );
-	void		LayoutStatbarNeedleWidth( Event *ev );
-	void		LayoutStatbarRotatorSize( Event *ev );
-	void		LayoutStatbarTileShader_Flash( Event *ev );
-	void		LayoutRenderModel( Event *ev );
-	void		LayoutRenderModelOffset( Event *ev );
-	void		LayoutRenderModelRotateOffset( Event *ev );
-	void		LayoutRenderModelAngles( Event *ev );
-	void		LayoutRenderModelScale( Event *ev );
-	void		LayoutRenderModelAnim( Event *ev );
+    void LayoutPlayerStat(Event *ev);
+    void LayoutPlayerStatAlpha(Event *ev); // Added in 2.0
+    void LayoutPlayerStatConfigstring(Event *ev);
+    void LayoutMaxPlayerStat(Event *ev);
+    void LayoutItemIndex(Event *ev);
+    void InventoryRenderModelIndex(Event *ev);
+    void LayoutModelName(Event *ev);
+    void ClearInvItemReference(Event *ev);
+    void LayoutStatbar(Event *ev);
+    void LayoutStatbarShader(Event *ev);
+    void LayoutStatbarTileShader(Event *ev);
+    void LayoutStatbarShader_Flash(Event *ev);
+    void LayoutStatbarShader_Marker(Event *ev); // Added in 2.0
+    void LayoutStatbarEndAngles(Event *ev);
+    void LayoutStatbarNeedleWidth(Event *ev);
+    void LayoutStatbarRotatorSize(Event *ev);
+    void LayoutStatbarTileShader_Flash(Event *ev);
+    void LayoutRenderModel(Event *ev);
+    void LayoutRenderModelOffset(Event *ev);
+    void LayoutRenderModelRotateOffset(Event *ev);
+    void LayoutRenderModelAngles(Event *ev);
+    void LayoutRenderModelScale(Event *ev);
+    void LayoutRenderModelAnim(Event *ev);
 
-	void		DrawStatbar( float frac );
-	void		DrawStatCircle( float frac );
-	void		DrawStatNeedle( float frac );
-	void		DrawStatRotator( float frac );
-	void		DrawStatCompass( float frac );
-	void		DrawStatSpinner( float frac );
-	void		StatCircleTexCoord( float fAng, vec3_t vTexCoord );
+    void DrawStatbar(float frac);
+    void DrawStatCircle(float frac);
+    void DrawStatNeedle(float frac);
+    void DrawStatRotator(float frac);
+    void DrawStatCompass(float frac);
+    void DrawStatSpinner(float frac);
+    void StatCircleTexCoord(float fAng, vec3_t vTexCoord);
 
-	void		Draw( void ) override;
+    void Draw(void) override;
 };
-
-#endif
-

code/client/cl_uiview3d.cpp

@@ -30,6 +30,15 @@ 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];
+float subLife[MAX_SUBTITLES];
+float alpha[MAX_SUBTITLES];
+char oldStrings[MAX_SUBTITLES][2048];
+
 View3D::View3D()
 {
 	// set as transparent
@@ -66,7 +75,22 @@ void View3D::DrawLetterbox
 	)
 
 {
-	// FIXME: stub
+	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
@@ -75,7 +99,14 @@ void View3D::DrawFades
 	)
 
 {
-	// FIXME: stub
+	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::Draw2D
@@ -200,7 +231,7 @@ void View3D::DrawProf
 	)
 
 {
-	// FIXME: stub
+	// Normal empty function
 }
 
 void View3D::PrintSound
@@ -215,7 +246,7 @@ void View3D::PrintSound
 	)
 
 {
-	// FIXME: stub
+	// FIXME: unimplemented
 }
 
 void View3D::DrawSoundOverlay
@@ -224,7 +255,13 @@ void View3D::DrawSoundOverlay
 	)
 
 {
-	// FIXME: stub
+	setFont("verdana-14");
+	m_font->setColor(UWhite);
+
+	if (sound_overlay->integer) {
+		Com_Printf("sound_overlay isn't supported with OpenAL/SDL right now.\n");
+		Cvar_Set("sound_overlay", "0");
+	}
 }
 
 void View3D::CenterPrint
@@ -233,7 +270,7 @@ void View3D::CenterPrint
 	)
 
 {
-	// FIXME: stub
+	// FIXME: unimplemented
 }
 
 void View3D::LocationPrint
@@ -242,7 +279,7 @@ void View3D::LocationPrint
 	)
 
 {
-	// FIXME: stub
+	// FIXME: unimplemented
 }
 
 void View3D::OnActivate
@@ -287,7 +324,7 @@ void View3D::DrawSubtitleOverlay
 	)
 
 {
-	// FIXME: stub
+	// FIXME: unimplemented
 }
 
 void View3D::ClearCenterPrint
@@ -296,7 +333,7 @@ void View3D::ClearCenterPrint
 	)
 
 {
-	// FIXME: stub
+	m_printfadetime = 0.0;
 }
 
 void View3D::UpdateCenterPrint
@@ -306,7 +343,17 @@ void View3D::UpdateCenterPrint
 	)
 
 {
-	// FIXME: stub
+	m_printstring = s;
+
+	if (s[0] == '@') {
+		m_print_mat = uWinMan.RegisterShader(s + 1);
+	} else {
+		m_print_mat = NULL;
+	}
+
+	m_printalpha = alpha;
+	m_printfadetime = 4000.0;
+	m_locationprint = qfalse;
 }
 
 void View3D::UpdateLocationPrint
@@ -318,7 +365,12 @@ void View3D::UpdateLocationPrint
 	)
 
 {
-	// FIXME: stub
+	m_printstring = s;
+	m_printalpha = alpha;
+	m_printfadetime = 4000.0;
+	m_x_coord = x;
+	m_y_coord = y;
+	m_locationprint = qtrue;
 }
 
 qboolean View3D::LetterboxActive
@@ -330,13 +382,30 @@ qboolean View3D::LetterboxActive
 	return m_letterbox_active;
 }
 
+float avWidth = 0.0;
+
 void View3D::InitSubtitle
 	(
 	void
 	)
 
 {
-	// FIXME: stub
+	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
@@ -370,6 +439,6 @@ void ConsoleView::Draw
 	)
 
 {
-	// FIXME: stub
+	// FIXME: unimplemented
 }
 

code/client/client.h

@@ -21,8 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // client.h -- primary header for client
 
-#ifndef __CLIENT_H__
-#define __CLIENT_H__
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
@@ -352,7 +351,7 @@ typedef struct {
 	clientAnim_t anim;
 	stopWatch_t stopwatch;
 	void* savedCgameState;
-	int savedCgameStateSize;
+	size_t savedCgameStateSize;
 	char gcdResponse[73];
 	int unknown3_0;
 	int currentRate;
@@ -437,6 +436,9 @@ extern	cvar_t	*cl_inGameVideo;
 
 extern	cvar_t	*cl_lanForcePackets;
 extern	cvar_t	*cl_langamerefreshstatus;
+extern	cvar_t	*cl_radar_icon_size;
+extern	cvar_t	*cl_radar_speak_time;
+extern	cvar_t	*cl_radar_blink_time;
 extern	cvar_t	*cl_autoRecordDemo;
 
 extern	cvar_t	*cl_r_fullscreen;
@@ -463,15 +465,12 @@ extern	cvar_t* j_up_axis;
 //
 
 void CL_Init (void);
-void CL_InitClientSavedData( void );
-void CL_InitRef( void );
-void CL_FlushMemory(void);
-void CL_ShutdownAll(void);
-void CL_AddReliableCommand( const char *cmd );
+void CL_InitClientSavedData(void);
+void CL_AddReliableCommand(const char *cmd, qboolean isDisconnectCmd);
 
-void CL_StartHunkUsers( void );
+void CL_StartHunkUsers( qboolean rendererOnly );
 
-void CL_Connect( const char *server );
+void CL_Connect( const char *server, netadrtype_t family );
 
 void CL_Disconnect_f (void);
 void CL_GetChallengePacket (void);
@@ -573,6 +572,7 @@ void	CL_FavoriteServers_f( void );
 void	CL_Ping_f( void );
 void	CL_SaveShot_f( void );
 void	CL_Dialog_f( void );
+void	CL_ServerRestarted( void );
 qboolean CL_UpdateVisiblePings_f( int source );
 
 
@@ -689,5 +689,3 @@ void CL_InitConsoleCommands( void );
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __CLIENT_H__

code/client/new/snd_local_new.h

@@ -0,0 +1,65 @@
+/*
+===========================================================================
+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
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+	int iFlags;
+	char szName[64];
+} soundSfx_t;
+
+typedef struct {
+	qboolean bPlaying;
+	int iStatus;
+	soundSfx_t sfx;
+	int iEntNum;
+	int iEntChannel;
+	float vOrigin[3];
+	float fVolume;
+	int iBaseRate;
+	float fNewPitchMult;
+	float fMinDist;
+	float fMaxDist;
+	int iStartTime;
+	int iTime;
+	int iNextCheckObstructionTime;
+	int iEndTime;
+	int iFlags;
+	int iOffset;
+	int iLoopCount;
+} channelbasesavegame_t;
+
+typedef struct {
+	channelbasesavegame_t Channels[MAX_CHANNELS];
+} soundsystemsavegame_t;
+
+void S_ChannelFree_Callback(channel_t* v);
+void S_LoadData(soundsystemsavegame_t* pSave);
+void S_SaveData(soundsystemsavegame_t* pSave);
+
+#ifdef __cplusplus
+}
+#endif

code/client/new/snd_main_new.cpp

@@ -1,3 +1,25 @@
+/*
+===========================================================================
+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 "../snd_local.h"
 
 void S_Init2()
@@ -33,7 +55,7 @@ void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t s
 S_StopAllSounds
 =================
 */
-void S_StopAllSounds(qboolean stop_music)
+void S_StopAllSounds2(qboolean stop_music)
 {
     // Call the original function
     S_StopAllSounds();
@@ -61,12 +83,23 @@ void S_Respatialize(int entityNum, const vec3_t origin,
 {
     S_Respatialize(entityNum, origin, axis, 0);
 }
+
+/*
+=================
+S_StartLocalSoundChannel
+=================
+*/
+void S_StartLocalSound(const char* sound_name, qboolean force_load)
+{
+    // FIXME: unimplemented
+}
+
 /*
 =================
 S_StartLocalSound
 =================
 */
-void S_StartLocalSound(const char* sound_name, qboolean force_load)
+void S_StartLocalSoundChannel(const char* sound_name, qboolean force_load, int channel)
 {
     // FIXME: unimplemented
 }
@@ -90,11 +123,16 @@ void S_StopSound(int entnum, int channel)
 S_IsSoundPlaying
 =================
 */
-int S_IsSoundPlaying(int channelNumber, const char* name)
+qboolean S_IsSoundPlaying(int channelNumber, const char* name)
 {
-    // FIXME: stub
-    STUB();
-    return 0;
+    channel_t* v;
+    if (channelNumber >= MAX_CHANNELS) {
+        return qfalse;
+    }
+
+	v = &s_channels[channelNumber];
+
+    return v->thesfx ? qtrue : qfalse;
 }
 
 /*
@@ -104,7 +142,7 @@ MUSIC_Pause
 */
 void MUSIC_Pause()
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -115,7 +153,7 @@ MUSIC_Unpause
 */
 void MUSIC_Unpause()
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -126,7 +164,7 @@ MUSIC_LoadSoundtrackFile
 */
 qboolean MUSIC_LoadSoundtrackFile(const char* filename)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return qfalse;
 }
@@ -138,7 +176,7 @@ MUSIC_SongValid
 */
 qboolean MUSIC_SongValid(const char* mood)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return qfalse;
 }
@@ -150,7 +188,7 @@ MUSIC_Loaded
 */
 qboolean MUSIC_Loaded(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return qfalse;
 }
@@ -162,7 +200,7 @@ Music_Update
 */
 void Music_Update(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -173,7 +211,7 @@ MUSIC_SongEnded
 */
 void MUSIC_SongEnded(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -184,7 +222,7 @@ S_StartSound
 */
 void MUSIC_NewSoundtrack(const char* name)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -195,7 +233,7 @@ MUSIC_UpdateMood
 */
 void MUSIC_UpdateMood(int current, int fallback)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     //STUB();
 }
 
@@ -206,7 +244,7 @@ MUSIC_UpdateVolume
 */
 void MUSIC_UpdateVolume(float volume, float fade_time)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -217,7 +255,7 @@ MUSIC_StopAllSongs
 */
 void MUSIC_StopAllSongs(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -228,7 +266,7 @@ MUSIC_FreeAllSongs
 */
 void MUSIC_FreeAllSongs(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -239,7 +277,7 @@ MUSIC_Playing
 */
 qboolean MUSIC_Playing(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return qfalse;
 }
@@ -251,7 +289,7 @@ MUSIC_FindSong
 */
 int MUSIC_FindSong(const char* name)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return 0;
 }
@@ -263,7 +301,7 @@ MUSIC_CurrentSongChannel
 */
 int MUSIC_CurrentSongChannel(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return 0;
 }
@@ -275,7 +313,7 @@ MUSIC_StopChannel
 */
 void MUSIC_StopChannel(int channel_number)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -286,7 +324,7 @@ MUSIC_PlaySong
 */
 qboolean MUSIC_PlaySong(const char* alias)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return qfalse;
 }
@@ -298,7 +336,7 @@ MUSIC_UpdateMusicVolumes
 */
 void MUSIC_UpdateMusicVolumes(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -309,7 +347,7 @@ MUSIC_CheckForStoppedSongs
 */
 void MUSIC_CheckForStoppedSongs(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -320,7 +358,7 @@ S_IsSoundRegistered
 */
 qboolean S_IsSoundRegistered(const char* name)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     return qfalse;
 }
 /*
@@ -330,7 +368,7 @@ S_GetSoundTime
 */
 float S_GetSoundTime(sfxHandle_t handle)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
     return 0.0;
 }
@@ -342,7 +380,7 @@ S_SetGlobalAmbientVolumeLevel
 */
 void S_SetGlobalAmbientVolumeLevel(float volume)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -353,7 +391,7 @@ S_SetReverb
 */
 void S_SetReverb(int reverb_type, float reverb_level)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
     STUB();
 }
 
@@ -364,15 +402,39 @@ S_EndRegistration
 */
 void S_EndRegistration(void)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
 }
 
 void S_UpdateEntity(int entityNum, const vec3_t origin, const vec3_t velocity, qboolean use_listener)
 {
-    // FIXME: stub
+    // FIXME: unimplemented
 }
 
 void S_FadeSound(float fTime)
 {
-    // FIXME: stub
-}
+    // FIXME: unimplemented
+}
+
+void S_TriggeredMusic_PlayIntroMusic() {
+    // FIXME: unimplemented
+}
+
+void callbackServer(int entnum, int channel_number, const char* name) {
+    if (com_sv_running->integer) {
+        SV_SoundCallback(entnum, channel_number, name);
+    }
+}
+
+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);
+    }
+}
+
+void S_LoadData(soundsystemsavegame_t* pSave) {
+    // FIXME: unimplemented
+}
+
+void S_SaveData(soundsystemsavegame_t* pSave) {
+    // FIXME: unimplemented
+}

code/client/new/snd_public_new.h

@@ -1,3 +1,25 @@
+/*
+===========================================================================
+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
 
 #ifdef __cplusplus
@@ -8,8 +30,8 @@ void S_Respatialize(int entityNum, const vec3_t origin, vec3_t axis[3]);
 sfxHandle_t	S_RegisterSound(const char* sample, qboolean compressed, qboolean streamed);
 void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t sfxHandle, float volume, float minDist, float maxDist, float pitch, int flags);
 void S_StartLocalSound(const char* name, qboolean force_load);
+void S_StartLocalSoundChannel(const char* sound_name, qboolean force_load, int channel);
 void S_StartSound(const vec3_t origin, int entNum, int entChannel, sfxHandle_t sfxHandle, float volume, float minDist, float pitch, float maxDist, qboolean streamed);
-void S_StopAllSounds(qboolean stop_music);
 void S_ClearLoopingSounds(void);
 qboolean S_IsSoundRegistered(const char* name);
 void S_Init2();
@@ -43,13 +65,15 @@ void MUSIC_UpdateMusicVolumes(void);
 void MUSIC_CheckForStoppedSongs(void);
 
 void S_StopSound(int entnum, int channel);
+void S_StopAllSounds2(qboolean stop_music);
 float S_GetSoundTime(sfxHandle_t handle);
 void S_SetGlobalAmbientVolumeLevel(float volume);
 void S_SetReverb(int reverb_type, float reverb_level);
-int S_IsSoundPlaying(int channelNumber, const char* name);
+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();
 
 #ifdef __cplusplus
 }

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 <mad.h>
+#include "../libmad-0.15.1b/synth.h"
 
 #define MP3_SAMPLE_WIDTH		2
 #define MP3_PCMSAMPLES_PERSLICE		32

code/client/snd_dma.c

@@ -181,6 +181,7 @@ void S_Base_SoundList( void ) {
 
 
 void S_ChannelFree(channel_t *v) {
+	S_ChannelFree_Callback(v);
 	v->thesfx = NULL;
 	*(channel_t **)v = freelist;
 	freelist = (channel_t*)v;

code/client/snd_local.h

@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // snd_local.h -- private sound definations
 
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
@@ -275,6 +276,8 @@ qboolean S_AL_Init( soundInterface_t *si );
 void S_PaintChannelFrom16_altivec( portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE], int snd_vol, channel_t *ch, const sfx_t *sc, int count, int sampleOffset, int bufferOffset );
 #endif
 
+#include "new/snd_local_new.h"
+
 #ifdef __cplusplus
 }
 #endif

code/client/usignal.cpp

@@ -120,7 +120,7 @@ bool UConnection::SendEvent
 		ptr = m_listeners.ObjectAt( i );
 		if( ptr )
 		{
-			Event *e = new Event( m_events.ObjectAt( i ) );
+			Event *e = new Event( *m_events.ObjectAt( i ) );
 
 			for( j = 1; j < numargs; j++ )
 			{

code/fgame/CMakeLists.txt

@@ -16,7 +16,14 @@ set(SOURCES_SHARED
 	"../qcommon/str.cpp"
 )
 
-file(GLOB_RECURSE SOURCES_GAME "./*.c*" "../parser/*.c*" "../script/*.c*")
+file(
+	GLOB_RECURSE
+	SOURCES_GAME
+	"./*.c*"
+	"../script/*.c*"
+	"../parser/generated/*.c*"
+	"../parser/parsetree.cpp"
+)
 
 add_library(fgame SHARED ${SOURCES_GAME})
 
@@ -44,13 +51,13 @@ 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}${TARGET_CONFIG_SUFFIX}")
+set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_ARCH_SUFFIX}")
 set_target_properties(fgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
 
 INSTALL(
 	TARGETS fgame
-	DESTINATION "${TARGET_BASE_GAME}"
-	ARCHIVE EXCLUDE_FROM_ALL
+	LIBRARY DESTINATION "${TARGET_BASE_GAME}"
+	RUNTIME DESTINATION "${TARGET_BASE_GAME}"
 )
 
 if(MSVC)

code/fgame/DrivableVehicleTandem.cpp

@@ -0,0 +1,66 @@
+/*
+===========================================================================
+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 "DrivableVehicleTandem.h"
+#include "vehicleturret.h"
+
+CLASS_DECLARATION(DrivableVehicle, DrivableVehicleTandem, "DrivableVehicleTandem") {
+    {NULL, NULL}
+};
+
+DrivableVehicleTandem::DrivableVehicleTandem()
+{
+}
+
+DrivableVehicleTandem::~DrivableVehicleTandem()
+{
+}
+
+void DrivableVehicleTandem::SpawnTurret(Event* ev)
+{
+    VehicleTurretGunTandem* pTurret = new VehicleTurretGunTandem();
+    int slot;
+
+    pTurret->SetBaseOrientation(orientation, NULL);
+    pTurret->setModel(ev->GetString(2));
+
+    slot = ev->GetInteger(1);
+    AttachTurretSlot(slot, pTurret, vec_zero, NULL);
+    pTurret->SetVehicleOwner(this);
+
+    pTurret->PostEvent(EV_TakeDamage, EV_POSTSPAWN);
+
+    UpdateTurretSlot(slot);
+
+    pTurret->ProcessPendingEvents();
+}
+
+void DrivableVehicleTandem::UpdateTurretSlot(int iSlot)
+{
+    DrivableVehicle::UpdateTurretSlot(iSlot);
+
+    if (Turrets[iSlot].ent && Turrets[iSlot].ent->isSubclassOf(VehicleTurretGunTandem)) {
+        VehicleTurretGunTandem* pTurret = static_cast<VehicleTurretGunTandem*>(Turrets[iSlot].ent.Pointer());
+        pTurret->UpdateLinkedTurret();
+    }
+}
+

code/fgame/DrivableVehicleTandem.h

@@ -0,0 +1,37 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "vehicle.h"
+
+class DrivableVehicleTandem : public DrivableVehicle {
+private:
+    CLASS_PROTOTYPE(DrivableVehicleTandem);
+
+public:
+    DrivableVehicleTandem();
+    ~DrivableVehicleTandem();
+
+    void SpawnTurret(Event* ev) override;
+    void UpdateTurretSlot(int iSlot) override;
+};

code/fgame/Entities.h

@@ -0,0 +1,473 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "entity.h"
+#include "animate.h"
+
+typedef enum {
+	CONTROLLER_ALLIES,
+	CONTROLLER_AXIS,
+    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
+
+void ClearProjectileTargets();
+
+class ProjectileTarget : public Entity
+{
+private:
+    int m_iTarget;
+
+public:
+    CLASS_PROTOTYPE(ProjectileTarget);
+
+    ProjectileTarget();
+
+    void EventSetId(Event *ev);
+    int GetTarget() const;
+};
+
+#define MAX_PROJECTILE_GENERATOR_TARGETS 16
+
+class ProjectileGenerator : public Animate
+{
+protected:
+    int                           m_iId;
+    int                           m_iCycles;
+    float                         m_fMinDuration;
+    float                         m_fMaxDuration;
+    int                           m_iMinNumShots;
+    int                           m_iMaxNumShots;
+    float                         m_fMinDelay;
+    float                         m_fMaxDelay;
+    float                         m_fAccuracy;
+    str                           m_sLaunchSound;
+    bool                          m_bFireOnStartUp;
+    qboolean                      m_bIsDonut;
+    float                         m_fArcDonut;
+    float                         m_fMinDonut;
+    float                         m_fMaxDonut;
+    float                         m_fCycleTime;
+    float                         m_fShotsPerSec;
+    float                         m_fCurrentTime;
+    int                           m_iTargetIndex;
+    float                         m_fLastShotTime;
+    int                           m_iAnimSlot;
+    bool                          m_bIsTurnedOn;
+    int                           m_iCurrentCycle;
+    Entity                       *m_pTarget;
+    Container<ProjectileTarget *> m_projectileTargets;
+    Entity                       *m_pCurrent;
+    Vector                        m_vTargetOrg;
+
+public:
+    CLASS_PROTOTYPE(ProjectileGenerator);
+
+    ProjectileGenerator();
+
+    virtual void SetupNextCycle();
+    virtual void BeginCycle(Event *ev);
+    virtual void TickCycle(Event *ev);
+    virtual void EndCycle(Event *ev);
+
+    bool ShouldStartOn() const;
+    bool ShouldHideModel() const;
+    bool ShouldPlayFireSound() const;
+    bool ShouldPlayMotionSound() const;
+    bool ShouldRotateYaw() const;
+    bool ShouldRotateRoll() const;
+
+    void EventIsTurnedOn(Event *ev);
+    void EventGetTargetEntity(Event *ev);
+    void EventLaunchSound(Event *ev);
+    void SetTarget(Event *ev);
+    void 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;
+    Vector       GetTargetPos(Entity *target);
+    void         GetMuzzlePos(Vector& pos);
+    void         Fire();
+    void         TryLaunchSound();
+    void         SetWeaponAnim(const char* name, Event* ev);
+    void         EventAccuracy(Event *ev);
+    void         EventMaxDelay(Event *ev);
+    void         EventMinDelay(Event *ev);
+    void         EventFireOnStartUp(Event *ev);
+    void         EventMaxNumShots(Event *ev);
+    void         EventMinNumShots(Event *ev);
+    void         EventCycles(Event *ev);
+    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);
+    virtual bool Attack(int count);
+
+    void Archive(Archiver& arc) override;
+};
+
+class ProjectileGenerator_Projectile : public ProjectileGenerator
+{
+private:
+    str   m_sProjectileModel;
+    str   m_sPreImpactSound;
+    float m_fImpactSoundTime;
+    float m_fImpactSoundProbability;
+
+public:
+    CLASS_PROTOTYPE(ProjectileGenerator_Projectile);
+
+    ProjectileGenerator_Projectile();
+
+    void SetPreImpactSoundProbability(Event *ev);
+    void SetPreImpactSoundTime(Event *ev);
+    void SetPreImpactSound(Event *ev);
+    void PlayPreImpactSound(Event *ev);
+    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;
+};
+
+class ProjectileGenerator_Gun : public ProjectileGenerator
+{
+private:
+    float    m_fBulletRange;
+    float    m_fBulletDamage;
+    int      m_iBulletCount;
+    Vector   m_vBulletSpread;
+    int      m_iTracerFrequency;
+    int      m_iBulletLarge;
+    qboolean m_bFakeBullets;
+    int      m_iMeansOfDeath;
+    float    m_fBulletThroughWood;
+    float    m_fBulletThroughMetal;
+    float    m_iBulletKnockback;
+    int      m_iAttackCount;
+    float    m_fFireDelay;
+    float    m_fTracerSpeed;
+
+public:
+    CLASS_PROTOTYPE(ProjectileGenerator_Gun);
+
+    ProjectileGenerator_Gun();
+
+    void SetFireDelay(Event *ev);
+    void SetMeansOfDeath(Event *ev);
+    void SetBulletThroughWood(Event *ev);
+    void SetBulletThroughMetal(Event *ev);
+    void SetBulletKnockback(Event *ev);
+    void SetTracerSpeed(Event *ev);
+    void SetBulletLarge(Event *ev);
+    void SetFakeBullets(Event *ev);
+    void SetBulletCount(Event *ev);
+    void SetBulletDamage(Event *ev);
+    void SetTracerFrequency(Event *ev);
+    void SetBulletSpread(Event *ev);
+    void SetBulletRange(Event *ev);
+
+    bool Attack(int count) override;
+    bool TickWeaponAnim();
+    void TickCycle(Event *ev) override;
+    void Archive(Archiver& arc) override;
+};
+
+class ProjectileGenerator_Heavy : public ProjectileGenerator
+{
+private:
+    str m_sProjectileModel;
+
+public:
+    CLASS_PROTOTYPE(ProjectileGenerator_Heavy);
+
+    ProjectileGenerator_Heavy();
+
+    void SetProjectileModel(Event *ev);
+
+    bool Attack(int count) override;
+    void Archive(Archiver& arc) override;
+};
+
+class ThrobbingBox_Explosive : public Animate
+{
+protected:
+    str               m_sUsedModel;
+    str               m_sSound;
+    bool              m_bUsed;
+    float             m_fExplosionDamage;
+    float             m_fRadius;
+    float             m_fStopwatchDuration;
+    str               m_sActivateSound;
+    str               m_sTickSound;
+    str               m_sDestroyedModel;
+    ScriptThreadLabel m_thread;
+    ScriptThreadLabel m_useThread;
+    str               m_sEffect;
+    Vector            m_vOffset;
+
+public:
+    CLASS_PROTOTYPE(ThrobbingBox_Explosive);
+
+    ThrobbingBox_Explosive();
+
+    bool ShouldDoExplosion();
+
+    void SetExplosionOffset(Event *ev);
+    void SetExplosionEffect(Event *ev);
+    void SetTriggered(Event *ev);
+    void DoExplosion(Event *ev);
+    void SetUseThread(Event *ev);
+    void SetThread(Event *ev);
+    void SetStopWatchDuration(Event *ev);
+    void SetRadius(Event *ev);
+    void SetDamage(Event *ev);
+    void TickSound(Event *ev);
+    void ActivateSound(Event *ev);
+    void ExplosionSound(Event *ev);
+    void UsedModel(Event *ev);
+    void SetDestroyModel(Event *ev);
+    void OnBlowUp(Event *ev);
+    void OnUse(Event *ev);
+
+    void Archive(Archiver& arc) override;
+};
+
+class ThrobbingBox_ExplodePlayerFlak88 : public ThrobbingBox_Explosive
+{
+public:
+    CLASS_PROTOTYPE(ThrobbingBox_ExplodePlayerFlak88);
+};
+
+class ThrobbingBox_ExplodeFlak88 : public ThrobbingBox_Explosive
+{
+public:
+    CLASS_PROTOTYPE(ThrobbingBox_ExplodeFlak88);
+};
+
+class ThrobbingBox_ExplodeNebelwerfer : public ThrobbingBox_Explosive
+{
+public:
+    CLASS_PROTOTYPE(ThrobbingBox_ExplodeNebelwerfer);
+};
+
+class ThrobbingBox_ExplodePlayerNebelwerfer : public ThrobbingBox_Explosive
+{
+public:
+    CLASS_PROTOTYPE(ThrobbingBox_ExplodePlayerNebelwerfer);
+};
+
+#define TBE_SPAWNFLAG_DESTROYED_MODEL 1
+#define TBE_SPAWNFLAG_MAKE_WET        2
+
+class ThrobbingBox_Stickybomb : public ThrobbingBox_Explosive
+{
+private:
+    float m_fStopwatchStartTime;
+
+public:
+    CLASS_PROTOTYPE(ThrobbingBox_Stickybomb);
+
+    void OnStickyBombWet(Event *ev);
+    void OnStickyBombUse(Event *ev);
+
+    void Archive(Archiver& arc) override;
+};
+
+#define OBJECTIVE_SPAWNFLAG_TURN_ON 1
+
+class Objective : public Entity
+{
+private:
+    str m_sText;
+    int m_iObjectiveIndex;
+
+public:
+    CLASS_PROTOTYPE(Objective);
+
+    Objective();
+
+    void   Archive(Archiver  &arc) override;
+    void   TurnOn(Event *ev);
+    void   TurnOff(Event *ev);
+    void   Complete(Event *ev);
+    void   SetCurrent(Event *ev);
+    Vector GetOrigin() const;
+    void   SetObjectiveNbr(Event *ev);
+    void   SetText(Event *ev);
+    int    GetObjectiveIndex() const;
+};
+
+class FencePost : public Entity
+{
+public:
+    CLASS_PROTOTYPE(FencePost);
+};
+
+class AISpawnPoint : public SimpleArchivedEntity
+{
+private:
+    str   m_sModel;
+    int   m_iHealth;
+    str   m_sEnemyName;
+    float m_iAccuracy;
+    int   m_iAmmoGrenade;
+    float m_iBalconyHeight;
+    int   m_iDisguiseLevel;
+    float m_fDisguisePeriod;
+    float m_fDisguiseRange;
+    float m_fEnemyShareRange;
+    float m_fFixedLeash;
+    float m_fGrenadeAwareness;
+    str   m_sGun;
+    float m_fMaxNoticeTimeScale;
+    float m_fSoundAwareness;
+    str   m_sTypeAttack;
+    str   m_sTypeDisguise;
+    str   m_sTypeGrenade;
+    str   m_sTypeIdle;
+    bool  m_bPatrolWaitTrigger;
+    float m_fHearing;
+    float m_fSight;
+    float m_fFov;
+    float m_fLeash;
+    float m_fMinDist;
+    float m_fMaxDist;
+    float m_fInterval;
+    bool  m_bDontDropWeapons;
+    bool  m_bDontDropHealth;
+    str   m_sFavoriteEnemy;
+    bool  m_bNoSurprise;
+    str   m_sPatrolPath;
+    str   m_sTurret;
+    str   m_sAlarmNode;
+    str   m_sWeapon;
+    str   m_sTarget;
+    str   m_sVoiceType;
+    bool  m_bForceDropWeapon;
+    bool  m_bForceDropHealth;
+
+public:
+    CLASS_PROTOTYPE(AISpawnPoint);
+
+    AISpawnPoint();
+
+    void GetForceDropHealth(Event *ev);
+    void SetForceDropHealth(Event *ev);
+    void GetForceDropWeapon(Event *ev);
+    void SetForceDropWeapon(Event *ev);
+    void GetVoiceType(Event *ev);
+    void SetVoiceType(Event *ev);
+    void GetTarget(Event *ev);
+    void SetTarget(Event *ev);
+    void GetWeapon(Event *ev);
+    void SetWeapon(Event *ev);
+    void GetAlarmNode(Event *ev);
+    void SetAlarmNode(Event *ev);
+    void GetTurret(Event *ev);
+    void SetTurret(Event *ev);
+    void GetPatrolPath(Event *ev);
+    void SetPatrolPath(Event *ev);
+    void GetNoSurprise(Event *ev);
+    void SetNoSurprise(Event *ev);
+    void SetFavoriteEnemy(Event *ev);
+    void GetFavoriteEnemy(Event *ev);
+    void GetDontDropHealth(Event *ev);
+    void SetDontDropHealth(Event *ev);
+    void GetDontDropWeapons(Event *ev);
+    void SetDontDropWeapons(Event *ev);
+    void GetInterval(Event *ev);
+    void SetInterval(Event *ev);
+    void GetMaxDistance(Event *ev);
+    void SetMaxDistance(Event *ev);
+    void GetMinDistance(Event *ev);
+    void SetMinDistance(Event *ev);
+    void GetLeash(Event *ev);
+    void SetLeash(Event *ev);
+    void GetFov(Event *ev);
+    void SetFov(Event *ev);
+    void SetSight(Event *ev);
+    void GetSight(Event *ev);
+    void GetHearing(Event *ev);
+    void SetHearing(Event *ev);
+    void GetPatrolWaitTrigger(Event *ev);
+    void SetPatrolWaitTrigger(Event *ev);
+    void GetTypeIdle(Event *ev);
+    void SetTypeIdle(Event *ev);
+    void GetTypeGrenade(Event *ev);
+    void SetTypeGrenade(Event *ev);
+    void GetTypeDisguise(Event *ev);
+    void SetTypeDisguise(Event *ev);
+    void GetTypeAttack(Event *ev);
+    void SetTypeAttack(Event *ev);
+    void SetSoundAwareness(Event *ev);
+    void GetSoundAwareness(Event *ev);
+    void SetMaxNoticeTimeScale(Event *ev);
+    void GetMaxNoticeTimeScale(Event *ev);
+    void GetGun(Event *ev);
+    void SetGun(Event *ev);
+    void GetGrenadeAwareness(Event *ev);
+    void SetGrenadeAwareness(Event *ev);
+    void SetFixedLeash(Event *ev);
+    void GetFixedLeash(Event *ev);
+    void GetEnemyShareRange(Event *ev);
+    void SetEnemyShareRange(Event *ev);
+    void GetDisguiseRange(Event *ev);
+    void SetDisguiseRange(Event *ev);
+    void GetDisguisePeriod(Event *ev);
+    void SetDisguisePeriod(Event *ev);
+    void GetDisguiseLevel(Event *ev);
+    void SetDisguiseLevel(Event *ev);
+    void GetBalconyHeight(Event *ev);
+    void SetBalconyHeight(Event *ev);
+    void GetAmmoGrenade(Event *ev);
+    void SetAmmoGrenade(Event *ev);
+    void GetAccuracy(Event *ev);
+    void SetAccuracy(Event *ev);
+    void GetEnemyName(Event *ev);
+    void SetEnemyName(Event *ev);
+    void GetHealth(Event *ev);
+    void SetHealth(Event *ev);
+    void GetModel(Event *ev);
+    void SetModel(Event *ev);
+
+    void Archive(Archiver& arc) override;
+};

code/fgame/Tow_Entities.cpp

@@ -0,0 +1,359 @@
+/*
+===========================================================================
+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 "Tow_Entities.h"
+#include "player.h"
+#include "scriptthread.h"
+
+TOWObjectiveMan g_TOWObjectiveMan;
+
+TOWObjectiveMan::TOWObjectiveMan()
+{
+    Reset();
+}
+
+void TOWObjectiveMan::Reset()
+{
+    m_towObjectives.ClearObjectList();
+    m_iNumAxisObjectives   = 0;
+    m_iNumAlliesObjectives = 0;
+}
+
+void TOWObjectiveMan::AddObjective(TOWObjective *objective)
+{
+    if (!objective) {
+        return;
+    }
+
+    switch (objective->GetController()) {
+    case CONTROLLER_ALLIES:
+        m_iNumAlliesObjectives++;
+        break;
+    case CONTROLLER_AXIS:
+        m_iNumAxisObjectives++;
+        break;
+    }
+
+    m_towObjectives.AddObject(objective);
+}
+
+void TOWObjectiveMan::TakeOverObjective(eController controller, eController controllingTeam)
+{
+    int i;
+
+    if (controllingTeam == CONTROLLER_DRAW) {
+        return;
+    }
+
+    switch (controllingTeam) {
+    case CONTROLLER_ALLIES:
+        m_iNumAlliesObjectives++;
+        if (m_iNumAxisObjectives) {
+            m_iNumAxisObjectives--;
+        }
+        dmManager.CheckEndMatch();
+        break;
+    case CONTROLLER_AXIS:
+        m_iNumAxisObjectives++;
+        if (m_iNumAlliesObjectives) {
+            m_iNumAlliesObjectives--;
+        }
+        dmManager.CheckEndMatch();
+        break;
+    default:
+        break;
+    }
+
+    for (i = 0; i < game.maxclients; i++) {
+        gentity_t *ent = &g_entities[i];
+        Player    *player;
+        bool       bSameTeam;
+
+        if (!ent->inuse || !ent->entity) {
+            continue;
+        }
+
+        player = static_cast<Player *>(ent->entity);
+
+        switch (controllingTeam) {
+        case CONTROLLER_ALLIES:
+            bSameTeam = player->GetTeam() == TEAM_ALLIES;
+            break;
+        case CONTROLLER_AXIS:
+            bSameTeam = player->GetTeam() == TEAM_AXIS;
+            break;
+        default:
+            break;
+        }
+
+        // play a different sound for the losing team
+        if (bSameTeam) {
+            player->PlayInstantMessageSound("success");
+        } else {
+            player->PlayInstantMessageSound("failure");
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------
+/*QUAKED func_TOWObjective (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) StartOn Respawner
+
+  This object is an extension of the standard objective object.  It is used for Tug of War
+  Maps.
+
+  object used to simplify placing objectives.  You may optionally connect this object to the
+  target you want to use for the compass position....
+
+  Checkboxes:
+	StartOn - check this if you want this objective to be displayed when the level first loads
+
+	Respawner - check this if the objective is the respawn point for a team.  If you set this
+	you must set ControlledBy to a valid team and not Neutral.
+
+
+  Parameters:
+  ControlledBy			0 = Axis, 1 = Allies, 2 = Neutral
+  AxisObjNum			1 - 5.  Set the objective number for the axis.  This will associate the objective with
+						the check box for the corresponding text in the score screen.
+  AlliesObjNum			1 - 5.  Set the objective number for the allies.  This will associate the objective with
+						the check box for the corresponding text in the score screen.
+
+  ObjectiveNbr			<nObjNbr=0>	Please ignore this for now.
+
+  Events:
+	TurnOn
+	TurnOff
+	Complete
+	Text <sNewText>
+	SetCurrent
+	SetController <ControlledBy> - This will set the starting controller default is neutral.  See ControlledBy var above.
+
+//---------------------------------------------------------------------------------------------
+*/
+
+Event EV_SetController
+(
+    "ControlledBy",
+    EV_DEFAULT,
+    "i",
+    "ControlledBy",
+    "Sets the team controlling the objective",
+    EV_NORMAL
+);
+Event EV_TakeOver
+(
+    "TakeOver",
+    EV_DEFAULT,
+    "i",
+    "TeamNum",
+    "Sets the team controlling the objective. 0 = Axis, 1 = Allies",
+    EV_NORMAL
+);
+Event EV_SetAxisObjNum
+(
+    "AxisObjNum",
+    EV_DEFAULT,
+    "i",
+    "AxisObjNum",
+    "Sets the objective number for the axis team",
+    EV_NORMAL
+);
+Event EV_SetAlliesObjNum
+(
+    "AlliesObjNum",
+    EV_DEFAULT,
+    "i",
+    "AlliesObjNum",
+    "Sets the objective number for the allies team",
+    EV_NORMAL
+);
+static Event EV_Initialize
+(
+    "initialize",
+    EV_DEFAULT,
+    0,
+    0,
+    "Initialize object",
+    EV_NORMAL
+);
+static Event EV_SetCurrent
+(
+    "SetCurrent",
+    EV_DEFAULT,
+    "i",
+    "TeamNum",
+    "Set this objective as the current objective for the specified team.",
+    EV_NORMAL
+);
+Event EV_GetController
+(
+    "ControlledBy",
+    EV_DEFAULT,
+    0,
+    0,
+    "Objective controller",
+    EV_GETTER
+);
+
+CLASS_DECLARATION(Objective, TOWObjective, "func_towobjective") {
+    {&EV_SetController,   &TOWObjective::SetController  },
+    {&EV_TakeOver,        &TOWObjective::TakeOver       },
+    {&EV_SetAxisObjNum,   &TOWObjective::SetAxisObjNum  },
+    {&EV_SetAlliesObjNum, &TOWObjective::SetAlliesObjNum},
+    {&EV_Initialize,      &TOWObjective::OnInitialize   },
+    {&EV_SetCurrent,      &TOWObjective::SetCurrent     },
+    {&EV_GetController,   &TOWObjective::GetController  },
+    {NULL,                NULL                          }
+};
+
+TOWObjective::TOWObjective()
+{
+    m_eController          = CONTROLLER_DRAW;
+    m_eLeadingController   = CONTROLLER_DRAW;
+    m_bNoRespawnForLeading = false;
+    m_iAxisObjNum          = 1;
+    m_iAlliesObjNum        = 1;
+    m_sAxisObjName         = "default";
+    m_sAlliesObjName       = "default";
+
+    if (spawnflags & TOWOBJECTIVE_SPAWNFLAG_NO_RESPAWN) {
+        m_bNoRespawnForLeading = true;
+    }
+
+    PostEvent(EV_Initialize, 0.001f);
+}
+
+void TOWObjective::SetController(Event *ev)
+{
+    m_eController = static_cast<eController>(ev->GetInteger(1));
+
+    if (m_bNoRespawnForLeading) {
+        m_eLeadingController = m_eController;
+    }
+
+    if (m_eController != CONTROLLER_ALLIES && m_eController != CONTROLLER_AXIS) {
+        m_eController = CONTROLLER_DRAW;
+    }
+}
+
+void TOWObjective::GetController(Event *ev)
+{
+    ev->AddInteger(m_eController);
+}
+
+void TOWObjective::TakeOver(Event *ev)
+{
+    eController controller = static_cast<eController>(ev->GetInteger(1));
+    if (controller == m_eController || controller == CONTROLLER_DRAW) {
+        return;
+    }
+
+    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;
+    default:
+        break;
+    }
+
+    g_TOWObjectiveMan.TakeOverObjective(m_eController, controller);
+    m_eController = controller;
+
+    if (m_bNoRespawnForLeading) {
+        //
+        // Disable team respawn for the leading team
+        //
+        dmManager.StopTeamRespawn(m_eLeadingController);
+    }
+}
+
+void TOWObjective::SetAlliesObjNum(Event *ev)
+{
+    m_iAlliesObjNum = ev->GetInteger(1);
+}
+
+void TOWObjective::SetAxisObjNum(Event *ev)
+{
+    m_iAxisObjNum = ev->GetInteger(1);
+}
+
+void TOWObjective::OnInitialize(Event *ev)
+{
+    m_sAlliesObjName = "tow_allied_obj" + str(m_iAlliesObjNum);
+    m_sAxisObjName   = "tow_axis_obj" + str(m_iAxisObjNum);
+
+    switch (m_eController) {
+    case CONTROLLER_ALLIES:
+        gi.cvar_set(m_sAxisObjName.c_str(), "1");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
+    case CONTROLLER_AXIS:
+        gi.cvar_set(m_sAxisObjName.c_str(), "0");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "1");
+        break;
+    case CONTROLLER_DRAW:
+        gi.cvar_set(m_sAxisObjName.c_str(), "0");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
+    }
+
+    if (!LoadingSavegame) {
+        g_TOWObjectiveMan.AddObjective(this);
+    }
+}
+
+void TOWObjective::SetCurrent(Event *ev)
+{
+    eController controller = static_cast<eController>(ev->GetInteger(1));
+    switch (controller) {
+    case CONTROLLER_ALLIES:
+        ScriptThread::SetCurrentObjective(GetObjectiveIndex(), TEAM_ALLIES);
+        break;
+    case CONTROLLER_AXIS:
+        ScriptThread::SetCurrentObjective(GetObjectiveIndex(), TEAM_AXIS);
+        break;
+    default:
+        SetCurrent(ev);
+        break;
+    }
+}
+
+int TOWObjective::GetController() const
+{
+    return m_eController;
+}
+
+void TOWObjective::Archive(Archiver& arc)
+{
+    arc.ArchiveInteger(&m_iAxisObjNum);
+    arc.ArchiveInteger(&m_iAlliesObjNum);
+    ArchiveEnum(m_eController, eController);
+    ArchiveEnum(m_eLeadingController, eController);
+    arc.ArchiveBool(&m_bNoRespawnForLeading);
+    arc.ArchiveString(&m_sAxisObjName);
+    arc.ArchiveString(&m_sAlliesObjName);
+}

code/fgame/Tow_Entities.h

@@ -0,0 +1,73 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "Entities.h"
+
+#define TOWOBJECTIVE_SPAWNFLAG_NO_RESPAWN 2
+
+class TOWObjective : public Objective
+{
+private:
+    int         m_iAxisObjNum;
+    int         m_iAlliesObjNum;
+    eController m_eController;
+    eController m_eLeadingController;
+    bool        m_bNoRespawnForLeading;
+    str         m_sAxisObjName;
+    str         m_sAlliesObjName;
+
+public:
+    CLASS_PROTOTYPE(TOWObjective);
+
+    TOWObjective();
+
+    void SetController(Event *ev);
+    void GetController(Event *ev);
+    void TakeOver(Event *ev);
+    void SetAlliesObjNum(Event *ev);
+    void SetAxisObjNum(Event *ev);
+    void OnInitialize(Event *ev);
+    void SetCurrent(Event *ev);
+
+    int GetController() const;
+
+    void Archive(Archiver& arc) override;
+};
+
+class TOWObjectiveMan
+{
+private:
+    Container<TOWObjective *> m_towObjectives;
+    int                       m_iNumAxisObjectives;
+    int                       m_iNumAlliesObjectives;
+
+public:
+    TOWObjectiveMan();
+
+    void Reset();
+    void AddObjective(TOWObjective *objective);
+    void TakeOverObjective(eController controller, eController controllingTeam);
+};
+
+extern TOWObjectiveMan g_TOWObjectiveMan;

code/fgame/VehicleCollisionEntity.cpp

@@ -34,7 +34,6 @@ VehicleCollisionEntity::VehicleCollisionEntity
 	(
 	Entity *ent
 	)
-
 {
 	if( LoadingSavegame )
 	{
@@ -46,12 +45,11 @@ VehicleCollisionEntity::VehicleCollisionEntity
 	m_pOwner = ent;
 	takedamage = DAMAGE_YES;
 
-	edict->s.renderfx &= ~RF_DONTDRAW;
-	edict->r.svFlags &= ~SVF_NOCLIENT;
-
+	showModel();
 	setMoveType( MOVETYPE_PUSH );
+	setSolidType(SOLID_NOT);
 
-	edict->clipmask |= MASK_CLIP;
+	edict->clipmask |= MASK_VEHICLE;
 	edict->s.eFlags |= EF_LINKANGLES;
 }
 
@@ -59,7 +57,6 @@ VehicleCollisionEntity::VehicleCollisionEntity
 	(
 	void
 	)
-
 {
 	if( LoadingSavegame )
 	{
@@ -73,18 +70,14 @@ void VehicleCollisionEntity::EventDamage
 	(
 	Event *ev
 	)
-
 {
-	Event *event = new Event( ev );
-
-	m_pOwner->ProcessEvent( event );
+	m_pOwner->ProcessEvent(*ev);
 }
 
 void VehicleCollisionEntity::Solid
 	(
 	void
 	)
-
 {
 	setContents( CONTENTS_SOLID );
 	setSolidType( SOLID_BSP );
@@ -94,7 +87,6 @@ void VehicleCollisionEntity::NotSolid
 	(
 	void
 	)
-
 {
 	setSolidType( SOLID_NOT );
 }

code/fgame/VehicleCollisionEntity.h

@@ -51,7 +51,6 @@ void VehicleCollisionEntity::Archive
 	(
 	Archiver& arc
 	)
-
 {
 	Entity::Archive( arc );
 

code/fgame/VehicleSlot.cpp

@@ -28,135 +28,159 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 cVehicleSlot::cVehicleSlot()
 {
-	prev_takedamage = ( damage_t )-1;
-	prev_solid = ( solid_t )-1;
-	prev_contents = -1;
+    prev_takedamage = (damage_t)-1;
+    prev_solid      = (solid_t)-1;
+    prev_contents   = -1;
 }
 
-void cVehicleSlot::NotSolid
-	(
-	void
-	)
-
+void cVehicleSlot::NotSolid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & SLOT_BUSY)) {
+        return;
+    }
 
-	// Save previous values
-	prev_takedamage = ent->takedamage;
-	prev_solid = ent->edict->solid;
-	prev_contents = ent->edict->r.contents;
-	
-	ent->takedamage = DAMAGE_NO;
-	ent->setSolidType( SOLID_NOT );
+    if (!ent) {
+        return;
+    }
+
+    // Save previous values
+    prev_takedamage = ent->takedamage;
+    prev_solid      = ent->edict->solid;
+    prev_contents   = ent->edict->r.contents;
+
+    ent->takedamage = DAMAGE_NO;
+    ent->setSolidType(SOLID_NOT);
+
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        if (sub && !sub->IsSubclassOfWeapon()) {
+            sub->setSolidType(SOLID_NOT);
+        }
+    }
+
+    if (!ent->IsSubclassOfPlayer()) {
+        ent->setSolidType(SOLID_NOT);
+    }
 }
 
-void cVehicleSlot::Solid
-	(
-	void
-	)
-
+void cVehicleSlot::Solid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & FL_SWIM)) {
+        return;
+    }
 
-	// Restore previous values
-	ent->takedamage = prev_takedamage;
-	ent->setSolidType( prev_solid );
-	ent->edict->r.contents = prev_contents;
+    if (!ent) {
+        return;
+    }
 
-	// Save previous values
-	prev_takedamage = ( damage_t )-1;
-	prev_solid = ( solid_t )-1;
-	prev_contents = -1;
+    // Restore previous values
+    ent->takedamage = prev_takedamage;
+    ent->setSolidType(prev_solid);
+    ent->setContents(prev_contents);
+
+    // Save previous values
+    prev_takedamage = (damage_t)-1;
+    prev_solid      = (solid_t)-1;
+    prev_contents   = -1;
+
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        if (sub && !sub->IsSubclassOfWeapon()) {
+            sub->setSolidType(SOLID_BBOX);
+        }
+    }
 }
 
 cTurretSlot::cTurretSlot()
 {
-	owner_prev_takedamage = ( damage_t )-1;
-	owner_prev_solid = ( solid_t )-1;
-	owner_prev_contents = -1;
+    owner_prev_takedamage = (damage_t)-1;
+    owner_prev_solid      = (solid_t)-1;
+    owner_prev_contents   = -1;
 }
 
-void cTurretSlot::NotSolid
-	(
-	void
-	)
-
+void cTurretSlot::NotSolid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & FL_SWIM)) {
+        return;
+    }
 
-	cVehicleSlot::NotSolid();
+    if (!ent) {
+        return;
+    }
 
-	if( ent->IsSubclassOfTurretGun() )
-	{
-		TurretGun *turret = ( TurretGun * )ent.Pointer();
-		Entity *owner = turret->GetOwner();
+    // Save previous values
+    prev_takedamage = ent->takedamage;
+    prev_solid      = ent->edict->solid;
+    prev_contents   = ent->edict->r.contents;
 
-		if( owner )
-		{
-			owner_prev_takedamage = owner->takedamage;
-			owner_prev_solid = owner->edict->solid;
-			owner_prev_contents = owner->edict->r.contents;
+    ent->takedamage = DAMAGE_NO;
+    ent->setSolidType(SOLID_NOT);
 
-			owner->takedamage = DAMAGE_NO;
-			owner->setSolidType( SOLID_NOT );
-		}
-	}
+    if (ent->IsSubclassOfTurretGun()) {
+        TurretGun *turret = static_cast<TurretGun *>(ent.Pointer());
+        Entity    *owner  = turret->GetOwner();
+
+        if (owner) {
+            owner_prev_takedamage = owner->takedamage;
+            owner_prev_solid      = owner->edict->solid;
+            owner_prev_contents   = owner->edict->r.contents;
+
+            owner->takedamage = DAMAGE_NO;
+            owner->setSolidType(SOLID_NOT);
+        }
+    }
+
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        if (sub && !sub->IsSubclassOfWeapon()) {
+            sub->setSolidType(SOLID_NOT);
+        }
+    }
 }
 
-void cTurretSlot::Solid
-	(
-	void
-	)
-
+void cTurretSlot::Solid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & FL_SWIM)) {
+        return;
+    }
 
-	cVehicleSlot::NotSolid();
+    if (!ent) {
+        return;
+    }
 
-	if( ent->IsSubclassOfTurretGun() )
-	{
-		TurretGun *turret = ( TurretGun * )ent.Pointer();
-		Entity *owner = turret->GetOwner();
+    // Restore previous values
+    ent->takedamage = prev_takedamage;
+    ent->setSolidType(prev_solid);
 
-		if( owner )
-		{
-			owner->takedamage = owner_prev_takedamage;
-			owner->setSolidType( owner_prev_solid );
+    // Save previous values
+    prev_takedamage = (damage_t)-1;
+    prev_solid      = (solid_t)-1;
 
-			owner_prev_takedamage = ( damage_t )-1;
-			owner_prev_solid = ( solid_t )-1;
-		}
-	}
+    if (ent->IsSubclassOfTurretGun()) {
+        TurretGun *turret = static_cast<TurretGun *>(ent.Pointer());
+        Entity    *owner  = turret->GetOwner();
+
+        if (owner) {
+            owner->takedamage = owner_prev_takedamage;
+            owner->setSolidType(owner_prev_solid);
+
+            owner_prev_takedamage = (damage_t)-1;
+            owner_prev_solid      = (solid_t)-1;
+        }
+    }
+
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        if (sub && !sub->IsSubclassOfWeapon()) {
+            sub->setSolidType(SOLID_BBOX);
+        }
+    }
 }

code/fgame/VehicleSlot.h

@@ -23,80 +23,69 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // VehicleSlot.h
 //
 
-#ifndef __VEHICLESLOT_H__
-#define __VEHICLESLOT_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
 #include "entity.h"
 
-#define SLOT_FREE		1
-#define SLOT_BUSY		2
-#define SLOT_UNUSED		4
+#define SLOT_FREE   1
+#define SLOT_BUSY   2
+#define SLOT_UNUSED 4
 
-class cVehicleSlot : public Class {
+class cVehicleSlot : public Class
+{
 public:
-	SafePtr<Entity> ent;
-	int flags;
-	int boneindex;
-	int enter_boneindex;
+    SafePtr<Entity> ent;
+    int             flags;
+    int             boneindex;
+    int             enter_boneindex;
 
-private:
-	damage_t prev_takedamage;
-	solid_t prev_solid;
-	int prev_contents;
+protected:
+    damage_t prev_takedamage;
+    solid_t  prev_solid;
+    int      prev_contents;
 
 public:
-	cVehicleSlot();
+    cVehicleSlot();
 
-	virtual void NotSolid( void );
-	virtual void Solid( void );
-	void Archive( Archiver& arc ) override;
+    virtual void NotSolid(void);
+    virtual void Solid(void);
+    void         Archive(Archiver        &arc) override;
 };
 
-inline
-void cVehicleSlot::Archive
-	(
-	Archiver& arc
-	)
-
+inline void cVehicleSlot::Archive(Archiver& arc)
 {
-	Class::Archive( arc );
+    Class::Archive(arc);
 
-	arc.ArchiveSafePointer( &ent );
-	arc.ArchiveInteger( &flags );
-	arc.ArchiveInteger( &boneindex );
-	arc.ArchiveInteger( &enter_boneindex );
-	ArchiveEnum( prev_takedamage, damage_t );
-	ArchiveEnum( prev_solid, solid_t );
-	arc.ArchiveInteger( &prev_contents );
+    arc.ArchiveSafePointer(&ent);
+    arc.ArchiveInteger(&flags);
+    arc.ArchiveInteger(&boneindex);
+    arc.ArchiveInteger(&enter_boneindex);
+    ArchiveEnum(prev_takedamage, damage_t);
+    ArchiveEnum(prev_solid, solid_t);
+    arc.ArchiveInteger(&prev_contents);
 }
 
-class cTurretSlot : public cVehicleSlot {
-	damage_t owner_prev_takedamage;
-	solid_t owner_prev_solid;
-	int owner_prev_contents;
+class cTurretSlot : public cVehicleSlot
+{
+    damage_t owner_prev_takedamage;
+    solid_t  owner_prev_solid;
+    int      owner_prev_contents;
 
 public:
-	cTurretSlot();
+    cTurretSlot();
 
-	void NotSolid( void ) override;
-	void Solid( void ) override;
-	void Archive( Archiver& arc ) override;
+    void NotSolid(void) override;
+    void Solid(void) override;
+    void Archive(Archiver& arc) override;
 };
 
-inline
-void cTurretSlot::Archive
-	(
-	Archiver& arc
-	)
-
+inline void cTurretSlot::Archive(Archiver& arc)
 {
-	cVehicleSlot::Archive( arc );
+    cVehicleSlot::Archive(arc);
 
-	ArchiveEnum( owner_prev_takedamage, damage_t );
-	ArchiveEnum( owner_prev_solid, solid_t );
-	arc.ArchiveInteger( &owner_prev_contents );
+    ArchiveEnum(owner_prev_takedamage, damage_t);
+    ArchiveEnum(owner_prev_solid, solid_t);
+    arc.ArchiveInteger(&owner_prev_contents);
 }
-
-#endif // __VEHICLESLOT_H__

code/fgame/VehicleSoundEntity.cpp

@@ -73,7 +73,6 @@ void VehicleSoundEntity::Start
 	(
 	void
 	)
-
 {
 	m_bDoSoundStuff = true;
 }
@@ -82,7 +81,6 @@ void VehicleSoundEntity::Stop
 	(
 	void
 	)
-
 {
 	m_bDoSoundStuff = false;
 }
@@ -91,7 +89,6 @@ void VehicleSoundEntity::Think
 	(
 	void
 	)
-
 {
 	DoSoundStuff();
 }
@@ -142,7 +139,6 @@ void VehicleSoundEntity::DoSoundStuff
 	(
 	void
 	)
-
 {
 	float pitch;
 

code/fgame/VehicleSoundEntity.h

@@ -56,7 +56,6 @@ void VehicleSoundEntity::Archive
 	(
 	Archiver& arc
 	)
-
 {
 	Entity::Archive( arc );
 

code/fgame/VehicleTank.cpp

@@ -23,127 +23,547 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "vehicle.h"
 #include "vehicleturret.h"
 #include "player.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleTank, "VehicleTank")
-{
-	{ &EV_Damage, &VehicleTank::EventDamage },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleTank, "VehicleTank") {
+    {&EV_Damage, &VehicleTank::EventDamage},
+    {NULL,       NULL                     }
 };
 
 VehicleTank::VehicleTank()
 {
-	entflags |= FL_ROTATEDBOUNDS;
+    entflags |= FL_ROTATEDBOUNDS;
 }
 
 VehicleTank::~VehicleTank()
 {
-	entflags &= ~FL_ROTATEDBOUNDS;
+    entflags &= ~FL_ROTATEDBOUNDS;
 }
 
 qboolean VehicleTank::Drive(usercmd_t *ucmd)
 {
-	Vector i;
-	Vector j;
-	Vector k;
-	Vector vTmp;
+    Vector i;
+    Vector j;
+    Vector k;
+    Vector vTmp;
 
-	vTmp = velocity;
-	VectorNormalize(vTmp);
+    vTmp = velocity;
+    vTmp.normalize();
 
-	if (!driver.ent || !driver.ent->client)
-	{
-		return qfalse;
-	}
+    if (!driver.ent || !driver.ent->isClient()) {
+        return qfalse;
+    }
 
-	if (!drivable)
-	{
-		driver.ent->client->ps.pm_flags |= PMF_FROZEN;
-		ucmd->forwardmove = 0;
-		ucmd->rightmove = 0;
-		ucmd->upmove = 0;
-		return qfalse;
-	}
+    if (!drivable) {
+        driver.ent->client->ps.pm_flags |= PMF_FROZEN;
+        ucmd->forwardmove = 0;
+        ucmd->rightmove   = 0;
+        ucmd->upmove      = 0;
+        return qfalse;
+    }
 
-	moveimpulse = ucmd->forwardmove * (vTmp.length() + 1.0);
-	
-	m_bIsBraking = ucmd->forwardmove >> 31;
+    if (!m_bAutoPilot) {
+        //
+        // ignore client's control if the vehicle is in auto-pilot mode
+        //
+        moveimpulse = ucmd->forwardmove * (vTmp.length() + 1.0);
+        m_bIsBraking = ucmd->forwardmove < 0;
+        m_fAccelerator += ucmd->forwardmove * 0.005;
+        // acceleration must be an alpha value between [0, 1]
+        m_fAccelerator = Q_clamp_float(m_fAccelerator, 0, 1);
 
-	m_fAccelerator += ucmd->forwardmove * 0.005;
+        turnimpulse = -ucmd->rightmove;
+        jumpimpulse = ucmd->upmove;
+    }
 
-	if (m_fAccelerator < 0)
-	{
-		m_fAccelerator = 0.0;
-	}
+    VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
 
-	turnimpulse = -ucmd->rightmove;
+    if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient()) {
+        vtg->RemoteControl(ucmd, (Sentient *)driver.ent.Pointer());
 
-	VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
-
-	if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient())
-	{
-		vtg->RemoteControl(ucmd, (Sentient *)driver.ent.Pointer());
-
-		if (ucmd->upmove)
-			turnimpulse -= AngleSubtract(angles[1], vtg->angles[1]);
-	}
-	return qtrue;
+        if (ucmd->upmove) {
+            turnimpulse -= AngleSubtract(angles[1], vtg->angles[1]);
+        }
+    }
+    return qtrue;
 }
 
 void VehicleTank::EventDamage(Event *ev)
 {
-	int mod;
-	mod = ev->GetInteger(9);
+    int mod;
+    mod = ev->GetInteger(9);
 
-	if (mod > MOD_VEHICLE && mod != MOD_SHOTGUN && mod != MOD_GRENADE)
-	{
-		Vehicle::EventDamage(ev);
-		if (g_gametype->integer == GT_SINGLE_PLAYER)
-		{
-			Player *p = (Player *)driver.ent.Pointer();
-			if (p)
-			{
-				if (p->IsSubclassOfPlayer())
-				{
-					p->m_iNumHitsTaken++;
-				}
-			}
-		}
-	}
+    if (g_gametype->integer == GT_TOW && !dmManager.RoundActive()) {
+        return;
+    }
+
+    switch (mod) {
+    case MOD_BULLET:
+    case MOD_BASH:
+    case MOD_FAST_BULLET:
+    case MOD_VEHICLE:
+    case MOD_SHOTGUN:
+    case MOD_GRENADE:
+        return;
+    }
+
+    Vehicle::EventDamage(ev);
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        Player *p = (Player *)driver.ent.Pointer();
+        if (p) {
+            if (p->IsSubclassOfPlayer()) {
+                p->m_iNumHitsTaken++;
+            }
+        }
+    }
 }
 
 void VehicleTank::Think()
 {
-	flags |= FL_POSTTHINK;
+    flags |= FL_POSTTHINK;
 }
 
 void VehicleTank::Postthink()
 {
-	// FIXME: STUB
+    float        turn;
+    Vector       i, j, k;
+    Vector       normalsum;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v, *last;
+    float        drivespeed;
+    Vector       primal_angles, primal_origin;
+    Vector       vTmp;
+    Vector       vAddedAngles;
+    Vector       n_angles;
+    float        dot;
+    Vector       newvel, flatvel;
+    Vector       anglediff;
+
+    primal_angles = angles;
+    primal_origin = origin;
+
+    if (!g_vehicle->integer || edict->s.renderfx & RF_DONTDRAW) {
+        // don't process physics
+        return;
+    }
+
+    if (m_pCollisionEntity) {
+        // use the collision entity for collision
+        setSolidType(SOLID_NOT);
+        m_pCollisionEntity->Solid();
+    }
+
+    prev_velocity = velocity;
+    SetSlotsNonSolid();
+
+    if (m_bAnimMove) {
+        AnimMoveVehicle();
+    } else {
+        if (!m_bMovementLocked) {
+            FactorOutAnglesOffset();
+            FactorOutOriginOffset();
+        }
+
+        MoveVehicle();
+    }
+
+    SetSlotsSolid();
+
+    if (m_vOldMins != vec_zero && m_vOldMaxs != vec_zero) {
+        mins = m_vOldMins;
+        maxs = m_vOldMaxs;
+    } else if (mins != vec_zero && maxs != vec_zero) {
+        m_vOldMins = mins;
+        m_vOldMaxs = maxs;
+    }
+
+    if (m_bAnimMove) {
+        moveimpulse = velocity.length() * level.frametime;
+        turnimpulse = avelocity[1] * level.frametime;
+    } else if (m_bAutoPilot) {
+        AutoPilot();
+    }
+
+    currentspeed = moveimpulse;
+    turnangle    = turnangle * 0.25 + turnimpulse;
+    turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+    real_velocity     = origin - prev_origin;
+    prev_origin       = origin;
+    prev_acceleration = real_acceleration;
+    real_acceleration = real_velocity - prev_velocity;
+    prev_velocity     = real_velocity;
+    acceleration      = real_acceleration - prev_acceleration;
+
+    UpdateBones();
+    UpdateShaderOffset();
+    UpdateTires();
+    UpdateNormals();
+
+    temp = angles;
+    temp.AngleVectorsLeft(&i, &j, &k);
+
+    velocity[0] *= 0.925f;
+    velocity[1] *= 0.925f;
+    turn = turnangle / 200.0;
+
+    flatvel = orientation[0];
+    velocity += flatvel * currentspeed;
+    flatvel[2] = 0;
+
+    dot         = velocity * flatvel;
+    dot         = Q_clamp_float(dot, -speed, speed);
+    newvel      = flatvel * dot;
+    velocity[0] = newvel[0];
+    velocity[1] = newvel[1];
+    avelocity *= 0.05f;
+    if (dot < 350) {
+        dot = 350;
+    }
+
+    avelocity.y += turn * dot;
+    angles += avelocity * level.frametime;
+    setAngles(angles);
+
+    if (Turrets[0].ent && Turrets[0].ent->IsSubclassOfVehicleTurretGun() && driver.ent
+        && driver.ent->IsSubclassOfSentient()) {
+        VehicleTurretGun *pTurret = static_cast<VehicleTurretGun *>(Turrets[0].ent.Pointer());
+        if (jumpimpulse != 0) {
+            pTurret->SetUserViewAngles(pTurret->GetUserViewAngles() - Vector(0, avelocity[1] * level.frametime, 0));
+        }
+    }
+
+    drivespeed = acceleration * orientation[0];
+    UpdateSound();
+
+    if (AssertRotation(angles, primal_angles) != true) {
+        angles = primal_angles;
+    }
+
+    CalculateAnglesOffset(acceleration);
+    CalculateOriginOffset();
+
+    last_origin = origin;
+    anglediff   = (angles - primal_angles) * level.frametime;
+
+    if (anglediff.x > 180 || anglediff.x < -180) anglediff.x = 0;
+    if (anglediff.y > 180 || anglediff.y < -180) anglediff.y = 0;
+    if (anglediff.z > 180 || anglediff.z < -180) anglediff.z = 0;
+
+    if (anglediff.x > -1 || anglediff.x < 1) anglediff.x = 0;
+    if (anglediff.y > -1 || anglediff.y < 1) anglediff.y = 0;
+    if (anglediff.z > -1 || anglediff.z < 1) anglediff.z = 0;
+
+    avelocity = anglediff;
+
+    if (!m_bAnimMove && !m_bMovementLocked) {
+        FactorInOriginOffset();
+        FactorInAnglesOffset(&vAddedAngles);
+    }
+
+    CalculateAnimationData(vAddedAngles, m_vOriginOffset + m_vOriginOffset2);
+    if (m_pCollisionEntity) {
+        Vector vaDelta;
+
+        SetSlotsNonSolid();
+
+        vaDelta[0] = angledist(angles[0] - m_pCollisionEntity->angles[0]);
+        vaDelta[1] = angledist(angles[1] - m_pCollisionEntity->angles[1]);
+        vaDelta[2] = angledist(angles[2] - m_pCollisionEntity->angles[2]);
+
+        m_pCollisionEntity->Solid();
+
+        G_PushMove(m_pCollisionEntity, origin - primal_origin, vaDelta);
+        G_TouchTriggers(m_pCollisionEntity);
+
+        SetSlotsSolid();
+
+        m_pCollisionEntity->setOrigin(origin);
+        m_pCollisionEntity->setAngles(angles);
+    }
+
+    SetupVehicleSoundEntities();
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    //
+    // update slots
+    //
+    for (int ii = 0; ii < MAX_PASSENGERS; ii++) {
+        UpdatePassengerSlot(ii);
+    }
+
+    for (int ii = 0; ii < MAX_TURRETS; ii++) {
+        UpdateTurretSlot(ii);
+    }
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    if (m_pCollisionEntity) {
+        setSolidType(SOLID_NOT);
+        m_pCollisionEntity->Solid();
+    } else {
+        setSolidType(SOLID_BBOX);
+        setContents(CONTENTS_UNKNOWN2);
+    }
+
+    if ((driver.flags & SLOT_BUSY) && driver.ent) {
+        if (driver.ent->IsSubclassOfPlayer()) {
+            driver.ent->takedamage = DAMAGE_YES;
+            // Fixed in OPM.
+            //  It's probably a mistake in moh 2.0 and above,
+            //  the tank was non-solid with a player driver,
+            //  instead of the driver being non-solid.
+            //setSolidType(SOLID_NOT);
+            driver.ent->setSolidType(SOLID_NOT);
+        } else {
+            driver.ent->takedamage = DAMAGE_NO;
+            driver.ent->setSolidType(SOLID_NOT);
+        }
+    }
 }
 
 void VehicleTank::CalculateOriginOffset()
 {
-	// FIXME: STUB
+    int    index;
+    Vector vTireAvg;
+    Vector vMissHit;
+    Vector temp;
+    int    iNum = 0;
+    Vector acceleration;
+    Vector oldoffset;
+
+    oldoffset = m_vOriginOffset;
+    m_vOriginOffset += m_vOriginOffset2;
+    m_vOriginOffset2 = vec_zero;
+
+    for (index = 0; index < NUM_VEHICLE_TIRES; index++) {
+        if (m_bTireHit[index]) {
+            vTireAvg += origin - m_vTireEnd[index];
+            iNum++;
+        } else {
+            vMissHit = Corners[index];
+        }
+    }
+
+    if (m_iNumNormals > 0 && iNum == NUM_VEHICLE_TIRES - 1) {
+        Vector point;
+
+        temp = m_vNormalSum * (1.f / m_iNumNormals);
+        temp.normalize();
+        ProjectPointOnPlane(point, vMissHit, temp);
+        vTireAvg += point;
+
+        iNum++;
+    }
+
+    if (iNum == NUM_VEHICLE_TIRES) {
+        vec3_t vOriginCornerOffset;
+
+        vTireAvg *= 1.f / NUM_VEHICLE_TIRES;
+        MatrixTransformVector(m_vOriginCornerOffset, orientation, vOriginCornerOffset);
+        vTireAvg -= vOriginCornerOffset;
+        m_vOriginOffset2 += vTireAvg;
+    }
+
+    //m_vOriginOffset2 += vec_zero;
+    m_vOriginOffset -= m_vOriginOffset2;
+
+    if (!isfinite(m_vOriginOffset[0]) || !isfinite(m_vOriginOffset[1]) || !isfinite(m_vOriginOffset[2])) {
+        m_vOriginOffset = oldoffset;
+    }
 }
 
 void VehicleTank::UpdateSound()
 {
-	// FIXME: STUB
+    float pitch  = 1.f;
+    float volume = 1.f;
+
+    if (level.time < m_fNextSoundState) {
+        return;
+    }
+
+    pitch = (velocity.length() - m_fSoundMinSpeed) / (m_fSoundMaxSpeed - m_fSoundMinSpeed);
+    pitch = Q_clamp_float(pitch, 0, 1);
+    pitch = (m_fSoundMaxPitch - m_fSoundMinPitch) * pitch + m_fSoundMinPitch;
+
+    volume = (velocity.length() - m_fVolumeMinSpeed) / (m_fVolumeMaxSpeed - m_fVolumeMinSpeed);
+    volume = Q_clamp_float(volume, 0, 1);
+    volume = (m_fVolumeMaxPitch - m_fVolumeMinPitch) * volume + m_fVolumeMinPitch;
+
+    if (level.intermissiontime) {
+        m_eSoundState = ST_OFF;
+    }
+
+    switch (m_eSoundState) {
+    case ST_OFF:
+        StopLoopSound();
+        TurnOffVehicleSoundEntities();
+        m_fNextSoundState = level.time;
+        if (driver.ent || m_bAutoPilot) {
+            m_eSoundState = ST_OFF_TRANS_IDLE;
+        }
+        break;
+    case ST_OFF_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_IDLE;
+        Sound(m_sSoundSet + "snd_on", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+    case ST_IDLE_TRANS_OFF:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_OFF;
+        Sound(m_sSoundSet + "snd_off", CHAN_AUTO);
+        StopLoopSound();
+        break;
+    case ST_IDLE:
+        m_fNextSoundState = level.time;
+        if (driver.ent || m_bAutoPilot) {
+            if (fabs(velocity * orientation[0]) > 150) {
+                m_eSoundState = ST_IDLE_TRANS_RUN;
+            } else if (fabs(turnimpulse) > 1) {
+                m_eSoundState = ST_IDLE_TRANS_TURN;
+            }
+        } else {
+            m_eSoundState = ST_IDLE_TRANS_OFF;
+        }
+
+        LoopSound(m_sSoundSet + "snd_idle");
+        TurnOffVehicleSoundEntities();
+        break;
+    case ST_IDLE_TRANS_RUN:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_RUN;
+        Sound(m_sSoundSet + "snd_revup", CHAN_AUTO);
+        Sound(m_sSoundSet + "snd_shift", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_RUN:
+        m_fNextSoundState = level.time;
+        if (fabs(velocity * orientation[0]) < 150) {
+            m_eSoundState = ST_RUN_TRANS_IDLE;
+        }
+        TurnOnVehicleSoundEntities();
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_RUN_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_IDLE;
+        Sound(m_sSoundSet + "snd_revdown", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+    case ST_IDLE_TRANS_TURN:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_TURN;
+        Sound(m_sSoundSet + "snd_revup", CHAN_AUTO);
+        Sound(m_sSoundSet + "snd_shift", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_TURN:
+        m_fNextSoundState = level.time;
+        if (fabs(turnimpulse) < 1) {
+            m_eSoundState = ST_TURN_TRANS_IDLE;
+        }
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_TURN_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState = ST_IDLE;
+        Sound(m_sSoundSet + "snd_revdown", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+    default:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_OFF;
+        break;
+    }
 }
 
-void VehicleTank::AttachDriverSlot(Event* ev)
+//
+// Fixed in OPM:
+//  This method only work when called from script.
+//  But it is not called automatically when the player actually uses the vehicle
+//  when that vehicle is unlocked.
+//  So the other native method is overriden instead
+/*
+void VehicleTank::AttachDriverSlot(Event *ev)
 {
-	Vehicle::AttachDriverSlot(ev);
+    Vehicle::AttachDriverSlot(ev);
 
-	VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
+    if (!driver.ent) {
+        //
+        // Added in OPM.
+        // original mohaa doesn't check if driver.ent is valid, which can cause crash if the attached entity is null.
+        // on single-player, it would crash while loading m5l2a when sv_maxclients is above 1.
+        // The reason of the crash is that attachdriverslot is called with $player which can be NULL on prespawn.
+        // $player is not created on prespawn when sv_maxclients is above 1
+        //
+        return;
+    }
 
-	if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient())
-	{
-		vtg->SetOwner((Sentient *)driver.ent.Pointer());
-		Think();
-		Postthink();
-		vtg->Think();
-	}
+    VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
 
+    if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient()) {
+        vtg->SetRemoteOwner(static_cast<Sentient *>(driver.ent.Pointer()));
+        Think();
+        Postthink();
+        vtg->Think();
+    }
+}
+*/
+
+void VehicleTank::AttachDriverSlot(int slot, Entity* ent, Vector vExitPosition)
+{
+    Vehicle::AttachDriverSlot(slot, ent, vExitPosition);
+
+    if (!driver.ent) {
+        //
+        // Added in OPM.
+        // original mohaa doesn't check if driver.ent is valid, which can cause crash if the attached entity is null.
+        // on single-player, it would crash while loading m5l2a when sv_maxclients is above 1.
+        // The reason of the crash is that attachdriverslot is called with $player which can be NULL on prespawn.
+        // $player is not created on prespawn when sv_maxclients is above 1
+        //
+        return;
+    }
+
+    VehicleTurretGun* vtg = static_cast<VehicleTurretGun*>(Turrets[0].ent.Pointer());
+
+    if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient()) {
+        vtg->SetRemoteOwner(static_cast<Sentient*>(driver.ent.Pointer()));
+        Think();
+        Postthink();
+        vtg->Think();
+    }
 }
 
+void VehicleTank::DriverAdded()
+{
+    int i;
+
+    for (i = 0; i < MAX_TURRETS; i++) {
+        if (Turrets[i].flags & SLOT_BUSY && Turrets[i].ent && Turrets[i].ent->IsSubclassOfVehicleTurretGun()) {
+            VehicleTurretGun *pTurret = static_cast<VehicleTurretGun *>(Turrets[i].ent.Pointer());
+            pTurret->TurretHasBeenMounted();
+        }
+    }
+}

code/fgame/VehicleWheelsX2.cpp

@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2018 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,64 +22,667 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "vehicle.h"
 #include "player.h"
+#include "debuglines.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX2, "VehicleWheelsX2")
-{
-	{ &EV_Damage, &VehicleWheelsX2::EventDamage },
-	{ &EV_Killed, &VehicleWheelsX2::Killed },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX2, "VehicleWheelsX2") {
+    {&EV_Damage, &VehicleWheelsX2::EventDamage},
+    {&EV_Killed, &VehicleWheelsX2::Killed     },
+    {NULL,       NULL                         }
 };
 
 VehicleWheelsX2::VehicleWheelsX2()
 {
-	m_iGear = 1;
-	m_iRPM = 0;
-	gravity = 1.0;
-	m_fDifferentialRatio = 4.8800001f;
-	m_fGearEfficiency = 0.69999999f;
-	m_fGearRatio[0] = -2.9400001f;
-	m_fGearRatio[1] = 2.9400001f;
-	m_fGearRatio[2] = 1.9400001f;
-	m_fGearRatio[3] = 1.0f;
-	m_fAccelerator = 0.0f;
-	m_bAutomatic = qtrue;
-	m_bBackSlipping = qfalse;
-	m_bFrontSlipping = qfalse;
+    gravity              = 1.0;
+    m_fDifferentialRatio = 4.88f;
+    m_fGearEfficiency    = 0.7f;
+    m_fGearRatio[0]      = -2.95f;
+    m_fGearRatio[1]      = 2.95f;
+    m_fGearRatio[2]      = 1.95f;
+    m_fGearRatio[3]      = 1.0f;
+    m_iGear              = 1;
+    m_iRPM               = 0;
+    m_fAccelerator       = 0.0f;
+    m_bAutomatic         = qtrue;
+    m_bBackSlipping      = qfalse;
+    m_bFrontSlipping     = qfalse;
 }
 
-void VehicleWheelsX2::UpdateVariables(Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright)
+void VehicleWheelsX2::Killed(Event *ev)
 {
-	// FIXME: STUB
+    deadflag = DEAD_DEAD;
 }
 
 float VehicleWheelsX2::TorqueLookup(int rpm)
 {
-	if (rpm <= 2099)
-		return 100.0;
-	if (rpm > 3599)
-		return 0.0;
-	return (100 * (3600 - rpm)) * 0.001;
+    if (rpm < 2100) {
+        return 100.0;
+    } else if (rpm >= 3600) {
+        return 0.0;
+    } else {
+        return (100 * (3600 - rpm)) / 1000.f;
+    }
+}
+
+void VehicleWheelsX2::UpdateVariables(
+    Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+)
+{
+    int    i;
+    Vector vNewCG;
+    Vector vBoxSize;
+    float  longspeed;
+    Vector _i, _j, _k;
+    Vector r_i, r_j, r_k;
+    Vector r_velocity;
+    float  dots[4];
+
+    r_velocity = velocity;
+
+    m_bIsSkidding = false;
+    vBoxSize      = maxs - mins;
+
+    SetControllerAngles(0, Vector(0, turnangle, 0));
+    SetControllerAngles(1, Vector(0, turnangle, 0));
+
+    vNewCG = localorigin;
+
+    if (vNewCG != m_vCG) {
+        m_vCG = vNewCG;
+        vNewCG -= localorigin;
+
+        m_fWheelBase      = vBoxSize.x;
+        m_fWheelFrontDist = vBoxSize.x * 0.5 - vNewCG.x;
+        m_fWheelBackDist  = vBoxSize.x * -0.5 + vNewCG.x;
+        m_fTrackWidth     = vBoxSize.y;
+    }
+
+    Vector vNewVpn = angles;
+    vNewVpn.AngleVectorsLeft(&r_i, &r_j, &r_k);
+    vNewVpn.y += turnangle;
+    vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+
+    dots[3] = r_velocity * *vpn * 0.02;
+    dots[2] = r_velocity * *vright * 0.02;
+    dots[1] = r_velocity * *t_vpn * 0.02;
+    dots[0] = r_velocity * *t_vright * 0.02;
+
+    m_sWheels[0].fTraction  = 0.8f;
+    m_sWheels[1].fTraction  = 0.9f;
+    m_sWheels[0].fYawOffset = 0;
+    m_sWheels[1].fYawOffset = DEG2RAD(turnangle);
+    m_sWheels[0].fLongDist  = m_fWheelBackDist * 0.02;
+    m_sWheels[1].fLongDist  = m_fWheelFrontDist * 0.02;
+    m_sWheels[0].fLatDist   = m_fTrackWidth * -0.02;
+    m_sWheels[1].fLatDist   = m_fTrackWidth * 0.02;
+
+    // initialize the wheels
+    for (i = 0; i < 2; i++) {
+        m_sWheels[i].fLongForce = 0;
+        m_sWheels[i].fForce     = 0;
+
+        m_sWheels[i].vLongForce  = vec_zero;
+        m_sWheels[i].vLatForce   = vec_zero;
+        m_sWheels[i].vForce      = vec_zero;
+        m_sWheels[i].vVelocity   = vec_zero;
+        m_sWheels[i].bSkidding   = false;
+        m_sWheels[i].bSpinning   = false;
+        m_sWheels[i].fTorque     = 0;
+        m_sWheels[i].fLatTorque  = 0;
+        m_sWheels[i].fLongTorque = 0;
+    }
+
+    for (i = 0; i < 2; i++) {
+        Vector p1, p3, p4;
+        Vector vTp, vTr, vTu;
+        vec3_t p2;
+
+        p3 = Corners[i];
+        p3.normalize();
+
+        vectoangles(p3, p2);
+        p1    = vec_zero;
+        p1[1] = angles[1] + p2[1] + 90;
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vVelocity = vTp * RAD2DEG(m_vAngularVelocity.y) * fabs(m_sWheels[i].fLongDist) * level.frametime;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vVelocity * 50,
+            0.7f,
+            0.5f,
+            1.0f,
+            1.0f
+        );
+
+        p1    = vec_zero;
+        p1[1] = angles[1] + RAD2DEG(m_sWheels[i].fYawOffset);
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vOrientation = vTp;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vOrientation * 50,
+            0.7f,
+            0.0f,
+            1.0f,
+            1.0f
+        );
+    }
+
+    Vector  start, end;
+    Vector  boxoffset;
+    Vector  t_mins(-8, -8, -8);
+    Vector  t_maxs(8, 8, 8);
+    trace_t trace;
+
+    start = origin + *vpn * (m_vCG[0] - localorigin[0]) + *vright * (m_vCG[1] - localorigin[1])
+          + *vup * (m_vCG[2] - localorigin[2]);
+
+    end = start;
+    end[2] -= maxtracedist;
+
+    trace = G_Trace(start, t_mins, t_maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+    m_fInertia        = m_fMass * 100;
+    m_fWheelFrontLoad = m_fMass * 9.81 * fabs(m_fWheelFrontDist / m_fWheelBase);
+    m_fWheelBackLoad  = m_fMass * 9.81 * fabs(m_fWheelBackDist / m_fWheelBase);
+
+    longspeed = m_vAcceleration.length() * 0.02 * m_fMass / m_fWheelBase;
+    m_fWheelFrontLoad -= longspeed;
+    m_fWheelBackLoad += longspeed;
+    m_sWheels[0].fLoad = m_fWheelBackLoad;
+    m_sWheels[1].fLoad = m_fWheelFrontLoad;
+
+    float fMassShifted     = m_fTireRadius * M_PI;
+    m_fTireRotationalSpeed = dots[3] / (fMassShifted + fMassShifted);
+    m_iRPM                 = m_fTireRotationalSpeed * m_fGearRatio[m_iGear] * m_fDifferentialRatio * 10;
+    m_fMaxTraction =
+        TorqueLookup(m_iRPM) * m_fGearRatio[m_iGear] * m_fDifferentialRatio * m_fGearEfficiency / m_fTireRadius;
+    m_fTractionForce = m_fAccelerator * m_fMaxTraction;
+
+    if (m_bIsBraking && dots[3] > 0) {
+        m_fTractionForce = -fSign(dots[3]) * 1000 * dots[3];
+    }
+
+    for (i = 0; i < 2; i++) {
+        float maxgrip;
+
+        maxgrip = m_sWheels[i].fTraction * m_sWheels[i].fLoad * 9.81;
+        if (m_fTractionForce > maxgrip) {
+            m_fTractionForce       = maxgrip * 0.6;
+            m_sWheels[i].bSpinning = true;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        if (m_fTractionForce < -maxgrip) {
+            m_fTractionForce       = -maxgrip * 0.6;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        m_sWheels[i].fLongForce = this->m_sWheels[i].fLongForce + m_fTractionForce;
+        m_sWheels[i].vLongForce += m_sWheels[i].vOrientation * m_sWheels[i].fLongForce;
+    }
+
+    m_vResistance[0] =
+        -(velocity[0] * 0.02 * m_fRollingResistance + velocity[0] * 0.02 * m_fDrag * fabs(velocity[0] * 0.02));
+    m_vResistance[1] =
+        -(velocity[1] * 0.02 * m_fRollingResistance + velocity[1] * 0.02 * m_fDrag * fabs(velocity[1] * 0.02));
+    m_vResistance[2] =
+        -(velocity[2] * 0.02 * m_fRollingResistance + velocity[2] * 0.02 * m_fDrag * fabs(velocity[2] * 0.02));
+
+    m_fBrakingPerformance = -m_fRollingResistance - *vpn * Vector(0, 0, -1) * m_fMass;
+    if (dots[3] == 0) {
+        m_fBrakingPerformance = 0;
+    } else {
+        m_fBrakingPerformance = (dots[3] - (m_fTireRotationalSpeed * m_fTireRadius - m_fBrakingPerformance)) / dots[3];
+        m_fBrakingPerformance = (1.0 - m_fBrakingPerformance) * -(-m_fFrontBrakingForce - m_fBackBrakingForce);
+    }
+
+    if (r_velocity.length() * 0.02 > 0.01) {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+
+        for (i = 0; i < 2; i++) {
+            Vector va, vr;
+            Vector vVel;
+            Vector v1, v2;
+
+            va   = angles;
+            va.x = 0;
+            va.y += RAD2DEG(m_sWheels[i].fYawOffset);
+            va.z = 0;
+            va.AngleVectorsLeft(NULL, &vr, NULL);
+
+            vVel = m_sWheels[i].vVelocity + velocity;
+            // get the direction
+            v1 = vVel;
+            v1.normalize();
+            // get the angles
+            vectoangles(v1, v2);
+
+            m_sWheels[i].fSlipAngle = DEG2RAD(angledist(va.y - v2.y));
+            m_sWheels[i].fGripCoef  = m_sWheels[i].fSlipAngle * 0.15;
+            m_sWheels[i].fGripCoef  = Q_clamp_float(m_sWheels[i].fGripCoef, -1.2f, 1.2f);
+            m_sWheels[i].fLatForce += m_sWheels[i].fGripCoef * m_sWheels[i].fLoad * 9.81;
+
+            if (m_sWheels[i].fLoad * 2 * m_sWheels[i].fTraction < fabs(m_sWheels[i].fLatForce)) {
+                m_sWheels[i].fLatForce = m_sWheels[i].fLatForce / 9.81;
+                m_sWheels[i].bSkidding = true;
+                Com_Printf("Skidding %i!\n", i);
+            }
+
+            m_sWheels[i].vLatForce += vr * m_sWheels[i].fLatForce;
+
+            G_LineWidth(3.0);
+
+            G_DebugLine(
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vLatForce * 50 * (1.0 / m_fMass),
+                0.7f,
+                0.5f,
+                0.2f,
+                1.0f
+            );
+        }
+    } else {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+    }
+
+    m_vForce = vec_zero;
+
+    for (i = 0; i < 2; i++) {
+        m_sWheels[i].vForce = m_sWheels[i].vLatForce + m_sWheels[i].vLongForce;
+        m_vForce += m_sWheels[i].vForce;
+    }
+
+    m_vForce += m_vResistance;
+
+    G_LineWidth(5.0);
+
+    G_DebugLine(origin, origin + m_vTangForce * (1.0 / m_fMass) * 50, 1.0, 0.0, 1.0, 1.0);
+
+    m_vAcceleration = m_vForce * (1.0 / m_fMass) * 50;
+    m_fTorque       = 0;
+
+    for (i = 0; i < 2; i++) {
+        m_sWheels[i].fTorque += m_sWheels[i].fLongTorque + m_sWheels[i].fLatTorque;
+        m_fTorque += m_sWheels[i].fTorque;
+    }
+
+    m_vAngularAcceleration[1] = angledist(RAD2DEG(m_fTorque));
+    m_vAngularVelocity += m_vAngularAcceleration * level.frametime;
+    m_vAngularVelocity *= 0.825f;
+    avelocity = m_vAngularVelocity;
+
+    if (m_bAutomatic) {
+        //
+        // set the gear
+        //
+        if (m_iRPM >= 2100 && m_iGear <= 2) {
+            m_iGear++;
+        }
+        if (m_iRPM <= 600 && m_iGear > 1) {
+            m_iGear--;
+        }
+    }
+
+    prev_moveimpulse = moveimpulse;
 }
 
 void VehicleWheelsX2::Think()
 {
-	vmove_t vm;
+    vmove_t vm;
 
-	flags |= FL_POSTTHINK;
-	prev_velocity = velocity;
+    flags |= FL_POSTTHINK;
+    prev_velocity = velocity;
 
-	SetMoveInfo(&vm);
-	VmoveSingle(&vm);
-	GetMoveInfo(&vm);
+    SetMoveInfo(&vm);
+    VmoveSingle(&vm);
+    GetMoveInfo(&vm);
 }
 
 void VehicleWheelsX2::Postthink()
 {
-	// FIXME: STUB
-}
+    float        turn;
+    Vector       i, j, k;
+    int          index;
+    trace_t      trace;
+    Vector       normalsum;
+    Vector       normalsum_Front;
+    int          numnormals_Front;
+    Vector       normalsum_Back;
+    int          numnormals_Back;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v;
+    VehicleBase *last;
+    float        drivespeed;
+    Vector       primal_angles;
+    Vector       vTmp;
+    Vector       n_angles;
 
-void VehicleWheelsX2::Killed(Event* ev)
-{
-	deadflag = DEAD_DEAD;
-}
+    primal_angles = angles;
 
+    if (drivable) {
+        currentspeed = moveimpulse;
+        turnangle    = turnangle * 0.25f + turnimpulse;
+        turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+        if (turnangle > maxturnrate) {
+            turnangle = maxturnrate;
+        } else if (turnangle < -maxturnrate) {
+            turnangle = -maxturnrate;
+        } else if (fabs(turnangle) < 2) {
+            turnangle = 0;
+        }
+
+        real_velocity     = origin - prev_origin;
+        prev_origin       = origin;
+        prev_acceleration = real_acceleration;
+        real_acceleration = real_velocity - prev_velocity;
+        prev_velocity     = real_velocity;
+        acceleration      = real_acceleration - prev_acceleration;
+
+        angles[0] = 0;
+        angles[2] = 0;
+
+        temp[0] = angles[0];
+        temp[1] = angles[1];
+        temp[2] = angles[2];
+        temp.AngleVectorsLeft(&i, &j, &k);
+
+        j = vec_zero - j;
+
+        index            = 0;
+        numnormals_Front = 0;
+        numnormals_Back  = 0;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2];
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1 && !trace.startsolid) {
+                if (index > 2) {
+                    normalsum_Front += trace.plane.normal;
+                    numnormals_Front++;
+                } else {
+                    normalsum_Back += trace.plane.normal;
+                    numnormals_Back++;
+                }
+
+                normalsum += trace.plane.normal;
+            }
+        }
+
+        if (angles[2] < 60 || angles[2] > 300) {
+            if (numnormals_Front > 1) {
+                m_vFrontNormal = normalsum_Front * (1.0 / numnormals_Front);
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vFrontAngles[1] = 0;
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Back > 1) {
+                m_vBackNormal = normalsum_Back * (1.0 / numnormals_Back);
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBackAngles[1] = 0;
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Front + numnormals_Back > 1) {
+                m_vBaseNormal = (normalsum_Front + normalsum_Back) * (1.0 / numnormals_Front + numnormals_Back);
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBaseAngles[1] = 0;
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+        }
+
+        n_angles    = m_vBaseAngles - angles;
+        n_angles[0] = angledist(n_angles[0]);
+        n_angles[1] = angledist(n_angles[1]);
+        n_angles[2] = angledist(n_angles[2]);
+
+        angles[0] += n_angles[0] * 4.5 * level.frametime;
+        angles[2] += n_angles[2] * 4.5 * level.frametime;
+
+        m_vPrevNormal = m_vBaseNormal;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            m_fFrontBrakingForce = 0.2f;
+            m_fBackBrakingForce  = 0.1f;
+        } else {
+            m_fFrontBrakingForce = 0;
+            m_fBackBrakingForce  = 0;
+        }
+
+        turn = turnangle * 0.005;
+
+        Vector _i, _j, _k;
+        Vector vNewVpn = angles;
+        vNewVpn.y += turnangle;
+
+        vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+        UpdateVariables(&acceleration, &i, &j, &k, &_i, &_j, &_k);
+
+        m_vAngles = angles;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            currentspeed = 0;
+        }
+
+        normalsum = vec_zero;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2] + Vector(0, 0, 10);
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1.0) {
+                float fCoef;
+
+                if (index > 2) {
+                    fCoef = m_fWheelFrontLoad / (m_fWheelFrontDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += _i * currentspeed * fCoef;
+                    normalsum += i * currentspeed * (1.0 - fCoef);
+                } else {
+                    fCoef = m_fWheelBackLoad / (m_fWheelBackDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += i * currentspeed * fCoef;
+                    normalsum += _i * currentspeed * (1.0 - fCoef);
+                }
+            }
+        }
+
+        AnglesToAxis(angles, orientation);
+
+        vmove_t vm;
+        SetMoveInfo(&vm);
+        m_sMoveGrid->SetMoveInfo(&vm);
+        m_sMoveGrid->SetOrientation(orientation);
+
+        if (m_sMoveGrid->CheckStuck()) {
+            angles = primal_angles;
+            AnglesToAxis(angles, orientation);
+        }
+
+        if (groundentity && (angles[2] < 60 || angles[2] > 300)) {
+            float  dot;
+            Vector newvel, flatvel;
+
+            velocity[0] *= 0.925f;
+            velocity[1] *= 0.925f;
+
+            newvel = orientation[0];
+            velocity += newvel * currentspeed;
+            newvel[2] = 0;
+
+            dot = velocity * newvel;
+            dot = Q_clamp_float(dot, -speed, speed);
+
+            if (dot > speed) {
+                dot = speed;
+            } else if (dot < -speed) {
+                dot = -speed;
+            } else if (fabs(dot) < 20) {
+                dot = 0;
+            }
+
+            flatvel = newvel * dot;
+
+            velocity[0] = flatvel[0];
+            velocity[1] = flatvel[1];
+            velocity[2] += jumpimpulse * dot;
+            avelocity *= 0.05f;
+
+            if (steerinplace) {
+                if (dot < 350) {
+                    dot = 350;
+                }
+
+                avelocity.y += turn * dot;
+            } else {
+                avelocity.y += turn * dot;
+            }
+        } else {
+            if (angles[2] > 60) {
+                angles[2]; // FIXME: ??
+            }
+
+            velocity += m_vAcceleration * level.frametime;
+        }
+
+        angles += avelocity * level.frametime;
+        setAngles(angles);
+
+        prev_origin = origin;
+    }
+
+    drivespeed = acceleration * orientation[0];
+
+    if (drivable && driver.ent) {
+        str sound_name;
+
+        if (currentspeed > 0) {
+            sound_name = "snd_forward";
+        } else if (currentspeed == 0) {
+            sound_name = "snd_idle";
+        } else {
+            sound_name = "snd_backward";
+        }
+
+        LoopSound(sound_name);
+    }
+
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    if (driver.ent) {
+        driver.ent->setOrigin(origin + i * driveroffset[0] + j * driveroffset[1] + k * driveroffset[2]);
+
+        if (drivable) {
+            // clear the driver velocity
+            driver.ent->velocity = vec_zero;
+            // set the driver angles to the vehicle's angle
+            driver.ent->setAngles(angles);
+        }
+    }
+
+    vTmp = (angles - primal_angles) * level.frametime;
+    if (vTmp.x > 180 || vTmp.x < -180) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > 180 || vTmp.y < -180) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > 180 || vTmp.z < -180) {
+        vTmp.z = 0;
+    }
+
+    if (vTmp.x > -1 || vTmp.x < 1) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > -1 || vTmp.y < 1) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > -1 || vTmp.z < 1) {
+        vTmp.z = 0;
+    }
+
+    avelocity = vTmp;
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    last_origin = origin;
+
+    if (!driver.ent && !velocity.length() && groundentity && !(watertype & CONTENTS_LAVA)) {
+        // make the vehicle stationary if it's completely immobile
+        flags &= ~FL_POSTTHINK;
+        if (drivable) {
+            setMoveType(MOVETYPE_STATIONARY);
+        }
+    }
+}

code/fgame/VehicleWheelsX4.cpp

@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2018 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,69 +22,680 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "vehicle.h"
 #include "player.h"
+#include "debuglines.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX4, "VehicleWheelsX4")
-{
-	{ &EV_Damage, &VehicleWheelsX4::EventDamage },
-	{ &EV_Killed, &VehicleWheelsX4::Killed },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX4, "VehicleWheelsX4") {
+    {&EV_Damage, &VehicleWheelsX4::EventDamage},
+    {&EV_Killed, &VehicleWheelsX4::Killed     },
+    {NULL,       NULL                         }
 };
 
 VehicleWheelsX4::VehicleWheelsX4()
 {
-	m_iGear = 1;
-	m_iRPM = 0;
-	gravity = 1.0;
-	m_fDifferentialRatio = 4.8800001f;
-	m_fGearEfficiency = 0.69999999f;
-	m_fGearRatio[0] = -2.9400001f;
-	m_fGearRatio[1] = 2.9400001f;
-	m_fGearRatio[2] = 1.9400001f;
-	m_fGearRatio[3] = 1.0f;
-	m_fAccelerator = 0.0f;
-	m_bBackSlipping = qfalse;
-	m_bAutomatic = qtrue;
-	m_bFrontSlipping = qfalse;
+    gravity              = 1.0;
+    m_fDifferentialRatio = 4.88f;
+    m_fGearEfficiency    = 0.7f;
+    m_fGearRatio[0]      = -2.95f;
+    m_fGearRatio[1]      = 2.95f;
+    m_fGearRatio[2]      = 1.95f;
+    m_fGearRatio[3]      = 1.0f;
+    m_iGear              = 1;
+    m_iRPM               = 0;
+    m_fAccelerator       = 0.0f;
+    m_bAutomatic         = qtrue;
+    m_bBackSlipping      = qfalse;
+    m_bFrontSlipping     = qfalse;
 }
 
-void VehicleWheelsX4::UpdateVariables(Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright)
+void VehicleWheelsX4::UpdateVariables(
+    Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+)
 {
-	// FIXME: STUB
+    int    i;
+    Vector vNewCG;
+    Vector vBoxSize;
+    float  longspeed;
+    Vector _i, _j, _k;
+    Vector r_i, r_j, r_k;
+    Vector r_velocity;
+    float  dots[4];
+
+    r_velocity = velocity;
+
+    m_bIsSkidding = false;
+    vBoxSize      = maxs - mins;
+
+    SetControllerAngles(0, Vector(0, turnangle, 0));
+    SetControllerAngles(1, Vector(0, turnangle, 0));
+
+    vNewCG = localorigin;
+
+    if (vNewCG != m_vCG) {
+        m_vCG = vNewCG;
+        vNewCG -= localorigin;
+
+        m_fWheelBase      = vBoxSize.x;
+        m_fWheelFrontDist = vBoxSize.x * 0.5 - vNewCG.x;
+        m_fWheelBackDist  = vBoxSize.x * -0.5 + vNewCG.x;
+        m_fTrackWidth     = vBoxSize.y;
+    }
+
+    Vector vNewVpn = angles;
+    vNewVpn.AngleVectorsLeft(&r_i, &r_j, &r_k);
+    vNewVpn.y += turnangle;
+    vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+
+    dots[3] = r_velocity * *vpn * 0.02;
+    dots[2] = r_velocity * *vright * 0.02;
+    dots[1] = r_velocity * *t_vpn * 0.02;
+    dots[0] = r_velocity * *t_vright * 0.02;
+
+    m_sWheels[0].fTraction  = 0.8f;
+    m_sWheels[1].fTraction  = 0.9f;
+    m_sWheels[2].fTraction  = 0.8f;
+    m_sWheels[3].fTraction  = 0.9f;
+    m_sWheels[0].fYawOffset = 0;
+    m_sWheels[1].fYawOffset = DEG2RAD(turnangle);
+    m_sWheels[2].fYawOffset = 0;
+    m_sWheels[3].fYawOffset = DEG2RAD(turnangle);
+    m_sWheels[0].fLongDist  = m_fWheelBackDist * 0.02;
+    m_sWheels[1].fLongDist  = m_fWheelFrontDist * 0.02;
+    m_sWheels[2].fLongDist  = m_fWheelBackDist * 0.02;
+    m_sWheels[3].fLongDist  = m_fWheelFrontDist * 0.02;
+    m_sWheels[0].fLatDist   = m_fTrackWidth * 0.5 * -0.02;
+    m_sWheels[1].fLatDist   = m_fTrackWidth * 0.5 * 0.02;
+    m_sWheels[2].fLatDist   = m_fTrackWidth * 0.5 * -0.02;
+    m_sWheels[3].fLatDist   = m_fTrackWidth * 0.5 * 0.02;
+
+    // initialize the wheels
+    for (i = 0; i < 4; i++) {
+        m_sWheels[i].fLongForce = 0;
+        m_sWheels[i].fForce     = 0;
+
+        m_sWheels[i].vLongForce  = vec_zero;
+        m_sWheels[i].vLatForce   = vec_zero;
+        m_sWheels[i].vForce      = vec_zero;
+        m_sWheels[i].vVelocity   = vec_zero;
+        m_sWheels[i].bSkidding   = false;
+        m_sWheels[i].bSpinning   = false;
+        m_sWheels[i].fTorque     = 0;
+        m_sWheels[i].fLatTorque  = 0;
+        m_sWheels[i].fLongTorque = 0;
+    }
+
+    for (i = 0; i < 4; i++) {
+        Vector p1, p3, p4;
+        Vector vTp, vTr, vTu;
+        vec3_t p2;
+
+        p3 = Corners[i];
+        p3.normalize();
+
+        vectoangles(p3, p2);
+        p1    = vec_zero;
+        p1[1] = angles[1] + p2[1] + 90;
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vVelocity = vTp * RAD2DEG(m_vAngularVelocity.y) * fabs(m_sWheels[i].fLongDist) * level.frametime;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vVelocity * 50,
+            0.7f,
+            0.5f,
+            1.0f,
+            1.0f
+        );
+
+        p1    = vec_zero;
+        p1[1] = angles[1] + RAD2DEG(m_sWheels[i].fYawOffset);
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vOrientation = vTp;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vOrientation * 50,
+            0.7f,
+            0.0f,
+            1.0f,
+            1.0f
+        );
+    }
+
+    Vector  start, end;
+    Vector  boxoffset;
+    Vector  t_mins(-8, -8, -8);
+    Vector  t_maxs(8, 8, 8);
+    trace_t trace;
+
+    start = origin + *vpn * (m_vCG[0] - localorigin[0]) + *vright * (m_vCG[1] - localorigin[1])
+          + *vup * (m_vCG[2] - localorigin[2]);
+
+    end = start;
+    end[2] -= maxtracedist;
+
+    trace = G_Trace(start, t_mins, t_maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+    m_fInertia        = m_fMass * 100;
+    m_fWheelFrontLoad = m_fMass * 9.81 * fabs(m_fWheelFrontDist / m_fWheelBase);
+    m_fWheelBackLoad  = m_fMass * 9.81 * fabs(m_fWheelBackDist / m_fWheelBase);
+
+    longspeed = m_vAcceleration.length() * 0.02 * m_fMass / m_fWheelBase;
+    m_fWheelFrontLoad -= longspeed;
+    m_fWheelBackLoad += longspeed;
+    m_sWheels[0].fLoad = m_fWheelBackLoad / 2.0;
+    m_sWheels[1].fLoad = m_fWheelBackLoad / 2.0;
+    m_sWheels[2].fLoad = m_fWheelFrontLoad / 2.0;
+    m_sWheels[3].fLoad = m_fWheelFrontLoad / 2.0;
+
+    float fMassShifted     = m_fTireRadius * M_PI;
+    m_fTireRotationalSpeed = dots[3] / (fMassShifted + fMassShifted);
+    m_iRPM                 = m_fTireRotationalSpeed * m_fGearRatio[m_iGear] * m_fDifferentialRatio * 10;
+    m_fMaxTraction =
+        TorqueLookup(m_iRPM) * m_fGearRatio[m_iGear] * m_fDifferentialRatio * m_fGearEfficiency / m_fTireRadius;
+    m_fTractionForce = m_fAccelerator * m_fMaxTraction;
+
+    if (m_bIsBraking && dots[3] > 0) {
+        m_fTractionForce = -fSign(dots[3]) * 1000 * dots[3];
+    }
+
+    for (i = 0; i < 4; i++) {
+        float maxgrip;
+
+        maxgrip = m_sWheels[i].fTraction * m_sWheels[i].fLoad * 9.81;
+        if (m_fTractionForce > maxgrip) {
+            m_fTractionForce       = maxgrip * 0.6;
+            m_sWheels[i].bSpinning = true;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        if (m_fTractionForce < -maxgrip) {
+            m_fTractionForce       = -maxgrip * 0.6;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        m_sWheels[i].fLongForce = this->m_sWheels[i].fLongForce + m_fTractionForce;
+        m_sWheels[i].vLongForce += m_sWheels[i].vOrientation * m_sWheels[i].fLongForce;
+    }
+
+    m_vResistance[0] =
+        -(velocity[0] * 0.02 * m_fRollingResistance + velocity[0] * 0.02 * m_fDrag * fabs(velocity[0] * 0.02));
+    m_vResistance[1] =
+        -(velocity[1] * 0.02 * m_fRollingResistance + velocity[1] * 0.02 * m_fDrag * fabs(velocity[1] * 0.02));
+    m_vResistance[2] =
+        -(velocity[2] * 0.02 * m_fRollingResistance + velocity[2] * 0.02 * m_fDrag * fabs(velocity[2] * 0.02));
+
+    m_fBrakingPerformance = -m_fRollingResistance - *vpn * Vector(0, 0, -1) * m_fMass;
+    if (dots[3] == 0) {
+        m_fBrakingPerformance = 0;
+    } else {
+        m_fBrakingPerformance = (dots[3] - (m_fTireRotationalSpeed * m_fTireRadius - m_fBrakingPerformance)) / dots[3];
+        m_fBrakingPerformance = (1.0 - m_fBrakingPerformance) * -(-m_fFrontBrakingForce - m_fBackBrakingForce);
+    }
+
+    if (r_velocity.length() * 0.02 > 0.01) {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+
+        for (i = 0; i < 2; i++) {
+            Vector va, vr;
+            Vector vVel;
+            Vector v1, v2;
+
+            va   = angles;
+            va.x = 0;
+            va.y += RAD2DEG(m_sWheels[i].fYawOffset);
+            va.z = 0;
+            va.AngleVectorsLeft(NULL, &vr, NULL);
+
+            vVel = m_sWheels[i].vVelocity + velocity;
+            // get the direction
+            v1 = vVel;
+            v1.normalize();
+            // get the angles
+            vectoangles(v1, v2);
+
+            m_sWheels[i].fSlipAngle = DEG2RAD(angledist(va.y - v2.y));
+            m_sWheels[i].fGripCoef  = m_sWheels[i].fSlipAngle * 0.15;
+            m_sWheels[i].fGripCoef  = Q_clamp_float(m_sWheels[i].fGripCoef, -1.2f, 1.2f);
+            m_sWheels[i].fLatForce += m_sWheels[i].fGripCoef * m_sWheels[i].fLoad * 9.81;
+
+            if (m_sWheels[i].fLoad * 2 * m_sWheels[i].fTraction < fabs(m_sWheels[i].fLatForce)) {
+                m_sWheels[i].fLatForce = m_sWheels[i].fLatForce / 9.81;
+                m_sWheels[i].bSkidding = true;
+                Com_Printf("Skidding %i!\n", i);
+            }
+
+            m_sWheels[i].vLatForce += vr * m_sWheels[i].fLatForce;
+
+            G_LineWidth(3.0);
+
+            G_DebugLine(
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vLatForce * 50 * (1.0 / m_fMass),
+                0.7f,
+                0.5f,
+                0.2f,
+                1.0f
+            );
+        }
+    } else {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+    }
+
+    m_vForce = vec_zero;
+
+    for (i = 0; i < 4; i++) {
+        m_sWheels[i].vForce = m_sWheels[i].vLatForce + m_sWheels[i].vLongForce;
+        m_vForce += m_sWheels[i].vForce;
+    }
+
+    m_vForce += m_vResistance;
+
+    G_LineWidth(5.0);
+
+    G_DebugLine(origin, origin + m_vTangForce * (1.0 / m_fMass) * 50, 1.0, 0.0, 1.0, 1.0);
+
+    m_vAcceleration = m_vForce * (1.0 / m_fMass) * 50;
+    m_fTorque       = 0;
+
+    for (i = 0; i < 4; i++) {
+        m_sWheels[i].fTorque += m_sWheels[i].fLongTorque + m_sWheels[i].fLatTorque;
+        m_fTorque += m_sWheels[i].fTorque;
+    }
+
+    m_vAngularAcceleration[1] = angledist(RAD2DEG(m_fTorque));
+    m_vAngularVelocity += m_vAngularAcceleration * level.frametime;
+    m_vAngularVelocity *= 0.825f;
+    avelocity = m_vAngularVelocity;
+
+    if (m_bAutomatic) {
+        //
+        // set the gear
+        //
+        if (m_iRPM >= 2100 && m_iGear <= 2) {
+            m_iGear++;
+        }
+        if (m_iRPM <= 600 && m_iGear > 1) {
+            m_iGear--;
+        }
+    }
+
+    prev_moveimpulse = moveimpulse;
+}
+
+void VehicleWheelsX4::Killed(Event *ev)
+{
+    deadflag = DEAD_DEAD;
 }
 
 float VehicleWheelsX4::TorqueLookup(int rpm)
 {
-	if (rpm <= 2099)
-		return 20.0;
-	if (rpm > 3599)
-		return 0.0;
-	return (20 * (3600 - rpm)) * 0.001;
+    if (rpm <= 2099) {
+        return 20.0;
+    }
+    if (rpm > 3599) {
+        return 0.0;
+    }
+    return (20 * (3600 - rpm)) * 0.001;
 }
 
 void VehicleWheelsX4::Think()
 {
-	vmove_t vm;
-	flags |= FL_POSTTHINK;
-	
-	prev_velocity = velocity;
+    vmove_t vm;
+    flags |= FL_POSTTHINK;
 
-	angles -= m_vAnglesOffset;
-	origin -= m_vOriginOffset;
+    prev_velocity = velocity;
 
-	mins = m_vOldMins;
-	maxs = m_vOldMaxs;
+    angles -= m_vAnglesOffset;
+    origin -= m_vOriginOffset;
 
-	SetMoveInfo(&vm);
-	VmoveSingle(&vm);
-	GetMoveInfo(&vm);
+    mins = m_vOldMins;
+    maxs = m_vOldMaxs;
+
+    SetMoveInfo(&vm);
+    VmoveSingle(&vm);
+    GetMoveInfo(&vm);
 }
 
 void VehicleWheelsX4::Postthink()
 {
-	// FIXME: STUB
-}
+    float        turn;
+    Vector       i, j, k;
+    int          index;
+    trace_t      trace;
+    Vector       normalsum;
+    Vector       normalsum_Front;
+    int          numnormals_Front;
+    Vector       normalsum_Back;
+    int          numnormals_Back;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v;
+    VehicleBase *last;
+    float        drivespeed;
+    Vector       primal_angles;
+    Vector       vTmp;
+    Vector       n_angles;
 
-void VehicleWheelsX4::Killed(Event* ev)
-{
-	deadflag = DEAD_DEAD;
+    primal_angles = angles;
+
+    if (drivable) {
+        if (m_bAutoPilot) {
+            AutoPilot();
+        } else {
+            moveimpulse *= 0.825f;
+            turnimpulse *= 0.825f;
+        }
+
+        currentspeed = moveimpulse;
+        turnangle    = turnangle * 0.25f + turnimpulse;
+        turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+        if (turnangle > maxturnrate) {
+            turnangle = maxturnrate;
+        } else if (turnangle < -maxturnrate) {
+            turnangle = -maxturnrate;
+        } else if (fabs(turnangle) < 2) {
+            turnangle = 0;
+        }
+
+        real_velocity     = origin - prev_origin;
+        prev_origin       = origin;
+        prev_acceleration = real_acceleration;
+        real_acceleration = real_velocity - prev_velocity;
+        prev_velocity     = real_velocity;
+        acceleration      = real_acceleration - prev_acceleration;
+
+        angles[0] = 0;
+        angles[2] = 0;
+
+        temp[0] = angles[0];
+        temp[1] = angles[1];
+        temp[2] = angles[2];
+        temp.AngleVectorsLeft(&i, &j, &k);
+
+        j = vec_zero - j;
+
+        index            = 0;
+        numnormals_Front = 0;
+        numnormals_Back  = 0;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2];
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1 && !trace.startsolid) {
+                if (index > 2) {
+                    normalsum_Front += trace.plane.normal;
+                    numnormals_Front++;
+                } else {
+                    normalsum_Back += trace.plane.normal;
+                    numnormals_Back++;
+                }
+
+                normalsum += trace.plane.normal;
+            }
+        }
+
+        if (angles[2] < 60 || angles[2] > 300) {
+            if (numnormals_Front > 1) {
+                m_vFrontNormal = normalsum_Front * (1.0 / numnormals_Front);
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vFrontAngles[1] = 0;
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Back > 1) {
+                m_vBackNormal = normalsum_Back * (1.0 / numnormals_Back);
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBackAngles[1] = 0;
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Front + numnormals_Back > 1) {
+                m_vBaseNormal = (normalsum_Front + normalsum_Back) * (1.0 / numnormals_Front + numnormals_Back);
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBaseAngles[1] = 0;
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+        }
+
+        n_angles    = m_vBaseAngles - angles;
+        n_angles[0] = angledist(n_angles[0]);
+        n_angles[1] = angledist(n_angles[1]);
+        n_angles[2] = angledist(n_angles[2]);
+
+        angles[0] += n_angles[0] * 4.5 * level.frametime;
+        angles[2] += n_angles[2] * 4.5 * level.frametime;
+
+        m_vPrevNormal = m_vBaseNormal;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            m_fFrontBrakingForce = 0.2f;
+            m_fBackBrakingForce  = 0.1f;
+        } else {
+            m_fFrontBrakingForce = 0;
+            m_fBackBrakingForce  = 0;
+        }
+
+        turn = turnangle * 0.005;
+
+        Vector _i, _j, _k;
+        Vector vNewVpn = angles;
+        vNewVpn.y += turnangle;
+
+        vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+        UpdateVariables(&acceleration, &i, &j, &k, &_i, &_j, &_k);
+
+        m_vAngles = angles;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            currentspeed = 0;
+        }
+
+        normalsum = vec_zero;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2] + Vector(0, 0, 10);
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1.0) {
+                float fCoef;
+
+                if (index > 2) {
+                    fCoef = m_fWheelFrontLoad / (m_fWheelFrontDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += _i * currentspeed * fCoef;
+                    normalsum += i * currentspeed * (1.0 - fCoef);
+                } else {
+                    fCoef = m_fWheelBackLoad / (m_fWheelBackDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += i * currentspeed * fCoef;
+                    normalsum += _i * currentspeed * (1.0 - fCoef);
+                }
+            }
+        }
+
+        AnglesToAxis(angles, orientation);
+
+        vmove_t vm;
+        SetMoveInfo(&vm);
+        m_sMoveGrid->SetMoveInfo(&vm);
+        m_sMoveGrid->SetOrientation(orientation);
+
+        if (m_sMoveGrid->CheckStuck()) {
+            angles = primal_angles;
+            AnglesToAxis(angles, orientation);
+        }
+
+        m_fForwardForce = acceleration * i * 0.1;
+        m_fBackForce += -m_vAnglesOffset[0] * m_fBouncyCoef;
+        m_fBackForce *= m_fSpringyCoef;
+
+        m_vAnglesOffset[0] += m_fForwardForce + m_fBackForce * 12.0 * level.frametime;
+        m_vAnglesOffset[0] = Q_clamp_float(m_vAnglesOffset[0], m_fYawMin, m_fYawMax);
+
+        m_fLeftForce += acceleration * j * 0.1;
+        m_fRightForce += -m_vAnglesOffset[2] * m_fBouncyCoef;
+        m_fRightForce *= m_fSpringyCoef;
+
+        m_vAnglesOffset[2] += (m_fLeftForce + m_fRightForce) * 12.0 * level.frametime;
+        m_vAnglesOffset[2] = Q_clamp_float(m_vAnglesOffset[2], m_fRollMin, m_fRollMax);
+
+        m_fDownForce = acceleration[2];
+        m_fUpForce += -m_vOriginOffset[2] * m_fBouncyCoef;
+        m_fUpForce *= m_fSpringyCoef;
+
+        m_vAnglesOffset[2] += (m_fDownForce + m_fUpForce) * 12.0 * level.frametime;
+        m_vAnglesOffset[2] = Q_clamp_float(m_vAnglesOffset[2], m_fZMin, m_fZMax);
+
+        if (groundentity && (angles[2] < 60 || angles[2] > 300)) {
+            velocity += m_vAcceleration * level.frametime;
+        } else {
+            if (angles[2] > 60) {
+                angles[2]; // FIXME: ??
+            }
+
+            velocity += m_vAcceleration * level.frametime;
+        }
+
+        angles += avelocity * level.frametime;
+        setAngles(angles);
+
+        prev_origin = origin;
+    }
+
+    drivespeed = acceleration * orientation[0];
+
+    if (drivable && driver.ent) {
+        str sound_name;
+
+        if (currentspeed > 0) {
+            sound_name = "snd_forward";
+        } else if (currentspeed == 0) {
+            sound_name = "snd_idle";
+        } else {
+            sound_name = "snd_backward";
+        }
+
+        LoopSound(sound_name);
+    }
+
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    last_origin = origin;
+
+    vTmp = (angles - primal_angles) * level.frametime;
+    if (vTmp.x > 180 || vTmp.x < -180) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > 180 || vTmp.y < -180) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > 180 || vTmp.z < -180) {
+        vTmp.z = 0;
+    }
+
+    if (vTmp.x > -1 || vTmp.x < 1) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > -1 || vTmp.y < 1) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > -1 || vTmp.z < 1) {
+        vTmp.z = 0;
+    }
+
+    avelocity = vTmp;
+    origin += m_vOriginOffset;
+    setOrigin(origin);
+
+    angles += m_vAnglesOffset;
+    setAngles(angles);
+
+    if (driver.ent) {
+        driver.ent->setOrigin(origin + i * driveroffset[0] + j * driveroffset[1] + k * driveroffset[2]);
+
+        if (drivable) {
+            // clear the driver velocity
+            driver.ent->velocity = vec_zero;
+            // set the driver angles to the vehicle's angle
+            driver.ent->setAngles(angles);
+        }
+    }
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    if (!driver.ent && !velocity.length() && groundentity && !(watertype & CONTENTS_LAVA)) {
+        // make the vehicle stationary if it's completely immobile
+        flags &= ~FL_POSTTHINK;
+        if (drivable) {
+            setMoveType(MOVETYPE_STATIONARY);
+        }
+    }
 }

code/fgame/actor_aim.cpp

@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,56 +24,42 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitAim
-	(
-	GlobalFuncs_t *func
-	)
-
+void Actor::InitAim(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Aim;
-	func->ThinkState					= &Actor::Think_Aim;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->ShowInfo						= &Actor::ShowInfo_Aim;
-	func->IsState						= &Actor::IsIdleState;
-}
-void Actor::Begin_Aim
-	(
-	void
-	)
-
-{
-	m_csMood = STRING_ALERT;
-	m_csIdleMood = STRING_NERVOUS;
-	ClearPath();
-}
-void Actor::Think_Aim
-	(
-	void
-	)
-
-{
-	if( !RequireThink() )
-		return;
-
-	UpdateEyeOrigin();
-	NoPoint();
-	m_pszDebugState = "";
-	Anim_Aim();
-
-	if( m_aimNode )
-	{
-		AimAtAimNode();
-	}
-
-	CheckForThinkStateTransition();
-	PostThink( true );
+    func->BeginState                 = &Actor::Begin_Aim;
+    func->ThinkState                 = &Actor::Think_Aim;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->ShowInfo                   = &Actor::ShowInfo_Aim;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::ShowInfo_Aim
-	(
-	void
-	)
-
+void Actor::Begin_Aim(void)
 {
-	ShowInfo_AimNode();
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
+    ClearPath();
+}
+
+void Actor::Think_Aim(void)
+{
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    NoPoint();
+    m_pszDebugState = "";
+    Anim_Aim();
+
+    if (m_aimNode) {
+        AimAtAimNode();
+    }
+
+    CheckForThinkStateTransition();
+    PostThink(true);
+}
+
+void Actor::ShowInfo_Aim(void)
+{
+    ShowInfo_AimNode();
 }

code/fgame/actor_alarm.cpp

@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,151 +24,106 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitAlarm
-	(
-	GlobalFuncs_t *func
-	)
-
+void Actor::InitAlarm(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Alarm;
-	func->EndState						= &Actor::End_Alarm;
-	func->ThinkState					= &Actor::Think_Alarm;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Attack;
-	func->IsState						= &Actor::IsAttackState;
+    func->BeginState                 = &Actor::Begin_Alarm;
+    func->EndState                   = &Actor::End_Alarm;
+    func->ThinkState                 = &Actor::Think_Alarm;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->IsState                    = &Actor::IsAttackState;
 }
 
-void Actor::Begin_Alarm
-	(
-	void
-	)
-
+void Actor::Begin_Alarm(void)
 {
-	DoForceActivate();
+    DoForceActivate();
 
-	m_csMood = STRING_ALERT;
-	m_csIdleMood = STRING_NERVOUS;
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
 
-	if( m_AlarmNode )
-	{
-		SetPath( m_AlarmNode, "Actor::Begin_Alarm", 0 );
+    if (!m_AlarmNode) {
+        State_Alarm_StartThread();
+        return;
+    }
 
-		if( PathExists() )
-		{
-			TransitionState(601, 0);
-		}
-		else
-		{
-			TransitionState(600, 0);
-			parm.movefail = true;
-		}
-	}
-	else
-	{
-		SetLeashHome( origin );
-		TransitionState(600, 0);
-		m_AlarmThread.Execute( this );
-	}
+    SetPath(m_AlarmNode, "Actor::Begin_Alarm", 0);
+
+    if (PathExists()) {
+        TransitionState(ACTOR_STATE_ALARM_MOVE, 0);
+    } else {
+        TransitionState(ACTOR_STATE_ALARM_IDLE, 0);
+        parm.movefail = true;
+    }
 }
 
-void Actor::End_Alarm
-	(
-	void
-	)
-
+void Actor::End_Alarm(void)
 {
-	parm.movefail = true;
+    parm.movefail = true;
 }
 
-void Actor::State_Alarm_StartThread
-	(
-	void
-	)
-
+void Actor::State_Alarm_StartThread(void)
 {
-	if( m_AlarmNode )
-		SetLeashHome( m_AlarmNode->origin );
-	else
-		SetLeashHome( origin );
+    SetLeashHome(m_AlarmNode ? m_AlarmNode->origin : origin);
+    // Added in 2.30.
+    //  Execute the pre-alarm thread
+    m_PreAlarmThread.Execute(this);
 
-	TransitionState(600, 0);
-	m_AlarmThread.Execute();
+    TransitionState(ACTOR_STATE_ALARM_IDLE, 0);
+    m_AlarmThread.Execute(this);
 }
 
-void Actor::State_Alarm_Move
-	(
-	void
-	)
-
+void Actor::State_Alarm_Move(void)
 {
-	if( PathExists() )
-	{
-		if( PathComplete() )
-		{
-			Anim_Aim();
-			AimAtTargetPos();
-		}
-		else
-		{
-			Anim_RunToAlarm( 2 );
-			FaceMotion();
-		}
-	}
-	else
-	{
-		TransitionState(600, 0);
-		parm.movefail = true;
+    if (!PathExists()) {
+        TransitionState(ACTOR_STATE_ALARM_IDLE, 0);
+        parm.movefail = true;
 
-		Anim_Aim();
-		AimAtTargetPos();
-	}
+        Anim_Aim();
+        AimAtTargetPos();
+    } else if (PathComplete()) {
+        Anim_Aim();
+        AimAtTargetPos();
+        State_Alarm_StartThread();
+    } else {
+        Anim_RunToAlarm(ANIM_MODE_PATH);
+        FaceMotion();
+    }
 }
 
-void Actor::State_Alarm_Idle
-	(
-	void
-	)
-
+void Actor::State_Alarm_Idle(void)
 {
-	AimAtTargetPos();
-	SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+    Anim_Aim();
+    AimAtTargetPos();
+    SetThink(THINKSTATE_ATTACK, THINK_TURRET);
 }
 
-void Actor::Think_Alarm
-	(
-	void
-	)
-
+void Actor::Think_Alarm(void)
 {
-	if( !RequireThink() )
-		return;
+    if (!RequireThink()) {
+        return;
+    }
 
-	parm.movefail = false;
+    parm.movefail = false;
 
-	UpdateEyeOrigin();
-	NoPoint();
+    UpdateEyeOrigin();
+    NoPoint();
 
-	if( m_State == 600 )
-	{
-		m_pszDebugState = "idle";
-		State_Alarm_Idle();
-	}
-	else if( m_State == 601 )
-	{
-		m_pszDebugState = "move";
-		State_Alarm_Move();
-	}
-	else
-	{
-		Com_Printf( "Actor::Think_Alarm: invalid think state %i\n", m_State );
-	}
+    switch (m_State) {
+    case ACTOR_STATE_ALARM_IDLE:
+        m_pszDebugState = "idle";
+        State_Alarm_Idle();
+        break;
+    case ACTOR_STATE_ALARM_MOVE:
+        m_pszDebugState = "move";
+        State_Alarm_Move();
+        break;
+    default:
+        Com_Printf("Actor::Think_Alarm: invalid think state %i\n", m_State);
+        break;
+    }
 }
 
-void Actor::FinishedAnimation_Alarm
-	(
-	void
-	)
-
+void Actor::FinishedAnimation_Alarm(void)
 {
-	// not needed
-	return;
+    // not needed
+    return;
 }

code/fgame/actor_anim.cpp

@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,86 +24,66 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitAnim
-	(
-	GlobalFuncs_t *func
-	)
-
+void Actor::InitAnim(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Anim;
-	func->BeginState					= &Actor::Begin_Anim;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Anim;
-	func->ShowInfo						= &Actor::ShowInfo_Anim;
-	func->IsState						= &Actor::IsIdleState;
+    func->ThinkState                 = &Actor::Think_Anim;
+    func->BeginState                 = &Actor::Begin_Anim;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Anim;
+    func->ShowInfo                   = &Actor::ShowInfo_Anim;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::Begin_Anim
-	(
-	void
-	)
-
+void Actor::Begin_Anim(void)
 {
-	m_csMood = m_csIdleMood;
-	ClearPath();
-	StopTurning();
-	TransitionState(1000, 0);
+    m_csMood = m_csIdleMood;
+    ClearPath();
+    StopTurning();
+    TransitionState(ACTOR_STATE_ANIMATION_INITIAL, 0);
 }
 
-void Actor::Think_Anim
-	(
-	void
-	)
-
+void Actor::Think_Anim(void)
 {
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		IdlePoint();
-		IdleLook();
-		if (m_State == 1000)
-		{
-			m_bNextForceStart = true;
+    if (!RequireThink()) {
+        return;
+    }
 
-			m_bAnimScriptSet = false;
-			m_pszDebugState = "initial";
-			TransitionState(1001, 0);
-		}
-		else if (m_State == 1001)
-		{
-			m_bNextForceStart = false;
-			m_pszDebugState = "main";
-		}
-		m_eNextAnimMode = m_AnimMode;
-		m_csNextAnimString = m_csAnimScript;
+    UpdateEyeOrigin();
+    IdlePoint();
+    IdleLook();
 
-		CheckForThinkStateTransition();
-		IdleTurn();
-		PostThink(false);
-	}
+    if (m_State == ACTOR_STATE_ANIMATION_INITIAL) {
+        m_pszDebugState = "initial";
+        m_bAnimScriptSet = false;
+        StartAnimation(m_AnimMode, m_csAnimScript);
+        TransitionState(ACTOR_STATE_ANIMATION_MAIN, 0);
+    } else if (m_State == ACTOR_STATE_ANIMATION_MAIN) {
+        m_bNextForceStart = false;
+        m_pszDebugState = "main";
+        DesiredAnimation(m_AnimMode, m_csAnimScript);
+    }
+
+    CheckForThinkStateTransition();
+    IdleTurn();
+    PostThink(false);
 }
 
-void Actor::FinishedAnimation_Anim
-	(
-	void
-	)
-
+void Actor::FinishedAnimation_Anim(void)
 {
-	if (!m_bAnimScriptSet)
-	{
-		if (m_bNoIdleAfterAnim)
-			m_csAnimScript = STRING_ANIM_CONTINUE_LAST_ANIM_SCR;
-		else
-			SetThinkIdle(THINK_IDLE);
-		Unregister(STRING_ANIMDONE);
-	}
+    if (m_bAnimScriptSet) {
+        return;
+    }
+
+    if (m_bNoIdleAfterAnim) {
+        m_csAnimScript = STRING_ANIM_CONTINUE_LAST_ANIM_SCR;
+    } else {
+        SetThinkIdle(THINK_IDLE);
+    }
+
+    Unregister(STRING_ANIMDONE);
 }
 
-void Actor::ShowInfo_Anim
-	(
-	void
-	)
-
+void Actor::ShowInfo_Anim(void)
 {
-	Com_Printf("anim script: %s, anim mode %d\n", Director.GetString(m_csAnimScript).c_str(), m_AnimMode);
+    Com_Printf("anim script: %s, anim mode %d\n", Director.GetString(m_csAnimScript).c_str(), m_AnimMode);
 }

code/fgame/actor_animapi.cpp

@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,321 +23,201 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // actor_animapi.cpp: Base actor animation script
 
 #include "actor.h"
+#include "scriptthread.h"
 
-const_str SimpleActor::GetRunAnim
-	(
-	void
-	)
-
+const_str SimpleActor::GetRunAnim(void)
 {
-	if( m_csCurrentPosition != STRING_PRONE && ( m_csCurrentPosition < STRING_PRONE || m_csCurrentPosition > STRING_CROUCHRUN ) )
-		return STRING_ANIM_RUN_SCR;
-	else
-		return STRING_ANIM_CROUCH_RUN_SCR;
+    if (m_csCurrentPosition == STRING_PRONE) {
+        return STRING_ANIM_CROUCH_RUN_SCR;
+    }
+
+    if (m_csCurrentPosition >= STRING_PRONE && m_csCurrentPosition <= STRING_CROUCHRUN && m_csCurrentPosition >= STRING_CROUCH) {
+        return STRING_ANIM_CROUCH_RUN_SCR;
+    } else {
+        return STRING_ANIM_RUN_SCR;
+    }
 }
 
-const_str SimpleActor::GetWalkAnim
-	(
-	void
-	)
-
+const_str SimpleActor::GetWalkAnim(void)
 {
-	if( m_csCurrentPosition != STRING_PRONE && ( m_csCurrentPosition < STRING_PRONE || m_csCurrentPosition > STRING_CROUCHRUN ) )
-		return STRING_ANIM_WALK_SCR;
-	else
-		return STRING_ANIM_CROUCH_WALK_SCR;
+    if (m_csCurrentPosition == STRING_PRONE) {
+        return STRING_ANIM_CROUCH_WALK_SCR;
+    }
+
+    if (m_csCurrentPosition >= STRING_PRONE && m_csCurrentPosition <= STRING_CROUCHRUN && m_csCurrentPosition >= STRING_CROUCH) {
+        return STRING_ANIM_CROUCH_WALK_SCR;
+    } else {
+        return STRING_ANIM_WALK_SCR;
+    }
 }
 
-void SimpleActor::Anim_Attack
-	(
-	void
-	)
-
+void SimpleActor::Anim_Attack(void)
 {
-	DesiredAnimation(1, m_AttackHandler);
+    DesiredAnimation(ANIM_MODE_NORMAL, m_AttackHandler);
 }
 
-void SimpleActor::Anim_Sniper
-	(
-	void
-	)
-
+void SimpleActor::Anim_Suppress(void)
 {
-	DesiredAnimation(1, m_SniperHandler);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_SUPPRESS_SCR);
 }
 
-void SimpleActor::Anim_Aim
-	(
-	void
-	)
-
+void SimpleActor::Anim_Sniper(void)
 {
-	DesiredAnimation(1, STRING_ANIM_AIM_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, m_SniperHandler);
 }
 
-void SimpleActor::Anim_Shoot
-	(
-	void
-	)
-
+void SimpleActor::Anim_Aim(void)
 {
-	DesiredAnimation(1, STRING_ANIM_SHOOT_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_AIM_SCR);
 }
 
-void SimpleActor::Anim_Idle
-	(
-	void
-	)
-
+void SimpleActor::Anim_Shoot(void)
 {
-	DesiredAnimation(1, STRING_ANIM_IDLE_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_SHOOT_SCR);
 }
 
-void SimpleActor::Anim_Crouch
-	(
-	void
-	)
-
+void SimpleActor::Anim_Idle(void)
 {
-	DesiredAnimation(1, STRING_ANIM_CROUCH_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_IDLE_SCR);
 }
 
-void SimpleActor::Anim_Prone
-	(
-	void
-	)
-
+void SimpleActor::Anim_Crouch(void)
 {
-	DesiredAnimation(1, STRING_ANIM_PRONE_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_CROUCH_SCR);
 }
 
-void SimpleActor::Anim_Stand
-	(
-	void
-	)
-
+void SimpleActor::Anim_Prone(void)
 {
-	DesiredAnimation(1, STRING_ANIM_STAND_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_PRONE_SCR);
 }
 
-void SimpleActor::Anim_Cower
-	(
-	void
-	)
-
+void SimpleActor::Anim_Stand(void)
 {
-	DesiredAnimation(1, STRING_ANIM_COWER_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_STAND_SCR);
 }
 
-void SimpleActor::Anim_Killed
-	(
-	void
-	)
-
+void SimpleActor::Anim_Cower(void)
 {
-	Com_Printf("m_eAnimMode Anim_Killed \n");
-	DesiredAnimation(1, m_DeathHandler);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_COWER_SCR);
 }
 
-void SimpleActor::Anim_StartPain
-	(
-	void
-	)
-
+void SimpleActor::Anim_Killed(void)
 {
-	Com_Printf("m_eAnimMode Anim_StartPain \n");
-	StartAnimation(1, m_PainHandler);
-	
+    DesiredAnimation(ANIM_MODE_NORMAL, m_DeathHandler);
 }
 
-void SimpleActor::Anim_Pain
-	(
-	void
-	)
-
+void SimpleActor::Anim_StartPain(void)
 {
-	ContinueAnimation();
+    StartAnimation(ANIM_MODE_NORMAL, m_PainHandler);
 }
 
-
-void SimpleActor::Anim_CrouchRunTo
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_Pain(void)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_RUN_SCR);
+    ContinueAnimation();
 }
 
-void SimpleActor::Anim_CrouchWalkTo
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_CrouchRunTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_WALK_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_RUN_SCR);
 }
 
-void SimpleActor::Anim_StandRunTo
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_CrouchWalkTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_WALK_SCR);
 }
 
-void SimpleActor::Anim_StandWalkTo
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_StandRunTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_WALK_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SCR);
 }
 
-void SimpleActor::Anim_RunTo
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_StandWalkTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, GetRunAnim());
+    DesiredAnimation(eAnimMode, STRING_ANIM_WALK_SCR);
 }
 
-void SimpleActor::Anim_WalkTo
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, GetWalkAnim());
+    DesiredAnimation(eAnimMode, GetRunAnim());
 }
 
-void SimpleActor::Anim_RunAwayFiring
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunAwayFiring(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNAWAYFIRING_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNAWAYFIRING_SCR);
 }
 
-void SimpleActor::Anim_RunToShooting
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToShooting(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SHOOT_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SHOOT_SCR);
 }
 
-void SimpleActor::Anim_RunToAlarm
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToAlarm(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_ALARM_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_ALARM_SCR);
 }
 
-void SimpleActor::Anim_RunToCasual
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToCasual(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_CASUAL_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_CASUAL_SCR);
 }
 
-void SimpleActor::Anim_RunToCover
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToCover(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_COVER_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_COVER_SCR);
 }
 
-void SimpleActor::Anim_RunToDanger
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToDanger(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DANGER_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DANGER_SCR);
 }
 
-void SimpleActor::Anim_RunToDive
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToDive(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DIVE_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DIVE_SCR);
 }
 
-void SimpleActor::Anim_RunToFlee
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToFlee(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_FLEE_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_FLEE_SCR);
 }
 
-void SimpleActor::Anim_RunToInOpen
-	(
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_RunToInOpen(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_INOPEN_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_INOPEN_SCR);
 }
 
-void SimpleActor::Anim_Emotion
-	(
-	eEmotionMode eEmotMode
-	)
-
+void SimpleActor::Anim_WalkTo(int eAnimMode)
 {
-	m_eEmotionMode = eEmotMode;
+    DesiredAnimation(eAnimMode, GetWalkAnim());
 }
 
-void SimpleActor::Anim_Say
-	(
-	const_str csSayAnimScript,
-	int iMinTimeSinceLastSay,
-	bool bCanInterrupt
-	)
-
+void SimpleActor::Anim_Emotion(eEmotionMode eEmotMode)
 {
-	if (!m_bSayAnimSet || bCanInterrupt)
-	{
-		if (level.inttime > m_iVoiceTime + iMinTimeSinceLastSay)
-		{
-			ScriptThreadLabel label;
-
-			label.TrySetScript(csSayAnimScript);
-			label.Execute(this);
-		}
-	}
+    m_eEmotionMode = eEmotMode;
 }
 
-void SimpleActor::Anim_FullBody
-	(
-	const_str csFullBodyAnim,
-	int eAnimMode
-	)
-
+void SimpleActor::Anim_Say(const_str csSayAnimScript, int iMinTimeSinceLastSay, bool bCanInterrupt)
 {
-	if( m_csAnimName == csFullBodyAnim )
-	{
-		DesiredAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
-	}
-	else
-	{
-		m_csAnimName = csFullBodyAnim;
-		StartAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
-	}
+    if (m_bSayAnimSet && !bCanInterrupt) {
+        return;
+    }
+
+    if (level.inttime <= iMinTimeSinceLastSay + m_iVoiceTime) {
+        return;
+    }
+
+    ScriptThreadLabel label;
+
+    label.TrySetScript(csSayAnimScript);
+    label.Create(this)->Execute();
+}
+
+void SimpleActor::Anim_FullBody(const_str csFullBodyAnim, int eAnimMode)
+{
+    if (m_csAnimName == csFullBodyAnim) {
+        DesiredAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
+    } else {
+        m_csAnimName = csFullBodyAnim;
+        StartAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
+    }
 }