ref_gl: fix texturelist output

.cirrus.yml

@@ -1,10 +1,22 @@
+task:
+  name: freebsd-11-amd64
+  freebsd_instance:
+    image_family: freebsd-11-4
+  setup_script:
+    - pkg update
+    - pkg install -y git sdl2 python
+    - git submodule update --init --recursive
+  test_script:
+    - ./scripts/cirrus/build_freebsd.sh dedicated
+    - ./scripts/cirrus/build_freebsd.sh full
+
 task:
   name: freebsd-12-amd64
   freebsd_instance:
-    image_family: freebsd-12-3
+    image_family: freebsd-12-2
   setup_script:
     - pkg update
-    - pkg install -y git sdl2 python fontconfig
+    - pkg install -y git sdl2 python
     - git submodule update --init --recursive
   test_script:
     - ./scripts/cirrus/build_freebsd.sh dedicated
@@ -13,22 +25,10 @@ task:
 task:
   name: freebsd-13-amd64
   freebsd_instance:
-    image_family: freebsd-13-1
+    image_family: freebsd-13-0-snap
   setup_script:
     - pkg update
-    - pkg install -y git sdl2 python fontconfig
+    - pkg install -y git sdl2 python
-    - git submodule update --init --recursive
-  test_script:
-    - ./scripts/cirrus/build_freebsd.sh dedicated
-    - ./scripts/cirrus/build_freebsd.sh full
-
-task:
-  name: freebsd-14-amd64
-  freebsd_instance:
-    image_family: freebsd-14-0-snap
-  setup_script:
-    - pkg update
-    - pkg install -y git sdl2 python fontconfig
     - git submodule update --init --recursive
   test_script:
     - ./scripts/cirrus/build_freebsd.sh dedicated

.github/workflows/c-cpp.yml

@@ -1,11 +1,6 @@
 name: Build & Deploy Engine
 on: [push, pull_request]
 jobs:
-#  cleanup:
-#    runs-on: self-hosted
-#    steps:
-#    - name: Cleanup
-#      run: rm -rf .* || true
   build:
     runs-on: ${{ matrix.os }}
     continue-on-error: true
@@ -13,33 +8,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-18.04
             targetos: linux
             targetarch: amd64
-          - os: ubuntu-20.04
+          - os: ubuntu-18.04
             targetos: linux
             targetarch: i386
-#          - os: ubuntu-aarch64-20.04
-#            targetos: linux
-#            targetarch: aarch64
 
-#          - os: ubuntu-20.04
+          - os: ubuntu-18.04
-#            targetos: android
+            targetos: android
-#            targetarch: 32
+            targetarch: 32
-#          - os: ubuntu-20.04
+          - os: ubuntu-18.04
-#            targetos: android
+            targetos: android
-#            targetarch: 64
+            targetarch: 64
 
-#          - os: ubuntu-20.04
+          - os: ubuntu-18.04
-#            targetos: motomagx
+            targetos: motomagx
-#            targetarch: armv6
+            targetarch: armv6
 
-          - os: ubuntu-20.04
-            targetos: nswitch
-            targetarch: arm64
-          - os: ubuntu-20.04
-            targetos: psvita
-            targetarch: armv7hf
           - os: windows-latest
             targetos: win32
             targetarch: amd64
@@ -47,80 +33,38 @@ jobs:
             targetos: win32
             targetarch: i386
     env:
-      SDL_VERSION: 2.26.2
+      SDL_VERSION: 2.0.14
       GH_CPU_ARCH: ${{ matrix.targetarch }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ANDROID_SDK_TOOLS_VER: 4333796
+      ANDROID_NDK_VER: r10e
+      UPLOADTOOL_ISPRERELEASE: true
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         submodules: recursive
+    - name: Checkout xash-extras
+      uses: actions/checkout@v2
+      with:
+        repository: FWGS/xash-extras
+        path: xash-extras
+
     - name: Install dependencies
       run: bash scripts/gha/deps_${{ matrix.targetos }}.sh
+
     - name: Build engine
       run: bash scripts/gha/build_${{ matrix.targetos }}.sh
-    - name: Upload engine (artifacts)
+
-      uses: actions/upload-artifact@v3
+    - name: Upload engine (android)
-      with:
+      if: matrix.targetos == 'android'
-        name: artifact-${{ matrix.targetos }}-${{ matrix.targetarch }}
+      run: bash scripts/continious_upload.sh xashdroid-${{ matrix.targetarch }}.apk
-        path: artifacts/*
+    - name: Upload engine (motomagx)
-  flatpak:
+      if: matrix.targetos == 'motomagx'
-    name: "Flatpak"
+      run: bash scripts/continious_upload.sh xash3d-fwgs-magx.7z
-    runs-on: ubuntu-latest
+    - name: Upload engine (linux)
-    strategy:
+      if: matrix.targetos == 'linux'
-      matrix:
+      run: bash scripts/continious_upload.sh xash3d-fwgs-${{ matrix.targetarch }}.AppImage xashds-linux-${{ matrix.targetarch }}
-        include:
+    - name: Upload engine (windows)
-          - app: su.xash.Engine.Compat.i386
+      if: matrix.targetos == 'win32'
-    container:
+      run: bash scripts/continious_upload.sh xash3d-fwgs-win32-${{ matrix.targetarch }}.7z
-      image: bilelmoussaoui/flatpak-github-actions:freedesktop-22.08
-      options: --privileged
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    - name: Build flatpak (Compat.i386)
-      uses: FWGS/flatpak-github-actions/flatpak-builder@v5
-      with:
-        bundle: ${{ matrix.app }}.flatpak
-        manifest-path: scripts/flatpak/${{ matrix.app }}.yml
-    - name: Upload engine (artifacts)
-      uses: actions/upload-artifact@v3
-      with:
-        name: artifact-${{ matrix.targetos }}-${{ matrix.targetarch }}
-        path: artifacts/*
-  release:
-    name: "Upload releases"
-    runs-on: ubuntu-latest
-    needs: [build, flatpak]
-    if: ${{ github.event_name == 'push' }}
-    steps:
-    - name: Remove old release
-      uses: FWGS/delete-tag-and-release@v0.2.1-dev
-      with:
-        tag_name: ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }}
-        delete_release: true
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Fetch artifacts
-      uses: actions/download-artifact@v3.0.1
-      with:
-        path: artifacts/
-    - name: Repackage binaries and allow GitHub to process removed release for few seconds
-      run: |
-        cd artifacts/
-        for i in artifact-* su.xash.Engine.*; do
-          mv "$i"/* .
-          rm -rf "$i"
-        done
-        ls -R .
-        cd ../
-        sleep 20s
-    - name: Upload new release
-      uses: FWGS/action-gh-release@v0.1.15
-      with:
-        name: Xash3D FWGS Continuous ${{ github.ref_name }} Build
-        tag_name: ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }}
-        prerelease: true
-        token: ${{ secrets.GITHUB_TOKEN }}
-        files: artifacts/*
-        draft: false

.gitignore

@@ -332,4 +332,3 @@ __pycache__
 *.code-workspace
 .history/*
 .cache/*
-enc_temp_folder/

.gitmodules

@@ -1,21 +1,15 @@
 [submodule "mainui"]
-	path = 3rdparty/mainui
+	path = mainui
 	url = https://github.com/FWGS/mainui_cpp
 [submodule "ref_gl/nanogl"]
-	path = 3rdparty/nanogl
+	path = ref_gl/nanogl
 	url = https://github.com/FWGS/nanogl
 [submodule "ref_gl/gl-wes-v2"]
-	path = 3rdparty/gl-wes-v2
+	path = ref_gl/gl-wes-v2
 	url = https://github.com/FWGS/gl-wes-v2
+[submodule "vgui-dev"]
+	path = vgui-dev
+	url = https://github.com/FWGS/vgui-dev
 [submodule "ref_gl/gl4es"]
-	path = 3rdparty/gl4es/gl4es
+	path = ref_gl/gl4es
 	url = https://github.com/ptitSeb/gl4es
-[submodule "vgui_support"]
-	path = 3rdparty/vgui_support
-	url = https://github.com/FWGS/vgui_support
-[submodule "opus"]
-	path = 3rdparty/opus/opus
-	url = https://github.com/xiph/opus
-[submodule "3rdparty/xash-extras"]
-	path = 3rdparty/extras/xash-extras
-	url = https://github.com/FWGS/xash-extras

.travis.yml

@@ -0,0 +1,35 @@
+language: c
+compiler: gcc
+sudo: false
+env:
+  global:
+    - SDL_VERSION=2.0.14
+git:
+  depth: 50
+  submodules: true
+
+os: linux
+arch:
+  - aarch64
+  - ppc64le
+  - s390x
+addons:
+  apt:
+    update: true
+    packages:
+      - libx11-dev
+      - libxext-dev
+      - x11-utils
+      - libgl1-mesa-dev
+      - libasound-dev
+      - libstdc++6
+      - libfuse2
+      - unzip
+before_script:
+  - sh scripts/travis/deps_common.sh
+  - sh scripts/travis/deps_${TRAVIS_OS_NAME}.sh
+script:
+  - sh scripts/travis/build_${TRAVIS_OS_NAME}.sh
+after_script:
+  - ccache --show-stats
+  - sh scripts/continious_upload.sh xash3d-fwgs-${ARCH}.tar.xz xashds-linux-${ARCH}

3rdparty/extras/wscript

@@ -1,29 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os
-
-def options(opt):
-	pass
-
-def configure(conf):
-	if not conf.path.find_dir('xash-extras'):
-		conf.fatal('Can\'t find xash-extras submodule.')
-		return
-
-	conf.load('zip')
-
-def build(bld):
-	srcdir = bld.path.find_dir('xash-extras')
-
-	if bld.env.DEST_OS in ['android']:
-		install_path = bld.env.PREFIX
-	else:
-		install_path = os.path.join(bld.env.SHAREDIR, bld.env.GAMEDIR)
-
-	bld(features='zip',
-		name = 'extras.pk3',
-		files = srcdir.ant_glob('**/*'),
-		relative_to = srcdir,
-		compresslevel = 0,
-		install_path = install_path)

3rdparty/gl4es/wscript

@@ -1,24 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os
-
-def options(opt):
-	pass
-
-def configure(conf):
-	if not conf.path.find_dir('gl4es') or not conf.path.find_dir('gl4es/src'):
-		conf.fatal('Can\'t find gl4es submodule. Run `git submodule update --init --recursive`.')
-		return
-
-def build(bld):
-	gl4es_srcdir = bld.path.find_node('gl4es/src')
-
-	bld.stlib(source   = gl4es_srcdir.ant_glob(['gl/*.c', 'gl/*/*.c', 'glx/hardext.c']),
-		target   = 'gl4es',
-		features = 'c',
-		includes = ['gl4es/src', 'gl4es/src/gl', 'gl4es/src/glx', 'gl4es/include'],
-		defines  = ['NOX11', 'NO_GBM', 'NO_INIT_CONSTRUCTOR', 'DEFAULT_ES=2', 'NOEGL', 'EXTERNAL_GETPROCADDRESS=GL4ES_GetProcAddress', 'NO_LOADER', 'STATICLIB'],
-		cflags   = ['-w', '-fvisibility=hidden', '-std=gnu99'],
-		subsystem = bld.env.MSVC_SUBSYSTEM,
-		export_includes = '.')

3rdparty/opus/wscript

@@ -1,40 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os
-
-def options(opt):
-	pass
-
-def configure(conf):
-	if not conf.path.find_dir('opus') or not conf.path.find_dir('opus/src'):
-		conf.fatal('Can\'t find opus submodule. Run `git submodule update --init --recursive`.')
-		return
-
-	# TODO: ARM/x86 intrinsics detection
-	# TODO: maybe call autotools/cmake/meson instead?
-
-def build(bld):
-	sources = bld.path.ant_glob([
-		'opus/src/*.c',
-		'opus/celt/*.c',
-		'opus/silk/*.c',
-		'opus/silk/float/*.c'
-	], excl = [
-		'opus/src/repacketizer_demo.c',
-		'opus/src/opus_demo.c',
-		'opus/src/opus_compare.c',
-		'opus/celt/opus_custom_demo.c'
-	])
-	includes = ['opus/include/', 'opus/celt/', 'opus/silk/', 'opus/silk/float/']
-	defines = ['USE_ALLOCA', 'OPUS_BUILD', 'FLOAT_APPROX', 'PACKAGE_VERSION="1.3.1"', 'CUSTOM_MODES']
-
-	bld.stlib(
-		source = sources,
-		target = 'opus',
-		features = 'c',
-		includes = includes,
-		defines = defines,
-		subsystem = bld.env.MSVC_SUBSYSTEM,
-		export_includes = ['opus/include/']
-	)

Documentation/bug-compatibility.md

@@ -1,17 +0,0 @@
-# Bug-compatibility in Xash3D FWGS
-
-Xash3D FWGS has special mode for games that rely on original engine bugs.
-
-In this mode, we emulate the behaviour of selected functions that may help running mods relying on engine bugs, but enabling them by default may break majority of other games.
-
-At this time, we only have implemented GoldSrc bug-compatibility. It can be enabled with `-bugcomp` command line switch.
-
-## GoldSrc bug-compatibility
-
-### Emulated bugs
-
-* `pfnPEntityOfEntIndex` in GoldSrc returns NULL for last player due to incorrect player index comparison
-
-### Games and mods that require this
-
-* Counter-Strike: Condition Zero - Deleted Scenes

Documentation/cross-compiling-for-windows-with-wine.md

@@ -1,9 +0,0 @@
-# Cross-compiling for Windows with Wine
-
-This can be useful to test engine in Wine without using virtual machines or dual-booting to Windows.
-
-0. Clone and install https://github.com/mstorsjo/msvc-wine (you can skip CMake part)
-1. Set environment variable MSVC_WINE_PATH to the path to installed MSVC toolchain
-2. Pre-load wine: `wineserver -k; wineserver -p; wine64 wineboot`
-3. Run `./waf configure -T <build-type> --enable-wine-msvc --sdl2=../SDL2_VC`. Configuration step will take more time than usual.
-4. .. other typical steps to build from console ...

Documentation/debugging-using-minidumps.md

@@ -1,10 +0,0 @@
-# Debugging your mod using minidump files (Windows only)
-Minidump files is awesome instrument for debugging your mod after it's being released, or for catch specific crashes which are presented only in one specific configuration, but doesn't happens in other configurations or even on developer machine. It contains a lot of information useful for debugging, and therefore it size is not so small: around hundreds or even thousands of megabytes. But this is not a problem, since minidump files compresses very effectively using common algorithms.
-There are short algorithm, explaining how to use this debugging instrument:
-
-1. User starts your mod with `-minidumps` startup parameter
-2. Finally, crash happened on user's machine, and minidump file being written. This file has `.mdmp` extension and located in same folder, where mod folder located
-3. User packs this minidump file to .zip/.7z archive, and somehow sends it to developer
-4. Developer just opens minidump file in Visual Studio, then a virtual debugging session is opened and now reasons of crash is pretty easy to detect: you can see call stack, local function variables and global variables, information about exception and a lot of other information
-
-You can find more information about minidumps in this [awesome article](https://learn.microsoft.com/en-us/windows/win32/dxtecharts/crash-dump-analysis?source=recommendations#writing-a-minidump).

Documentation/entity-tools.md

@@ -1,150 +0,0 @@
-# There are few new commands availiable in xash3d fork:
-
-## Commands:
-### ent_create
-Create entity with specified classname and key/values
-
-`ent_create <classname> <key> <value> <key> <value> ...`
-
-for example:
-
-`ent_create monster_zombie targetname zomb1`
-
-after creating entity, ent_last_xxx cvars are set to new entity and ent_last_cb called, look at ent_getvars description
-
-### ent_fire
-
-Make some actions on entity
-
-`ent_fire <pattern> <command> <args>`
-Availiavle commands:
-* Set fields (Only set entity field, does not call any functions):
-   * health
-   * gravity
-   * movetype
-   * solid
-   * rendermode
-   * rendercolor (vector)
-   * renderfx
-   * renderamt
-   * hullmin (vector)
-   * hullmax (vector)
-* Actions
-   * rename: set entity targetname
-   * settarget: set entity target (only targetnames)
-   * setmodel: set entity model (does not update)
-   * set: set key/value by server library
-       * See game FGD to get list.
-       * command takes two arguments
-   * touch: touch entity by current player.
-   * use: use entity by current player.
-   * movehere: place entity in player fov.
-   * drop2floor: place entity to nearest floor surface
-   * moveup: move entity to 25 units up
-   * moveup (value): move by y axis relatively to specified value
-* Flags (Set/clear specified flag bit, arg is bit number):
-   * setflag
-   * clearflag
-   * setspawnflag
-   * clearspawnflag
-
-### ent_info
-Print information about entity by identificator
-
-`ent_info <identificator>`
-
-### ent_getvars
-Set client cvars containing entity information (useful for [[Scripting]]) and call ent_last_cb
-
-`ent_getvars <identificator>`
-
-These cvars are set:
-```
-ent_last_name
-ent_last_num
-ent_last_inst
-ent_last_origin
-ent_last_class
-```
-
-### ent_list
-Print short information about antities, filtered by pattern
-
-`ent_list <pattern>`
-
-## Syntax description
-
-### \<identificator\>
-
-* !cross: entity under aim
-* Instance code: !\<number\>_\<seria\l>
- * set by ent_getvars command
-* Entity index
-* targetname pattern
-
-### \<pattern\>
-
-Pattern is like identificator, but may filter many entities by classname
-
-### (vector)
-
-used by ent_fire command. vector means three float values, entered without quotes
-
-### key/value
-
-All entities parameters may be set by specifiing key and value strings.
-
-Originally, this mechanizm is used in map/bsp format, but it can be used in enttools too.
-
-Keys and values are passed to server library and processed by entity keyvalue function, setting edict and entity owns parameters.
-
-If value contains spaces, it must be put in quotes:
-
-`ent_fire !cross set origin "0 0 0"`
-
-## Using with scripting
-
-ent_create and ent_getvars commands are setting cvars on client
-
-It can be used with ent_last_cb alias that is executed after setting cvars.
-
-Simple example:
-
-```
-ent_create weapon_c4
-alias ent_last_cb "ent_fire \$ent_last_inst use"
-```
-
-Use weapon_c4 after creating it.
-
-Note that you cannot use many dfferent callbacks at the same time.
-
-You can set entity name by by pattern and create special script, contatning all callbacks.
-
-Example:
-
-example.cfg
-```
-alias ent_last_cb exec entity_cb.cfg
-ent create \<class\> targetname my_ent1_$name
-ent_create \<class\> targetname my_ent2_$name
-```
-entity_cb.cfg
-```
-if $ent_last_name == my_ent1_$name
-:(ent1 actions)
-if $ent_last_name == my_ent2_$name
-:(ent2 actions)
-```
-Note that scripting cannot be blocking. You cannot wait for server answer and continue. But you can use small scripts, connected with ent_last_cb command. The best usage is user interaction. You can add touch buttons to screen or call user command menu actions by callbacks.
-##  Server side
-
-To enable entity tools on server, set sv_enttools_enable to 1
-
-To change maximum number of entities, touched by ent_fire, change sv_enttools_maxfire to required number.
-
-To enable actions on players, set sv_enttools_players to 1.
-
-To enable entity tools for player by nickname, set sv_enttools_godplayer to nickname. Useful to temporary enable from rcon.
-
-To prevent crash on some actions, set host_mapdesign_fatal to 0

Documentation/extensions/expanded-common-structures.md

@@ -1,8 +0,0 @@
-# Expanded structures that used by engine and mods
-To make porting and developing mods on 64-bit platforms less painful, we decided to expand size of several structures.
-This information important in case you are using codebase like XashXT, Paranoia 2: Savior and want to compile your mod for platform with 64-bit pointer size: you should replace old definitions with new ones, otherwise your mod will not work with Xash3D FWGS (typically, it's just crashing when starting map).
-| Structure name | Locates in file | Original size on 64-bit | Current size on 64-bit |
-|----------------|-----------------|-------------------------|------------------------|
-|`mfaceinfo_t` | `common/com_model.h` | 176 bytes |  304 bytes |
-|`decal_s` | `common/com_model.h` | 72 bytes |  88 bytes |
-|`mextrasurf_t` | `common/com_model.h` | 376 bytes |  504 bytes |

Documentation/extensions/library-naming.md

@@ -31,14 +31,11 @@ Issue #0. Inconsistency between ABI and Q_buildarch.\
 Resolution: Change Q_buildarch return value to use Debian-styled architectures list: https://www.debian.org/ports/, which includes a special naming for big/little-endian and hard/soft-float ARM.
 
 Issue #1: Build-system integration.\
-Resolution: implemented as [LibraryNaming.cmake](https://github.com/FWGS/hlsdk-portable/blob/master/cmake/LibraryNaming.cmake) and [library_naming.py](https://github.com/FWGS/hlsdk-portable/blob/master/scripts/waifulib/library_naming.py) extensions, see 
+Resolution: implemented as [LibraryNaming.cmake](https://github.com/FWGS/hlsdk-xash3d/blob/master/cmake/LibraryNaming.cmake) and [library_naming.py](https://github.com/FWGS/hlsdk-xash3d/blob/master/scripts/waifulib/library_naming.py) extensions, see 
 
 Issue #2(related to #0): Which ARM flavours we actually need to handle?\
 Resolution: Little-endian only, as there is no known big-endian ARM platforms in the wild.
 Architecture is coded this way:
 * ```armvxy```, where `x` is ARM instruction set level and `y` is hard-float ABI presence: `hf` where hard float ABI used, otherwise `l`.
 
-Issue #3: Some mods (like The Specialists, Tyrian, ...) already apply suffixes _i386, _i686 to the gamedll path:\
-Resolution: On x86 on **Win/Lin/Mac**, don't change anything. Otherwise, strip the _i?86 part and follow the usual scheme.
-
 See discussion: https://github.com/FWGS/xash3d-fwgs/issues/39

Documentation/extensions/mp3-loops.md

@@ -1,22 +0,0 @@
-## Looping MP3 extension
-
-It is now possible to loop MP3 file in Xash3D FWGS by adding a custom text tag with `LOOP_START` or `LOOPSTART` in description and time point (in raw samples) in value.
-
-### Example with foobar2000
-1. Open Foobar2000
-2. Add your .mp3 file to playlist
-3. Right click to newly added file and select Properties
-4. In Metadata tab, at the bottom of the table, select "+add new"
-5. In newly added line replace `<60>input field name<6D>` with `LOOP_START` (without any symbols).
-6. Press Tab and enter loop time point in raw samples. For example, `0` will replay sound file from beginning to end indefinitely.
-
-### Possible alternatives
-1. Classic WAV files looping. HQ WAV files can take too much disk space, and recommended software supporting cue points is paid, outdated and can't run on modern systems. (Although there is alternative that's proven to work with idTech-based engines called LoopAuditioneer.)
-2. Vorbis looping through comment. Engine doesn't support Vorbis but this extension was highly inspired by this hack.
-
-### Known bugs and limitations
-1. At this time using MP3 as SFX requires complete decoding. This can cause noticeable stutters, so keep MP3 file length in mind.
-2. We deliberately only support modern ID3v2.3 and ID3v2.4 tags. Using ID3v1 is not possible.
-
-
-

Documentation/mod-porting-guide.md

@@ -1,40 +1,7 @@
-# Self-made port
+# Server porting
-## Compatibility with RISC architectures
-### Unaligned access
-Unaligned access on **i386** causes only performance penalty, but on **RISC** it can cause unstable work.
-
-For HLSDK at least you need such patches in util.cpp:
- - https://github.com/FWGS/halflife/commit/7bfefe86e35d67867ae7af830ac1fc38f2908360
- - https://github.com/FWGS/hlsdk-portable/commit/617d75545f2ecb9b2d46cc30728dc37c9eb6d35e
-
-### Signed chars
-`char` type defined as **signed** for **x86** and as **unsigned** for **arm**.
-
-And sometimes such difference can break logic.
-
-As a solution you can use `signed char` type in code directly or use `-fsigned-char` option for gcc/clang compilers.
-
-For HLSDK at least you need such [fix](https://github.com/FWGS/hlsdk-portable/commit/1ca34fcb4381682bd517612b530db22a1354a795) in nodes.cpp/.h.
-
-## Compatibility with 64bit architectures
-You need list of patches for Studio Model Render, MAKE_STRING macro and nodes:
- - https://github.com/FWGS/hlsdk-portable/commit/d287ed446332e615ab5fb25ca81b99fa14d18a73
- - https://github.com/FWGS/hlsdk-portable/commit/3bce17e3a04f8af10a927a07ceb8ab0f09152ec4
- - https://github.com/FWGS/hlsdk-portable/commit/9ebfc981773ec4c7a89ffe52d9c249e1fbef9634
- - https://github.com/FWGS/hlsdk-portable/commit/00833188dab87ef5746286479ba5aeb9d83b4a0c
- - https://github.com/FWGS/hlsdk-portable/commit/4661b5c1a5245b27a5532745c11e44b5540e4172
- - https://github.com/FWGS/hlsdk-portable/commit/2b61380146b1d58a8c465f0e312c061b12bda115
- - https://github.com/FWGS/hlsdk-portable/commit/8ef6cb2427ee16a763103bd3f315f38e2f01cfe2
-
-## Mobility API
-Xash3D FWGS has special extended interface in `mobility_int.h` which adds some new features like vibration on mobile platforms.
-
-## Porting server-side code
 Original valve's server code was compatible with linux and gcc 2.x.
-
 Newer gcc versions have restriction which breaks build.
-
+Now, to make it building with gcc 4.x, you need do following:
-Now, to make it building with gcc 4.x+ or clang, you need to do following:
 * Go to cbase.h and redefine macros as following
 ```
 #define SetThink( a ) m_pfnThink = static_cast <void (CBaseEntity::*)(void)> (&a)
@@ -51,60 +18,58 @@ Now, to make it building with gcc 4.x+ or clang, you need to do following:
 * Replace all SetThink(NULL), SetTouch(NULL), setUse(NULL) and SetBlocked(NULL) by ResetThink(), ResetTouch(), ResetUse() and ResetBlocked()
 * Sometimes you may need to add #include <ctype.h> if functions tolower or isspace are missing
 
-## Porting client-side code
+# Client porting
 
+## VGUI library
+
+Valve's client uses vgui library which is available only on x86 systems and has big amount of mistakes in headers. The best and simplest way of porting is removing VGUI dependency at all.
+Most singleplayer mods don't really use VGUI at all. It is used in multiplayer only to show score table and MOTD window
+
+## Porting 
+
+### First strategy: full port
+
+#### Basic port (Stage 1)
+* First, remove all files and headers which use vgui (contains "vgui" in file name).
+* After that, try to build it and remove vgui includes.
+* Remove all gViewPort usings.
+* Remove all CVoiceManager usings (xash3d does not support voice)
 * Redefine all DLLEXPORT defines as empty field (Place it under _WIN32 macro if you want to keep windows compatibility).
-* Remove hud_servers.cpp and Servers_Init/Servers_Shutdown from hud.cpp.
+* Remove hud_servers.cpp and Servers_Init/Servers_Shutdown from hud.cpp
 * Fix CAPS filenames in includes (like STDIO.H, replace by stdio.h).
-* Replace broken macros as DECLARE_MESSAGE, DECLARE_COMMAND by fixed examples from our hlsdk-portable port (cl_util.h).
+* Replace broken macros as DECLARE_MESSAGE, DECLARE_COMMAND by fixed examples from our hlsdk-xash3d port (cl_util.h)
-* Add ctype.h where is needed (tolower, isspace functions).
+* Add ctype.h where it is need (tolower, isspace functions)
-* Add string.h where is needed (memcpy, strcpy, etc).
+* Add string.h where it is need (memcpy, strcpy, etc)
-* Use in_defs.h from hlsdk-portable.
+* Use in_defs.h from hlsdk_client
-* Add input_xash3d.cpp from hlsdk-portable project to fix input.
+* Add scoreboard_stub.cpp and input_stub.cpp from hlsdk-xash3d to fix linking.
+Now your client should be able to build and work correctly. Add input_xash3d.cpp from hlsdk-xash3d project to fix input.
 
-Now your client should be able to build and work correctly.
+#### Multiplayer fix (Stage 2)
+Look at hlsdk-xash3d project.
 
-# Porting mod to hlsdk-portable
+Main changes are:
-Look at changes which was made.
+* Add MOTD.cpp, scoreboard.cpp and input_xash3d.cpp
+* Add missing functions to hud_redraw.cpp, hud.cpp and tri.cpp, fix class defination in hud.h
+* Remove duplicate functions from hud.cpp and HOOK_MESSAGE's for it
+* Remove +showscores/-showscores hooks from input.h
+* Fix cl_util.h
 
-If there are not too much changes (for example, only some weapons was added), add these changes in hlsdk-portable.
+### Second way: move mod to hlsdk-xash3d
+Look at changes you made in client.
 
-You can use diff with original HLSDK and apply it as patch to hlsdk-portable.
+If there are not much changes (for example, only some weapons was add), add these changes in hlsdk-xash3d.
+
+You may use diff with original HLSDK you used and apply it as patch to hlsdk-xash3d.
 
-```
-NOTE: Many an old mods was made on HLSDK 2.0-2.1 and some rare mods on HLSDK 1.0.
-So you need to have different versions of HLSDK to make diffs.
-Plus different Spirit of Half-Life versions if mod was made on it.
-Also, weapons in old HLSDK versions does not use client weapon prediction system and you may be need to port standart half-life weapons to server side.
-```
 Files must have same line endings (use dos2unix on all files).
 
-We recommend to enable ignoring space changes in diff.
+I recommend to enable ignoring space changes in diff.
+### Writing Makefiles
 
-Move all new files to separate directories.
+Use Makefile from hlsdk-xash3d as Makefile example.
 
-# Possible replacements for non-portable external dependencies
+Get .c and .cpp file lists from Visual Studio project and fill SRCS and SRCS_C variables to Makefile.
-1. If mod uses **fmod.dll** or **base.dll** to play mp3/ogg on client-side or to precache sounds on server-side, you can replace it with:
-	- [pfnPrimeMusicStream](https://github.com/FWGS/hlsdk-portable/blob/master/engine/cdll_int.h#L293=) engine callback;
-	- [miniaudio](https://github.com/mackron/miniaudio);
-	- [phonon](https://community.kde.org/Phonon).
 
-2. If mod uses **OpenGL**, porting code to Xash3D render interface is recommended.
+Remove all files containing vgui in name from list, add missing include dirs.
-
-3. If mod uses **cg.dll**, you can try to port code to [NVFX](https://github.com/tlorach/nvFX).
-
-4. If mod uses detours, comment code or try to find replacement somehow by yourself.
-
-# Additional recommendations
-1. If mod uses STL, you can replace it with [MiniUTL](https://github.com/FWGS/MiniUTL).
-2. Avoid to use dynamic casts to make small size binaries.
-3. Avoid to use exceptions to make small size binaries.
- 
-# Writing build scripts
-
-Use wscript/CMakeLists.txt files from hlsdk-portable as build scripts example.
-
-Get .c and .cpp file lists from Visual Studio project.
-
-Add missing include dirs.
 
+Do same for Android.mk if you are building for android.

Documentation/not-supported-mod-list-and-reasons-why.md

@@ -7,5 +7,6 @@
 |Counter Strike: Condition Zero				|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
 |Counter Strike: Condition Zero - Deleted scenes	|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
 |Day of Defeat						|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
-|Sven-Coop						|5.0+				|Uses custom GoldSrc engine					|
+|Sven-Coop						|5.0+				|Uses filesystem_stdio library which xash3d does not support	|filesystem_stdio replacement already was made: https://github.com/FWGS/filesystem_stdio_xash
+|XDM							|3.0.4.0			|								|
 

Documentation/opensource-mods.md

@@ -17,9 +17,7 @@ Mirrored on github - https://github.com/JoelTroch/am_src_rebirth
 Mirrored on github - https://github.com/nekonomicon/BattleGrounds
 
 ## Bubblemod
-Download page on official site - http://www.bubblemod.org/dl_default.php (dead link!)
+Download page on official site - http://www.bubblemod.org/dl_default.php
-
-Mirrored on github - https://github.com/HLSources/BubbleMod
 
 ## Chicken Fortress
 Official github repository - https://github.com/CKFDevPowered/CKF3Alpha
@@ -27,11 +25,6 @@ Official github repository - https://github.com/CKFDevPowered/CKF3Alpha
 ## Cold Ice
 Version 1.9 is available on ModDB - https://www.moddb.com/mods/cold-ice/downloads/cold-ice-sdk
 
-Version 1.9 mirrored on github - https://github.com/solidi/hl-mods/tree/master/ci
-
-## Cold Ice Ressurection
-Mirrored on github - https://github.com/solidi/hl-mods/tree/master/cir
-
 ## Cthulhu
 Uploaded to github by Oleg Cherkasky - https://github.com/gunrunners-paradise/Cthulhu-HLmod-SDK
 
@@ -45,36 +38,25 @@ Official github repository - https://github.com/adslbarxatov/xash3d-for-ESHQ
 Available on GamerLab - http://gamer-lab.com/eng/code_mods_goldsrc/Half-Life_2D_(Flat-Life)
 
 ## Gang Wars
-Mirrored on github - https://github.com/nekonomicon/gw1.45src
+Mirrored on github - https://github.com/hammermaps/gw1.45src
 
 ## Go-mod
 Versions 2.0 and 3.0, available in mod archives on ModDB - https://www.moddb.com/mods/go-mod/downloads
 
-Version 3.0, mirrored on github - https://github.com/nekonomicon/Go-mod30
-
 ## GT mod
 Available on GamerLab - http://gamer-lab.com/eng/code_mods_goldsrc/GT_mod_(Polnie_ishodniki)
 
-## Half-Life: Advanced Deathmatch
-Mirrored on github - https://github.com/solidi/hl-mods/tree/master/hla
-
-## Half-Life: Decay
-Mirrored on github(PC Port) - https://github.com/hoaxer/Half-Life-Decay
-
 ## Half-Life: Echoes
-Available on ModDB - https://www.moddb.com/mods/half-life-echoes
+Download link on dropbox - https://www.dropbox.com/s/s6j8gtegn10wgvj/dlls.zip?dl=1
 
 ## Half-Life: Expanded Arsenal
 Available on ModDB - https://www.moddb.com/mods/half-life-expanded-arsenal
 
 ## Half-Life: Gravgun mod
-Branch **gravgun** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/gravgun
+Branch **gravgun** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/gravgun
 
 ## Half-Life: Invasion
-Official github repository - https://github.com/jlecorre/hlinvasion
+official github repository - https://github.com/jlecorre/hlinvasion
-
-## Half-Life: Pong
-Mirrored on github - https://github.com/solidi/hl-mods/tree/master/pong
 
 ## Half-Life: Quest Mode
 Available on cs-mapping.com.ua - https://old.cs-mapping.com.ua/forum/showthread.php?t=38030
@@ -110,7 +92,7 @@ Official github repository - https://github.com/desukuran/half-screwed
 Version 1.3 on ModDB - https://www.moddb.com/mods/headcrab-frenzy/downloads/headcrab-frenzy-13-beta-source-code
 
 ## Heart of Evil
-Mirrored on github - https://github.com/nekonomicon/HeartOfEvil
+Available on ModDB - https://www.moddb.com/mods/heart-of-evil/downloads/heart-of-evil-dlls-source-code
 
 ## Ingram Chillin' Mod
 Official SourceForge repository - https://sourceforge.net/projects/icm-hl/
@@ -127,9 +109,6 @@ Official github repository - https://github.com/unknownworlds/NS
 ## Overturn
 Available in mod archive on ModDB - https://www.moddb.com/mods/overturn
 
-## Oz Deathmatch
-Mirrored on github - https://github.com/nekonomicon/OZDM
-
 ## Spirit of Half-Life
 [Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
 
@@ -176,42 +155,42 @@ Mirrored on github - https://github.com/ZXCmod/ZXCmod
 
 # Reimplementation
 ## Absolute Redemption
-Branch **redempt** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/redempt
+Branch **redempt** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/redempt
 
 ## Adrenaline Gamer
 OpenAG by YaLTeR - https://github.com/YaLTeR/OpenAG
 
 ## Afraid of Monsters
-malortie's recreation - https://github.com/malortie/hl-aom
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-aom
 
-Branch **aom** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aom
+Branch **aom** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/aom
 
 ## Afraid of Monsters: Director's cut
-Reverse-engineered code, branch **aomdc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aomdc
+Reverse-engineered code, branch **aomdc** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/aomdc
 
 ## Azure Sheep
-malortie's recreation - https://github.com/malortie/hl-asheep
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-asheep
 
-Reverse-engineered code, branch **asheep** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/asheep
+Reverse-engineered code, branch **asheep** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/asheep
 
 ## Big Lolly
-malortie's recreation - https://github.com/malortie/hl-biglolly
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-biglolly
 
-Branch **biglolly** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/biglolly
+Branch **biglolly** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/biglolly
 
 ## Black Ops
-malortie's recreation - https://github.com/malortie/hl-blackops
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-blackops
 
-Branch **blackops** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/blackops
+Branch **blackops** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/blackops
 
 ## Bloody Pizza: Vendetta
-Branch **caseclosed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/caseclosed
+Branch **caseclosed** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/caseclosed
 
 ## Case Closed
-Branch **caseclosed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/caseclosed
+Branch **caseclosed** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/caseclosed
 
 ## Cleaner's Adventures
-Branch **CAd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/CAd
+Branch **CAd** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/CAd
 
 ## Counter Strike
 Reverse-engineered code of client part by a1batross - https://github.com/FWGS/cs16-client/tree/v1.32
@@ -227,127 +206,116 @@ CSO-like Xash3D-based mod, CSMoE - https://github.com/MoeMod/CSMoE
 Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/crack_life
 
 ## Escape from the Darkness
-malortie's recreation - https://github.com/malortie/hl-eftd
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-eftd
 
-Reverse-engineered code, branch **eftd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/eftd
+Reverse-engineered code, branch **eftd** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/eftd
 
 ## Half-Life: Blue Shift
 Unkle Mike's recreation - https://hlfx.ru/forum/showthread.php?s=&threadid=5253
 
-Reverse-engineered code, branch **bshift** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bshift
+Reverse-engineered code, branch **bshift** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/bshift
 
 ## Half-Life: Induction
-Branch **induction** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/induction
+Branch **induction** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/induction
 
 ## Half-Life: Opposing Force
 Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/hlsdk-xash3d
 
-Reverse-engineered code, clean branch **opfor** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/opfor
+Reverse-engineered code, clean branch **opfor** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/opfor
 
 Spirit of Half Life: Opposing-Force Edition - https://github.com/Hammermaps-DEV/SOHL-V1.9-Opposing-Force-Edition
 
 ## Half-Life: Rebellion
-Reverse-engineered code, branch **rebellion** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/rebellion
+Reverse-engineered code, branch **rebellion** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/rebellion
-
-## Half-Life: Urbicide
-Branch **hl_urbicide** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/hl_urbicide
 
 ## Half-Life: Visitors
-malortie's recreation - https://github.com/malortie/hl-visitors
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-visitors
 
-Reverse-engineered code, branch **visitors** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/visitors
+Reverse-engineered code, branch **visitors** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/visitors
 
 ## Half-Secret
-Branch **half-secret** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/half-secret
+Branch **half-secret** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/half-secret
 
 ## Night at the Office
-malortie's recreation - https://github.com/malortie/hl-nato
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-noffice
 
-Branch **noffice** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/noffice
+Branch **noffice** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/noffice
 
 ## Poke 646
-malortie's recreation - https://github.com/malortie/hl-poke646
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-poke646
 
-Reverse-engineered code, branch **poke646** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646
+Reverse-engineered code, branch **poke646** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/poke646
 
 ## Poke 646: Vendetta
-malortie's recreation - https://github.com/malortie/hl-poke646-vendetta
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-poke646
 
-Reverse-engineered code, branch **poke646_vendetta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646_vendetta
+Reverse-engineered code, branch **poke646_vendetta** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/poke646_vendetta
 
 ## Residual Life
-Reverse-engineered code, branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
+Reverse-engineered code, branch **residual_point** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/residual_point
 
 ## Residual Point
-Reverse-engineered code, branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
+Reverse-engineered code, branch **residual_point** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/residual_point
-
-## Sewer Beta
-Branch **sewer_beta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sewer_beta
 
 ## Team Fortress Classic
 Reverse-engineered code by Velaron - https://github.com/Velaron/tf15-client
 
 ## The Gate
-malortie's recreation - https://github.com/malortie/hl-thegate
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-TheGate
 
-Reverse-engineered code, branch **thegate** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/thegate
+Reverse-engineered code, branch **thegate** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/thegate
 
 ## They Hunger
-malortie's recreation - https://github.com/malortie/hl-theyhunger
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-Hunger
 
-Reverse-engineered code, branch **theyhunger** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/theyhunger
+Reverse-engineered code, branch **theyhunger** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/theyhunger
 
 They Hunger: Tactical - https://www.moddb.com/mods/they-hunger-tactical/downloads/tht-source-code-documentation
 
 ## Times of Troubles
-malortie's recreation - https://github.com/malortie/hl-tot
+malortie's recreation - https://github.com/malortie/halflife/tree/mod-hl-tot
 
-Branch **tot** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/tot
+Branch **tot** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/tot
 
 # Derived work
 ## Adrenaline Gamer
-Branch **aghl** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aghl
+Branch **aghl** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/aghl
 
 ## Bubblemod
-Branch **bubblemod** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bubblemod
+Branch **bubblemod** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/bubblemod
 
 ## Deathmatch Classic
 Deathmatch Classic: Adrenaline Gamer Edition - https://github.com/martinwebrant/agmod/tree/master/src/dmc
 
 Deathmatch Quaked - https://www.moddb.com/games/deathmatch-classic/downloads/dmq2
 
-Branch **dmc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/dmc
+Branch **dmc** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/dmc
 
 ## Half-Life: Echoes
-Branch **echoes** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/echoes
+Branch **echoes** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/echoes
 
 ## Half-Life: Invasion
-Port to HLSDK 2.4 by malortie - https://github.com/malortie/hl-invasion
+Port to HLSDK 2.4 by malortie - https://github.com/malortie/halflife/tree/mod-hl-invasion
 
 Port to Linux by fmoraw - https://github.com/fmoraw/hlinvasion
 
-Branch **invasion** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/invasion
-
 ## Half-Life: Top-Down
-Branch **hltopdown** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/hltopdown
+Branch **hltopdown** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/hltopdown
 
 ## Half-Screwed
-Branch **half-screwed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/half-screwed
+Branch **half-screwed** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/half-screwed
 
 ## Natural Selection
 Port to Linux - https://github.com/fmoraw/NS
 
-## Spirit of Half-Life
-Version 1.2, branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
-
 ## Swiss Cheese Halloween 2002
-Just more playable version by malortie - https://github.com/malortie/hl-shall
+Just more playable version by malortie - https://github.com/malortie/halflife/tree/mod-hl-halloween
 
-Branch **halloween** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/halloween
+Branch **halloween** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/halloween
 
 ## Threewave CTF
-Branch **dmc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/dmc
+Branch **dmc** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/dmc
 
 ## Zombie-X
-Branch **zombie-x** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/zombie-x
+Branch **zombie-x** in hlsdk-xash3d - https://github.com/FWGS/hlsdk-xash3d/tree/zombie-x
 

Documentation/ports.md

@@ -15,25 +15,24 @@ Status:
 
 Table is sorted by status.
 
-| Platform        | Status                     | Maintainer               | Note
+| Platform        | Status                     | Maintainer           | Note
-| --------        | ------                     | ----------               | ----
+| --------        | ------                     | ----------           | ----
-| Windows         | Supported                  | @a1batross, @SNMetamorph |
+| Windows         | Supported                  | @a1batross           |
-| *BSD            | Supported                  | @nekonomicon             |
+| *BSD            | Supported                  | @nekonomicon         |
-| GNU/Linux(x86, amd64, arm) | Supported       | @a1batross, @mittorn     |
+| GNU/Linux(x86, amd64, arm) | Supported       | @a1batross, @mittorn |
-| Android         | Supported                  | @a1batross, @mittorn     |
+| Android         | Supported                  | @a1batross, @mittorn |
-| MotoMAGX        | Supported                  | @a1batross               |
+| MotoMAGX        | Supported                  | @a1batross           |
-| GNU/Linux(elbrus) | Supported                | @a1batross, @mittorn     | Rare and eventual access to e2k machine
+| GNU/Linux(elbrus) | Supported                | @a1batross, @mittorn | Rare and eventual access to e2k machine
-| Haiku           | Supported                  | not maintained           | Was added by #478 and #483
+| Haiku           | Supported                  | not maintained       | Was added by #478 and #483
-| DOS4GW          | Supported                  | @mittorn                 |
+| DOS4GW          | Supported                  | @mittorn             |
-| GNU/Linux(mipsel) | Supported                | @mittorn                 |
+| GNU/Linux(mipsel) | Supported                | @mittorn             |
-| PSVita          | Supported                  | @fgsfdsfgs               |
+| Switch          | In progress                | @fgsfdsfgs           | [Github Repository](https://github.com/fgsfdsfgs/xash3d-fwgs/tree/switch_new) 
-| Switch          | Supported                  | @fgsfdsfgs               |
+| Wii             | In progress                | Collaborative effort | [Github Repository](https://github.com/saucesaft/xash3d-wii) 
-| Wii             | In progress                | Collaborative effort     | [GitHub Repository](https://github.com/saucesaft/xash3d-wii) 
+| PSP             | In progress                | Collaborative effort | No sources available at this moment
-| PSP             | In progress                | @Crow_bar, @Velaron      | [GitHub Repository](https://github.com/Crow-bar/xash3d-fwgs)
+| Emscripten      | Old Engine                 | not maintained       | 
-| Emscripten      | Old Engine                 | not maintained           | 
+| Oculus Quest    | Old Engine fork            | @DrBeef              | [GitHub Repository](https://github.com/DrBeef/Lambda1VR)
-| Oculus Quest    | Old Engine fork            | @DrBeef                  | [GitHub Repository](https://github.com/DrBeef/Lambda1VR)
+| PSVita          | Old Engine fork            | not maintained       | [GitHub Repository](https://github.com/fgsfdsfgs/vitaXash3D)
-| PSVita          | Old Engine fork            | not maintained           | [GitHub Repository](https://github.com/fgsfdsfgs/vitaXash3D)
+| Switch          | Old Engine fork            | not maintained       | [GitHub Repository](https://github.com/switchports/xash3d-switch)
-| Switch          | Old Engine fork            | not maintained           | [GitHub Repository](https://github.com/switchports/xash3d-switch)
+| 3DS             | Old Engine fork            | not maintained       | [GitHub Repository](https://github.com/masterfeizz/Xash3DS)
-| 3DS             | Old Engine fork            | not maintained           | [GitHub Repository](https://github.com/masterfeizz/Xash3DS)
+| macOS           | Deprecated                 | not maintained       | See GitHub issue #61
-| macOS           | Deprecated                 | not maintained           | See GitHub issue #61
+| iOS             | Deprecated                 | not maintained       | See GitHub issue #61
-| iOS             | Deprecated                 | not maintained           | See GitHub issue #61

Documentation/psvita.md

@@ -1,49 +0,0 @@
-## PlayStation Vita port
-
-### Prerequisites
-1. Make sure your PSVita is [set up to run homebrew applications](https://vita.hacks.guide/).
-2. Install [kubridge](https://github.com/TheOfficialFloW/kubridge/releases/) by copying `kubridge.suprx` to your taiHEN plugins folder (usually `ux0:/tai`) and add it to your `config.txt`, for example:
-   ```
-   *KERNEL
-   ux0:tai/kubridge.skprx
-   ```
-3. Install `libshacccg.suprx` by following [this guide](https://cimmerian.gitbook.io/vita-troubleshooting-guide/shader-compiler/extract-libshacccg.suprx).
-
-### Installation
-1. If you have an old vitaXash3D install, remove it.
-2. Get `xash3d-fwgs-psvita.7z` from the latest [automatic build](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous).
-3. Install `xash.vpk` from the 7z archive onto your PSVita.
-4. Copy the `data` directory from the 7z archive to the root of your PSVita's SD card.
-5. Copy the valve folder and any other mod folders from your Half-Life install to `ux0:/data/xash3d/` (you can use other mountpoints instead of `ux0`). **Do not overwrite anything.**
-
-### Build instructions
-1. Install [VitaSDK](https://vitasdk.org/).
-2. Build and install [vitaGL](https://github.com/Rinnegatamante/vitaGL):
-    ```
-    git clone https://github.com/Rinnegatamante/vitaGL.git
-    make -C vitaGL NO_TEX_COMBINER=1 HAVE_UNFLIPPED_FBOS=1 HAVE_PTHREAD=1 SINGLE_THREADED_GC=1 MATH_SPEEDHACK=1 DRAW_SPEEDHACK=1 HAVE_CUSTOM_HEAP=1 -j2 install
-    ```
-3. Build and install [vita-rtld](https://github.com/fgsfdsfgs/vita-rtld):
-    ```
-    git clone https://github.com/fgsfdsfgs/vita-rtld.git && cd vita-rtld
-    mkdir build && cd build
-    cmake -DCMAKE_BUILD_TYPE=Release ..
-    make -j2 install
-    ```
-4. Build and install [this SDL2 fork](https://github.com/Northfear/SDL) with vitaGL integration:
-    ```
-    git clone https://github.com/Northfear/SDL.git && cd SDL
-    mkdir build && cd build
-    cmake -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DVIDEO_VITA_VGL=ON ..
-    make -j2 install
-    ```
-5. Use `waf`:
-    ```
-    ./waf configure -T release --psvita
-    ./waf build
-    ```
-6. Copy all the resulting `.so` files into a single folder:
-    ```
-    ./waf install --destdir=xash3d
-    ```
-7. `xash.vpk` is located in `build/engine/`.

Documentation/supported-mod-list.md

@@ -46,7 +46,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 16. [Betrayal](http://www.moddb.com/mods/betrayal) (this mod has inner bugs; set **gl_allow_mirrors** to **0** to prevent drops of game's perfomance in some areas)
 17. [Between Two Worlds](https://www.runthinkshootlive.com/posts/between-two-worlds/)
 18. [Black Mesa Energy Testing Chamber](http://twhl.info/competitions.php?results=17)
-19. [Black Mesa Sideline](https://www.moddb.com/mods/black-mesa-sideline) (set **gl_allow_mirrors** to **0** to prevent drops of game's perfomance in some areas)
+19. [Black Mesa Sideline](http://www.isolated-design.de/half-life-mods/black-mesa-sideline/) (set **gl_allow_mirrors** to **0** to prevent drops of game's perfomance in some areas)
 20. [BlackMesa 2007( Black Mesa Missions 2007 )](http://www.moddb.com/addons/blackmesa-2007)
 21. [Blood and Bones](https://www.runthinkshootlive.com/posts/blood-and-bones/)
 22. Boom (Huknenn) v1.0 & [HL Boom: Gold Edition v1.1](http://www.moddb.com/mods/boom)
@@ -103,8 +103,8 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 72. [Freeman](https://www.runthinkshootlive.com/posts/freeman/)
 73. [Freeman's Escape](http://www.moddb.com/mods/freeman-escape-french) (2 maps by *JiggZ*)
 74. [Freeman's Fight](https://www.runthinkshootlive.com/posts/freemans-fight/)
-75. [Freeman's Return](https://www.moddb.com/games/half-life/addons/freemans-return-v12)
+75. [Freeman's Return](http://jpmaps.wz.cz/epizody.htm)
-76. [Freeman's Return 2](https://www.moddb.com/games/half-life/addons/freemans-return-2-v11)
+76. [Freeman's Return 2](http://jpmaps.wz.cz/epizody.htm)
 77. [Freeman's Revenge](https://www.runthinkshootlive.com/posts/freemans-revenge/)
 78. [Freeman's Tomb( The Crypt )](http://twhl.info/vault.php?map=3787)
 79. [G-Invasion v2.5](http://www.moddb.com/mods/g-man-invasion) aka G-Man Invasion (there is an inner crash bug on final titles: some text lines are too long and cannot be properly displayed)
@@ -129,7 +129,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 96. [Haunted](https://www.runthinkshootlive.com/posts/haunted/) (set **sv_validate_changelevel** to **0** to avoid a problem with level change between maps **pagan7** and **pagan8**)
 97. [Hazardous Materials: Episode 1 & 2](http://www.moddb.com/mods/half-life-hazardous-materials)
 98. [Hazardous-Course 2](http://www.moddb.com/mods/hazardous-course-2)
-99. [Help Wanted](https://www.moddb.com/games/half-life/addons/help-wanted)
+99. [Help Wanted](http://maps.mrsucko.org/work/)
 100. [Hidden Evil v1.01](https://www.runthinkshootlive.com/posts/hidden-evil/)
 101. [High Speed](http://www.moddb.com/games/half-life/addons/high-speed-english-version)
 102. [hlife_hotdog_compo26](http://twhl.info/vault.php?map=5181)
@@ -155,7 +155,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 122. [Mario Keys](http://www.moddb.com/mods/mario-keys)
 123. [McBeth](https://www.runthinkshootlive.com/posts/mcbeth/)
 124. [Medieval World](http://www.moddb.com/mods/medieval-world)
-125. [Mel Soaring 2: Star Rancor](https://www.moddb.com/addons/mel-soaring-2-star-rancor)
+125. [Mel Soaring 2: Star Rancor](http://www.etherealhell.com/etherealhell/index.php/my-levels/half-life)
 126. [MINIMICUS](http://twhl.info/vault.php?map=163)
 127. [Mission Failed](http://www.moddb.com/mods/mission-failed)
 128. [Mission MC Poker](http://www.moddb.com/mods/half-life-mission-mc-poker)
@@ -176,7 +176,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 143. [Operation: Nova](http://www.moddb.com/mods/half-life-operation-nova) (there is an inner bug with an M60 machinegun on a map with Osprey: it can be activated and used if you are staying in front of it, not behind it)
 144. [Optimum Fear](https://www.fileplanet.com/7472/0/fileinfo/Optimum-Fear)
 145. [Outrun](http://www.moddb.com/mods/outrun)
-146. [Outwards (Day One)](https://drive.google.com/file/d/1mjQ8wUazYbwTq9Ocg0Vs0raq4avbTRne/view?usp=sharing)
+146. [Outwards (Day One)](http://www.visgi.info/maps/)
 147. [Overhaul Pack](http://www.moddb.com/mods/half-life-overhaul-pack) (Just HD pack for Half-Life)
 148. [P.I.Z.D.E.C.](https://www.runthinkshootlive.com/posts/pizdec/)
 149. [pagoda](http://www.moddb.com/mods/pagoda1)
@@ -184,7 +184,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 151. [Phobos IV](http://www.moddb.com/mods/phobos-iv)
 152. [Pimp My Car](https://www.runthinkshootlive.com/posts/pimp-my-car/) (there is an inner issue with incorrect responses of buttons on combination locks)
 153. [Point Blank – Stackdeath Complex](https://www.runthinkshootlive.com/posts/half-life-point-blank-stackdeath-complex/)
-154. [Prisoner Escaped](https://www.moddb.com/mods/prisoner-escaped-1-2)
+154. [Prisoner Escaped](http://four0four.org/downloads/maps/)
 155. [Prisoner of Event](http://wp.vondur.net/?page_id=40)
 156. [Prisoner of War](https://www.runthinkshootlive.com/posts/prisoner-of-war/)
 157. [Project Quantum Leap](http://www.moddb.com/mods/project-quantum-leap)
@@ -282,7 +282,7 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 6. [Catacombs: Part 1](https://www.runthinkshootlive.com/posts/catacombs/)
 7. [Cro-man's Office Mappack](http://twhl.info/vault.php?map=5547)
 8. [Half-Life Episode Two Demo Alpha v1.0](http://hl.loess.ru/?mod=451)
-9. [Hazardous-Course (first version of Hazardous-Course 2)](https://drive.google.com/file/d/16djJZSpNWKyScSxSyMqX-u_S-2i400rl/view?usp=sharing)
+9. [Hazardous-Course (first version of Hazardous-Course 2)](http://www.richmans-maps.ch.vu/) (link dead!)
 10. [High Tech v0.2](http://hl.loess.ru/?mod=499)
 11. [HL Shadows, Part 1](https://www.fileplanet.com/7466/0/fileinfo/'HL-Shadows',-Part-1)
 12. [HLNewEnd](http://twhl.info/vault.php?map=2275)
@@ -305,11 +305,11 @@ For mappacks - place *.bsp files to **valve/maps** folder, *.wad files to **valv
 29. [Shortcut v1.0 Beta](https://www.runthinkshootlive.com/posts/shortcut/)
 30. [Stoka](https://www.ceskemody.cz/mapy.php?lng=1&clanek=222&razeni_hra=1&pn=stoka)
 31. [Striker's Compo 26](http://twhl.info/vault.php?map=5190) (buggy)
-32. [Technology Test 2](https://drive.google.com/file/d/1LfldzsMIN5j07bgtNkfY5v0Xl0S9de_G/view?usp=sharing)
+32. [Technology Test 2](http://www.richmans-maps.ch.vu/) (link dead!)
 33. [The Gate Playable Demo](https://www.fileplanet.com/116347/110000/fileinfo/The-Gate-Playable-Demo)
 34. [They are Back](https://www.runthinkshootlive.com/posts/they-are-back/)
 35. [Tiefseelabor( Deep Sea Laboratory )](https://www.runthinkshootlive.com/posts/deep-sea-laboratory/)
-36. [Time-Shift](https://drive.google.com/file/d/1pK1s-2SIlSMQHVRPMLdC_94wTa__8_DX/view?usp=sharing)
+36. [Time-Shift](http://www.richmans-maps.ch.vu/) (link dead!)
 37. [Train Single Beta](https://cs-mapping.com.ua/forum/showthread.php?t=36394) (Remove **gfx.wad** from **TrainSingle** folder)
 38. [WAR: The Killer Beta 0.1](http://www.moddb.com/mods/war)
 39. [White Force Beta( Residual Point prototype )](http://www.moddb.com/mods/hl-residual-point/downloads/white-force-beta-2002)
@@ -379,7 +379,7 @@ Mods:
 5. [Half-Life Baby v1.4](http://www.moddb.com/games/half-life/addons/half-life-baby) (it's an unfinished but playable mod; after installing of the mod open **liblist.gam** or **gameinfo.txt** file in the mod's folder and correct the line **gamedll "..\hlbaby\dlls\hl.dll"** for **gamedll "dlls\hl.dll"**, otherwise you'll not be able to start a game)
 6. [Half-Secret](http://www.moddb.com/mods/half-secret) (this mod has custom **weapon_snark** code)
 7. [Induction](http://www.moddb.com/mods/half-life-induction) (this mod has new item - **item_flashlight**)
-8. [Lost in Black Mesa(first version without HLFX)](https://drive.google.com/file/d/1bEnm_AxJs-ly8hTEZIQBw_v2BsXdSiGa/view?usp=sharing)
+8. [Lost in Black Mesa(first version without HLFX)](http://half-life.ru/forum/showthread.php?threadid=13959)
 9. [Soldier](http://www.moddb.com/mods/half-life-soldier)
 10. [Solo Operations](http://www.moddb.com/mods/solo-operations)
 11. [The Blood v1.1](http://hl.loess.ru/?mods=&search=The+Blood) (there are some inner bugs in the mod, but they don't interfere with a game progress)
@@ -440,7 +440,7 @@ Mods:
 51. [Data-base](https://www.runthinkshootlive.com/posts/database/)
 52. [de_dust2_azabetfeN](https://cs-mapping.com.ua/forum/showthread.php?t=36394) (remove **cl_dlls** & **dlls** folders from inside of mod's directory before you start the game)
 53. [De-railed](http://twhl.info/competitions.php?results=7)
-54. [Dead Shift Beta](http://www.moddb.com/mods/dead-shift) - [Demo 1](https://www.gamewatcher.com/mods/half-life-mod/dead-shift-1-0-beta) & [Demo 2](https://drive.google.com/file/d/1uHvr8xONogTTNOy-8X6G4ehFV6Eawvbq/view?usp=sharing)
+54. [Dead Shift Beta](http://www.moddb.com/mods/dead-shift) - [Demo 1](https://www.gamewatcher.com/mods/half-life-mod/dead-shift-1-0-beta) & [Demo 2](https://www.gamefront.com/files/13532512) (3rd link dead!)
 55. [Deep](http://twhl.info/vault.php?map=1669)
 56. [Desert Attack](http://fyzzer.narod.ru/index.html)
 57. [Desert Combat Demo](https://www.fileplanet.com/190487/190000/fileinfo/Half-Life---Desert-Combat-Mod) (despite a big file size there's only one small unfinished map)
@@ -469,7 +469,7 @@ Mods:
 80. [Extinct Lifeform Hunt](https://www.fileplanet.com/13501/10000/fileinfo/Extinct-Lifeform-Hunt)
 81. [Facility](http://twhl.info/vault.php?map=5482)
 82. [Facility Escape](http://twhl.info/vault.php?map=3673)
-83. [Fallout](http://www.thewall.de/forum/thread/hl1-sp-48h-mapping-contest/64975.4.html) (map by *simb*) (link dead!)
+83. [Fallout](http://www.thewall.de/forum/thread/hl1-sp-48h-mapping-contest/64975.4.html) (map by *simb*)
 84. [Final Assault](http://twhl.info/vault.php?map=4500)
 85. [Flat](http://hl.loess.ru/?mods=&search=Flat)
 86. [Freeman's Allegiance](https://www.runthinkshootlive.com/posts/freemans-allegiance/)
@@ -498,8 +498,8 @@ Mods:
 109. [Hospital](https://gamebanana.com/maps/167446) (you need to edit **liblist.gam** file in the mod's folder - delete *gamedll & type* strings from it before you start to play)
 110. [Hostage](https://www.runthinkshootlive.com/posts/hostage-2/)
 111. [House](http://www.artpeter.net/Data/HalfLife/Hl.php)
-112. [Impulse 101 Fun - The Train](https://drive.google.com/file/d/1jAuMCCmREH0mfAEAscqaG8FQGa2uNknb/view?usp=sharing) (map from *TWHL* by *Archie* aka *The Hunter*)
+112. [Impulse 101 Fun - The Train](http://web.archive.org/web/20070305075816/http://www.twhl.co.za/mapvault/2817.zip) (map from *TWHL* by *Archie* aka *The Hunter*)
-113. [In America](https://drive.google.com/file/d/1gOC8zfnUvBxRy8Rr8juNiUNbLYjoZpnn/view?usp=sharing)
+113. [In America](http://www.lambda-force.org/load/half_life/karty/half_life_in_america/18-1-0-476)
 114. [In the Kitchen](http://twhl.info/vault.php?map=4314)
 115. [Infiltration](https://www.fileplanet.com/7467/0/fileinfo/Infiltration)
 116. [Interactivity & Lots of Entities](http://twhl.info/vault.php?map=5744) (link dead!)
@@ -668,7 +668,7 @@ Mods:
 279. [X-treme Violence](http://www.moddb.com/mods/x-treme-violence)
 280. [XargoL's Entry for Vassy's Compo](http://twhl.info/vault.php?map=769)
 281. [Xen Again](https://www.fileplanet.com/9132/0/fileinfo/XEN-AGAIN)
-282. [Xen World](http://www.lambda-force.org/load/half_life/karty/half_life_xen_world/18-1-0-481) (link dead!)
+282. [Xen World](http://www.lambda-force.org/load/half_life/karty/half_life_xen_world/18-1-0-481)
 283. [XUnil](https://www.fileplanet.com/7883/0/fileinfo/XUNIL)
 284. [Zeeba-G's TWHL Compo 26 Entry](http://twhl.info/competitions.php?results=26)
 285. [Zombies!](https://gamebanana.com/maps/160812)
@@ -694,7 +694,7 @@ For Linux and OS X you must download crossbuild from [here](http://www.moddb.com
 2. [Big Scientists](http://www.moddb.com/mods/big-scientists)
 3. [Black Silla Assault DEMO v1.2](http://www.moddb.com/mods/black-silla-assault)
 4. [Blbej Den](http://www.moddb.com/mods/blbej-den)
-5. [Cold Experiment v1](https://www.moddb.com/games/half-life/addons/cold-experiment) (you will need some files from SoHL to play it properly; download SoHL 1.2, extract files and copy following folders into **coldexv1** folder: cl_dlls, dlls, models, sprites)
+5. [Cold Experiment v1](http://jpmaps.wz.cz/epizody.htm) (you will need some files from SoHL to play it properly; download SoHL 1.2, extract files and copy following folders into **coldexv1** folder: cl_dlls, dlls, models, sprites)
 6. [Dead Sector v1.0a](http://www.moddb.com/mods/dead-sector)
 7. [Death Is Dead](http://www.moddb.com/games/half-life/addons/death-is-dead) (there is a fog-related inner bug at the first map)
 8. [Escape from Black Mesa Alpha](http://www.moddb.com/mods/escape-from-black-mesa)
@@ -710,9 +710,9 @@ For Linux and OS X you must download crossbuild from [here](http://www.moddb.com
 18. [Santa's Revenge](http://twhl.info/vault.php?map=4332) (set **fps_max** to **60** to avoid an inner problem of the last map with final scripted sequence, otherwise the mod can not be finished properly)
 19. [Sector 6](https://www.moddb.com/mods/sector-6/) 
 20. [Space Prisoner v1.1](http://www.moddb.com/games/half-life/addons/space-prisoner-v11) (after installing of the mod open **liblist.gam** or **gameinfo.txt** file in the mod's folder and correct the line **gamedll "..\prison\dlls\spirit.dll"** for **gamedll "dlls\spirit.dll"**, otherwise you'll not be able to start a game; there is also a scripting error on a third map of the mod, so you'll be forced to use **noclip** to pass around bugged place)
-21. [Terrorist Attack 2](https://www.moddb.com/games/half-life/addons/terrorist-attack-2)
+21. [Terrorist Attack 2](http://terroristattack.wz.cz/mody.html) (link dead!)
 22. [Timeline III: The Heart of Darkness](http://www.moddb.com/mods/timeline-series)
-23. [Underground 2 Demo](https://www.moddb.com/games/half-life/addons/underground-2-demo)
+23. [Underground 2 Demo](http://www.isolated-design.de/half-life-mods/underground-2/)
 
 ## Mods which based on modified Spirit of Half-Life 1.2 or older(Partially playable with SoHL 1.2 libraries or not playable at all)
 1. [Black Death](http://www.moddb.com/mods/half-life-black-death)
@@ -825,10 +825,10 @@ Mods:
 3. [Bomb Squad](http://www.snarkpit.net/index.php?s=maps&map=3471)
 4. [Corruption](http://www.snarkpit.net/index.php?s=maps&map=3154)
 5. [Critical Mass](http://www.moddb.com/mods/half-life-critical-mass) [C3M1 Build 1 Demo](https://www.fileplanet.com/125746/120000/fileinfo/C3M1-Build-1)
-6. [EPRST!](https://www.runthinkshootlive.com/posts/ep-rst/)
+6. [EPRST!](http://www.planetphillip.com/posts/ep-rst-opposing-force/) (link dead!)
 7. [Firing Range](https://www.runthinkshootlive.com/posts/firing-range/)
 8. [Friendly Fire](https://www.runthinkshootlive.com/posts/friendly-fire/)
-9. [Guitar Star Pre-Alpha](http://gamer-lab.com/rus/mods_goldsrc/Guitar_Star_(Prealpha))
+9. [Guitar Star Pre-Alpha](http://hl-lab.ru/eng/mods_goldsrc/Guitar_Star_(Prealpha)) (link dead!)
 10. [J2000](https://www.runthinkshootlive.com/posts/j2000/)
 11. [Killing House for OF](https://www.runthinkshootlive.com/posts/scientist-rescue-aka-cqb/)
 12. [Klabautermann](https://www.runthinkshootlive.com/posts/klabautermann/) (though the map has some inner issues, it can be properly finished, just don't let the welder soldier die and don't press the fifth button until you mount a special gun in its' place)

Documentation/vgui2-support.md

@@ -1,41 +0,0 @@
-# Experimental VGUI2 Support
-
-Thanks to @kungfulon contributions, Xash3D FWGS now supports VGUI2.
-
-VGUI2 is undocumented UI system from Source Engine that GoldSrc used in some games and it's main menu.
-
-## Support status
-
-Doesn't draw anything, doesn't take any input.
-
-## List of games that require VGUI2 support
-
-- Counter-Strike 1.6
-- Counter-Strike: Condition Zero
-- Counter-Strike: Condition Zero Deleted Scenes
-- Day of Defeat
-- Half-Life: Blue Shift
-
-## How to enable VGUI2 support
-
-By default, engine doesn't initialize VGUI2 to not confuse existing games and mods that use or do not use VGUI1. This support also relies on a number of proprietary libraries, that we better not redistribute, so you have to supply them yourself. Keep in mind, that these libraries are compiled only for 32-bit Windows, Linux and OSX, you shouldn't expect them running anywhere else.
-
-1. Download latest Half-Life from Steam.
-2. Open local files.
-3. Copy libraries in the list below according to your platform, to folder where Xash3D searches it's libraries (usually in same folder where executable is located)
-
-| Linux    | Windows
-| -------- | --------
-| `chromehtml.so` | `chromehtml.dll`
-| `vgui2.so` | `vgui2.dll`
-| `libcef.so` | `libcef.dll`
-| `libtier0.so` | `tier0.dll`
-| `libvstdlib.so` | `vstdlib.dll`
-| `libsteam_api.so` | `steam_api.dll`
-
-Some files must also be copied:
-- `cef_gtk.pak`
-
-Additionally, on Linux other libraries must be provided. Use `ldd` tool to figure out which libraries you miss. Many of them can be pulled from Steam Runtime.
-
-Do not recommend using RoDir with VGUI2 games. Many of them are broken. Steam API will crash without `steam_appid.txt` in Xash root directory.

README.md

@@ -1,5 +1,5 @@
 # Xash3D FWGS Engine
-[![GitHub Actions Status](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [![FreeBSD Build Status](https://img.shields.io/cirrus/github/FWGS/xash3d-fwgs?label=freebsd%20build)](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) [![Discord Server](https://img.shields.io/discord/355697768582610945.svg)](http://fwgsdiscord.mentality.rip/) \
+[![GitHub Actions Status](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [![Travis CI Status](https://api.travis-ci.org/FWGS/xash3d-fwgs.svg?branch=master)](https://travis-ci.org/FWGS/xash3d-fwgs) [![FreeBSD Build Status](https://img.shields.io/cirrus/github/FWGS/xash3d-fwgs?label=freebsd%20build)](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) [![Discord Server](https://img.shields.io/discord/355697768582610945.svg)](http://discord.fwgs.ru/) \
 [![Download Stable](https://img.shields.io/badge/download-stable-yellow)](https://github.com/FWGS/xash3d-fwgs/releases/latest) [![Download Testing](https://img.shields.io/badge/downloads-testing-orange)](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous) 
 
 Xash3D FWGS is a fork of Xash3D Engine by Unkle Mike with extended features and crossplatform.
@@ -18,25 +18,25 @@ Read more about Xash3D on ModDB: https://www.moddb.com/engines/xash3d-engine
 * Mobility API: allows better game integration on mobile devices(vibration, touch controls)
 * Different input methods: touch, gamepad and classic mouse & keyboard.
 * TrueType font rendering, as a part of mainui_cpp.
-* Multiple renderers support: OpenGL, GLESv1, GLESv2, Software.
+* Multiple renderers support: OpenGL, GLESv1, GLESv2, Software
-* Voice support.
-* External filesystem module like in GoldSrc engine.
-* External vgui support module.
-* PNG image format support.
 * A set of small improvements, without broken compatibility.
 
 ## Planned fork features
-* Virtual Reality support and game API.
+* Virtual Reality support and game API
-* Vulkan renderer.
+* Voice support
+* Vulkan renderer
 
 ## Installation & Running
-0) Get Xash3D FWGS binaries: you can use [testing](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous) build or you can compile engine from source code.
+0) Get Xash3D binaries: you can use [testing](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous) build or you can compile engine from source code.
+Choose proper build package depending on which platform you're using.
 1) Copy engine binaries to some directory.
 2) Copy `valve` directory from [Half-Life](https://store.steampowered.com/app/70/HalfLife/) to directory with engine binaries.
-If your CPU is NOT x86 compatible or you're running 64-bit version of the engine, you may want to compile [Half-Life SDK](https://github.com/FWGS/hlsdk-portable).
+Also if you're using Windows: you should copy `vgui.dll` library from Half-Life directory to Xash3D directory.
-This repository contains our fork of HLSDK and restored source code for some of the mods. Not all of them, of course.
+As alternative, you can compile [hlsdk-xash3d](https://github.com/FWGS/hlsdk-xash3d) instead of using official Valve game binaries, but you still needed to copy `valve` directory as all game resources located in there.
-You still needed to copy `valve` directory as all game resources located there.
+3) Download [extras.pak](https://github.com/FWGS/xash-extras/releases/tag/v0.19.2) and place it to `valve` directory.
-3) Run the main executable (`xash3d.exe` or AppImage).
+4) Run `xash3d.exe`/`xash3d.sh`/`xash3d` depending on which platform you're using.
+
+Note: on Linux, you may need to create an sh file with the command `LD_LIBRARY_PATH=. ./xash3d`.
 
 For additional info, run Xash3D with `-help` command line key.
 
@@ -51,13 +51,6 @@ We are using Waf build system. If you have some Waf-related questions, I recomme
 NOTE: NEVER USE GitHub's ZIP ARCHIVES. GitHub doesn't include external dependencies we're using!
 
 ### Prerequisites
-
-If your CPU is x86 compatible, we are building 32-bit code by default. This was done to maintain compatibility with Steam releases of Half-Life and based on it's engine games.
-Even if Xash3D FWGS does support targetting 64-bit, you can't load games without recompiling them from source code!
-
-If your CPU is NOT x86 compatible or you decided build 64-bit version of engine, you may want to compile [Half-Life SDK](https://github.com/FWGS/hlsdk-portable).
-This repository contains our fork of HLSDK and restored source code for some of the mods. Not all of them, of course.
-
 #### Windows (Visual Studio)
 * Install Visual Studio.
 * Install latest [Python](https://python.org) **OR** run `cinst python.install` if you have Chocolatey.
@@ -67,6 +60,10 @@ This repository contains our fork of HLSDK and restored source code for some of
 * Make sure you have at least 12GB of free space to store all build-time dependencies: ~10GB for Visual Studio, 300 MB for Git, 100 MB for Python and other.
 
 #### GNU/Linux
+NOTE FOR USERS WITH X86 COMPATIBLE CPUs:
+We have forced Waf to throw an error, if you're trying to build 64-bit engine. This was done for keeping compatibility with Steam releases of Half-Life and based on it's engine games.
+Even if Xash3D FWGS does support targetting 64-bit, you can't load games without recompiling them from source code!
+
 ##### Debian/Ubuntu
 * Enable i386 on your system, if you're compiling 32-bit engine on amd64. If not, skip this
 
@@ -84,15 +81,16 @@ This repository contains our fork of HLSDK and restored source code for some of
 0) Open command line
 1) Navigate to `xash3d-fwgs` directory.
 2) Carefully examine which build options are available: `waf --help`
-3) Configure build: `waf configure -T release --sdl2=c:/path/to/SDL2`
+3) Configure build: `waf configure -T release --sdl2=c:/path/to/SDL2 --prefix=c:/path/to/any/output/directory`
 4) Compile: `waf build`
-5) Install: `waf install --destdir=c:/path/to/any/output/directory`
+5) Install: `waf install`
 
 #### Linux
-If compiling 32-bit on amd64, you may need to supply `export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig` prior to running configure.
-
 0) Examine which build options are available: `./waf --help`
-1) Configure build: `./waf configure -T release`
+1) Configure build: `./waf configure -T release --prefix=/path/to/any/output/directory`
 (You need to pass `-8` to compile 64-bit engine on 64-bit x86 processor)
 2) Compile: `./waf build`
-3) Install(optional): `./waf install --destdir=/path/to/any/output/directory`
+3) Install(optional): `./waf install`
+
+Note: if compiling 32-bit on amd64, you may need to supply `export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig` prior to running configure.   
+

common/backends.h

@@ -29,6 +29,12 @@ GNU General Public License for more details.
 #define SOUND_OPENSLES 2
 #define SOUND_ALSA     3
 
+// crash handler (XASH_CRASHHANDLER)
+#define CRASHHANDLER_NULL     0
+#define CRASHHANDLER_UCONTEXT 1
+#define CRASHHANDLER_DBGHELP  2
+#define CRASHHANDLER_WIN32    3
+
 // input (XASH_INPUT)
 #define INPUT_NULL    0
 #define INPUT_SDL     1
@@ -47,7 +53,6 @@ GNU General Public License for more details.
 #define MSGBOX_SDL     1
 #define MSGBOX_ANDROID 2
 #define MSGBOX_WIN32   3
-#define MSGBOX_NSWITCH 4
 
 
 // library loading (XASH_LIB)

common/bspfile.h

@@ -61,27 +61,23 @@ BRUSH MODELS
 #define LS_UNUSED			0xFE
 #define LS_NONE			0xFF
 
-#define MAX_MAP_CLIPNODES_HLBSP 32767
-#define MAX_MAP_CLIPNODES_BSP2  524288
-
 // these limis not using by modelloader but only for displaying 'mapstats' correctly
 #ifdef SUPPORT_BSP2_FORMAT
 #define MAX_MAP_MODELS		2048		// embedded models
 #define MAX_MAP_ENTSTRING		0x200000		// 2 Mb should be enough
 #define MAX_MAP_PLANES		131072		// can be increased without problems
 #define MAX_MAP_NODES		262144		// can be increased without problems
-#define MAX_MAP_CLIPNODES		MAX_MAP_CLIPNODES_BSP2		// can be increased without problems
+#define MAX_MAP_CLIPNODES		524288		// can be increased without problems
 #define MAX_MAP_LEAFS		131072		// CRITICAL STUFF to run ad_sepulcher!!!
 #define MAX_MAP_VERTS		524288		// can be increased without problems
 #define MAX_MAP_FACES		262144		// can be increased without problems
 #define MAX_MAP_MARKSURFACES		524288		// can be increased without problems
 #else
-// increased to match PrimeXT compilers
+#define MAX_MAP_MODELS		768		// embedded models
-#define MAX_MAP_MODELS		1024		// embedded models
 #define MAX_MAP_ENTSTRING		0x100000		// 1 Mb should be enough
 #define MAX_MAP_PLANES		65536		// can be increased without problems
 #define MAX_MAP_NODES		32767		// because negative shorts are leafs
-#define MAX_MAP_CLIPNODES		MAX_MAP_CLIPNODES_HLBSP		// because negative shorts are contents
+#define MAX_MAP_CLIPNODES		32767		// because negative shorts are contents
 #define MAX_MAP_LEAFS		32767		// signed short limit
 #define MAX_MAP_VERTS		65535		// unsigned short limit
 #define MAX_MAP_FACES		65535		// unsigned short limit

common/com_image.h

@@ -9,7 +9,8 @@ NOTE: number at end of pixelformat name it's a total bitscount e.g. PF_RGB_24 ==
 ========================================================================
 */
 #define ImageRAW( type )	(type == PF_RGBA_32 || type == PF_BGRA_32 || type == PF_RGB_24 || type == PF_BGR_24 || type == PF_LUMINANCE)
-#define ImageDXT( type )	(type == PF_DXT1 || type == PF_DXT3 || type == PF_DXT5 || type == PF_ATI2 || type == PF_BC6H_SIGNED || type == PF_BC6H_UNSIGNED || type == PF_BC7)
+#define ImageDXT( type )	(type == PF_DXT1 || type == PF_DXT3 || type == PF_DXT5 || type == PF_ATI2)
+#define Image16( type )	(type == PF_RGBA_64 || type == PF_RGB_48)
 
 typedef enum
 {
@@ -21,13 +22,12 @@ typedef enum
 	PF_RGB_24,	// uncompressed dds or another 24-bit image
 	PF_BGR_24,	// big-endian RGB (MacOS)
 	PF_LUMINANCE,
-	PF_DXT1,		// s3tc DXT1/BC1 format
+	PF_DXT1,		// s3tc DXT1 format
-	PF_DXT3,		// s3tc DXT3/BC2 format
+	PF_DXT3,		// s3tc DXT3 format
-	PF_DXT5,		// s3tc DXT5/BC3 format
+	PF_DXT5,		// s3tc DXT5 format
-	PF_ATI2,		// latc ATI2N/BC5 format
+	PF_ATI2,		// latc ATI2N format
-	PF_BC6H_SIGNED,	// bptc BC6H signed FP16 format
+	PF_RGBA_64,		// 16-bit RGBA
-	PF_BC6H_UNSIGNED, // bptc BC6H unsigned FP16 format
+	PF_RGB_48,		// 16-bit RGB
-	PF_BC7,			// bptc BC7 format
 	PF_TOTALCOUNT,	// must be last
 } pixformat_t;
 
@@ -49,7 +49,6 @@ typedef enum
 	IL_DDS_HARDWARE	= BIT(4),	// DXT compression is support
 	IL_LOAD_DECAL	= BIT(5),	// special mode for load gradient decals
 	IL_OVERVIEW	= BIT(6),	// overview required some unque operations
-	IL_LOAD_PLAYER_DECAL = BIT(7), // special mode for player decals
 } ilFlags_t;
 
 // goes into rgbdata_t->encode
@@ -86,7 +85,7 @@ typedef enum
 	IMAGE_ROT_90	= BIT(18),	// flip from upper left corner to down right corner
 	IMAGE_ROT180	= IMAGE_FLIP_X|IMAGE_FLIP_Y,
 	IMAGE_ROT270	= IMAGE_FLIP_X|IMAGE_FLIP_Y|IMAGE_ROT_90,
-// reserved
+	IMAGE_EMBOSS	= BIT(19),	// apply emboss mapping
 	IMAGE_RESAMPLE	= BIT(20),	// resample image to specified dims
 // reserved
 // reserved

common/com_model.h

@@ -105,7 +105,7 @@ typedef struct
 
 	vec3_t		mins, maxs;	// terrain bounds (fill by user)
 
-	intptr_t	reserved[32];	// just for future expansions or mod-makers
+	int		reserved[32];	// just for future expansions or mod-makers
 } mfaceinfo_t;
 
 typedef struct
@@ -173,8 +173,8 @@ struct decal_s
 	short		entityIndex;	// Entity this is attached to
 // Xash3D specific
 	vec3_t		position;		// location of the decal center in world space.
-	glpoly_t	*polys;		// precomputed decal vertices
+	glpoly_t		*polys;		// precomputed decal vertices
-	intptr_t	reserved[4];	// just for future expansions or mod-makers
+	int		reserved[4];	// just for future expansions or mod-makers
 };
 
 typedef struct mleaf_s
@@ -228,7 +228,7 @@ typedef struct mextrasurf_s
 	unsigned short	numverts;		// world->vertexes[]
 	int		firstvertex;	// fisrt look up in tr.tbn_vectors[], then acess to world->vertexes[]
 
-	intptr_t	reserved[32];	// just for future expansions or mod-makers
+	int		reserved[32];	// just for future expansions or mod-makers
 } mextrasurf_t;
 
 struct msurface_s
@@ -530,7 +530,7 @@ typedef struct
 #define MAX_DEMOS		32
 #define MAX_MOVIES		8
 #define MAX_CDTRACKS	32
-#define MAX_CLIENT_SPRITES	512	// SpriteTextures (0-256 hud, 256-512 client)
+#define MAX_CLIENT_SPRITES	256	// SpriteTextures
 #define MAX_EFRAGS		8192	// Arcane Dimensions required
 #define MAX_REQUESTS	64
 

common/const.h

@@ -725,6 +725,7 @@ typedef int		string_t;
 typedef unsigned short	word;
 
 #include "xash3d_types.h"
+#define Q_isspace( ch )	(ch < 32 || ch > 255)
 
 typedef struct
 {

common/cvardef.h

@@ -25,18 +25,14 @@
 #define FCVAR_PRINTABLEONLY		(1<<7)	// This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
 #define FCVAR_UNLOGGED		(1<<8)	// If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
 #define FCVAR_NOEXTRAWHITEPACE	(1<<9)	// strip trailing/leading white space from this cvar
-#define FCVAR_PRIVILEGED	(1<<10) // only available in privileged mode
-#define FCVAR_FILTERABLE	(1<<11) // filtered in unprivileged mode if cl_filterstuffcmd is 1
 
-// Xash3D extensions
+#define FCVAR_MOVEVARS		(1<<10)	// this cvar is a part of movevars_t struct that shared between client and server
+#define FCVAR_LATCH			(1<<11)	// notify client what this cvar will be applied only after server restart (but don't does more nothing)
 #define FCVAR_GLCONFIG		(1<<12)	// write it into <renderer>.cfg(see RefAPI)
 #define FCVAR_CHANGED		(1<<13)	// set each time the cvar is changed
 #define FCVAR_GAMEUIDLL		(1<<14)	// defined by the menu DLL
 #define FCVAR_CHEAT			(1<<15)	// can not be changed if cheats are disabled
 
-// a1ba: let's reuse higher bits for flags extensions from now on
-#define FCVAR_LATCH			(1<<30)	// notify client what this cvar will be applied only after server restart (but don't does more nothing)
-
 typedef struct cvar_s
 {
 	char		*name;

common/defaults.h

@@ -47,9 +47,7 @@ SETUP BACKENDS DEFINITIONS
 			#endif // XASH_TIMER
 
 			#ifndef XASH_MESSAGEBOX
-				#if !XASH_NSWITCH // SDL2 messageboxes not available
+				#define XASH_MESSAGEBOX MSGBOX_SDL
-					#define XASH_MESSAGEBOX MSGBOX_SDL
-				#endif
 			#endif // XASH_MESSAGEBOX
 		#endif
 	#elif XASH_ANDROID
@@ -70,7 +68,7 @@ SETUP BACKENDS DEFINITIONS
 			#define XASH_MESSAGEBOX MSGBOX_ANDROID
 		#endif // XASH_MESSAGEBOX
 
-		#define XASH_USE_EVDEV 1
+		#define XASH_USE_EVDEV
 		#define XASH_DYNAMIC_DLADDR
 	#elif XASH_LINUX
 		// we are building for Linux without SDL2, can draw only to framebuffer yet
@@ -86,7 +84,7 @@ SETUP BACKENDS DEFINITIONS
 			#define XASH_SOUND SOUND_ALSA
 		#endif // XASH_SOUND
 
-		#define XASH_USE_EVDEV 1
+		#define XASH_USE_EVDEV
 	#elif XASH_DOS4GW
 		#ifndef XASH_VIDEO
 			#define XASH_VIDEO VIDEO_DOS
@@ -107,13 +105,22 @@ SETUP BACKENDS DEFINITIONS
 #ifndef XASH_MESSAGEBOX
 	#if XASH_WIN32
 		#define XASH_MESSAGEBOX MSGBOX_WIN32
-	#elif XASH_NSWITCH
-		#define XASH_MESSAGEBOX MSGBOX_NSWITCH
 	#else // !XASH_WIN32
 		#define XASH_MESSAGEBOX MSGBOX_STDERR
 	#endif // !XASH_WIN32
 #endif // XASH_MESSAGEBOX
 
+//
+// select crashhandler based on defines
+//
+#ifndef XASH_CRASHHANDLER
+	#if XASH_WIN32 && defined(DBGHELP)
+		#define XASH_CRASHHANDLER CRASHHANDLER_DBGHELP
+	#elif XASH_LINUX || XASH_BSD
+		#define XASH_CRASHHANDLER CRASHHANDLER_UCONTEXT
+	#endif // !(XASH_LINUX || XASH_BSD || XASH_WIN32)
+#endif
+
 //
 // no timer - no xash
 //
@@ -150,6 +157,10 @@ SETUP BACKENDS DEFINITIONS
 	#define XASH_INPUT INPUT_NULL
 #endif // XASH_INPUT
 
+#ifndef XASH_CRASHHANDLER
+	#define XASH_CRASHHANDLER CRASHHANDLER_NULL
+#endif // XASH_CRASHHANDLER
+
 /*
 =========================================================================
 
@@ -158,51 +169,25 @@ Default build-depended cvar and constant values
 =========================================================================
 */
 
-// Platform overrides
+#if XASH_MOBILE_PLATFORM
-#if XASH_NSWITCH
-	#define DEFAULT_TOUCH_ENABLE "0"
-	#define DEFAULT_M_IGNORE     "1"
-	#define DEFAULT_MODE_WIDTH   1280
-	#define DEFAULT_MODE_HEIGHT  720
-	#define DEFAULT_ALLOWCONSOLE 1
-#elif XASH_PSVITA
-	#define DEFAULT_TOUCH_ENABLE "0"
-	#define DEFAULT_M_IGNORE     "1"
-	#define DEFAULT_MODE_WIDTH   960
-	#define DEFAULT_MODE_HEIGHT  544
-	#define DEFAULT_ALLOWCONSOLE 1
-#elif XASH_MOBILE_PLATFORM
 	#define DEFAULT_TOUCH_ENABLE "1"
-	#define DEFAULT_M_IGNORE     "1"
+	#define DEFAULT_M_IGNORE "1"
-#endif // !XASH_MOBILE_PLATFORM && !XASH_NSWITCH
+#else // !XASH_MOBILE_PLATFORM
+	#define DEFAULT_TOUCH_ENABLE "0"
+	#define DEFAULT_M_IGNORE "0"
+#endif // !XASH_MOBILE_PLATFORM
 
 #if XASH_ANDROID || XASH_IOS || XASH_EMSCRIPTEN
-	// this means that libraries are provided with engine, but not in game data
+#define XASH_INTERNAL_GAMELIBS
-	// You need add library loading code to library.c when adding new platform
+// this means that libraries are provided with engine, but not in game data
-	#define XASH_INTERNAL_GAMELIBS
+// You need add library loading code to library.c when adding new platform
 #endif // XASH_ANDROID || XASH_IOS || XASH_EMSCRIPTEN
 
-// Defaults
+// allow override for developer/debug builds
-#ifndef DEFAULT_TOUCH_ENABLE
-	#define DEFAULT_TOUCH_ENABLE "0"
-#endif // DEFAULT_TOUCH_ENABLE
-
-#ifndef DEFAULT_M_IGNORE
-	#define DEFAULT_M_IGNORE "0"
-#endif // DEFAULT_M_IGNORE
-
-#ifndef DEFAULT_JOY_DEADZONE
-	#define DEFAULT_JOY_DEADZONE "4096"
-#endif // DEFAULT_JOY_DEADZONE
-
 #ifndef DEFAULT_DEV
 	#define DEFAULT_DEV 0
 #endif // DEFAULT_DEV
 
-#ifndef DEFAULT_ALLOWCONSOLE
-	#define DEFAULT_ALLOWCONSOLE 0
-#endif // DEFAULT_ALLOWCONSOLE
-
 #ifndef DEFAULT_FULLSCREEN
 	#define DEFAULT_FULLSCREEN 1
 #endif // DEFAULT_FULLSCREEN

common/enginefeatures.h

@@ -25,6 +25,5 @@ GNU General Public License for more details.
 #define ENGINE_COMPENSATE_QUAKE_BUG	(1<<5)	// compensate stupid quake bug (inverse pitch) for mods where this bug is fixed
 #define ENGINE_IMPROVED_LINETRACE	(1<<6)	// new traceline that tracing through alphatextures
 #define ENGINE_COMPUTE_STUDIO_LERP	(1<<7)	// enable MOVETYPE_STEP lerping back in engine
-#define ENGINE_LINEAR_GAMMA_SPACE	(1<<8)	// disable influence of gamma/brightness cvars to textures/lightmaps, for mods with custom renderer
 
 #endif//FEATURES_H

common/gameinfo.h

@@ -18,7 +18,6 @@ GNU General Public License for more details.
 
 #define GFL_NOMODELS	(1<<0)
 #define GFL_NOSKILLS	(1<<1)
-#define GFL_RENDER_PICBUTTON_TEXT   (1<<2)
 
 /*
 ========================================================================

common/netadr.h

@@ -16,61 +16,22 @@
 #ifndef NETADR_H
 #define NETADR_H
 
-#include "build.h"
-#include STDINT_H
-
 typedef enum
 {
-	NA_UNUSED = 0,
+	NA_UNUSED,
 	NA_LOOPBACK,
 	NA_BROADCAST,
 	NA_IP,
 	NA_IPX,
-	NA_BROADCAST_IPX,
+	NA_BROADCAST_IPX
-	NA_IP6,
-	NA_MULTICAST_IP6, // all nodes multicast
 } netadrtype_t;
 
-// Original structure:
-// typedef struct netadr_s
-// {
-// 	netadrtype_t	type;
-// 	unsigned char	ip[4];
-// 	unsigned char	ipx[10];
-// 	unsigned short	port;
-// } netadr_t;
-
-#pragma pack( push, 1 )
 typedef struct netadr_s
 {
-	union
+	netadrtype_t	type;
-	{
+	unsigned char	ip[4];
-		struct
+	unsigned char	ipx[10];
-		{
+	unsigned short	port;
-			uint32_t type;
-			union
-			{
-				uint8_t   ip[4];
-				uint32_t  ip4;
-			};
-			uint8_t  ipx[10];
-		};
-		struct
-		{
-#if XASH_LITTLE_ENDIAN
-			uint16_t type6;
-			uint8_t ip6[16];
-#elif XASH_BIG_ENDIAN
-			uint8_t ip6_0[2];
-			uint16_t type6;
-			uint8_t ip6_2[14];
-#endif
-		};
-	};
-	uint16_t port;
 } netadr_t;
-#pragma pack( pop )
-
-STATIC_ASSERT( sizeof( netadr_t ) == 20, "invalid netadr_t size" );
 
 #endif//NETADR_H

common/port.h

@@ -20,6 +20,8 @@ GNU General Public License for more details.
 #include "build.h"
 
 #if !XASH_WIN32
+
+
 	#if XASH_APPLE
 		#include <sys/syslimits.h>
 		#define OS_LIB_EXT "dylib"
@@ -28,41 +30,73 @@ GNU General Public License for more details.
 		#define OS_LIB_EXT "so"
 		#define OPEN_COMMAND "xdg-open"
 	#endif
+
 	#define OS_LIB_PREFIX "lib"
+
+	#if XASH_ANDROID
+		//#if defined(LOAD_HARDFP)
+		//	#define POSTFIX "_hardfp"
+		//#else
+			#define POSTFIX
+		//#endif
+	#else
+	#endif
+
 	#define VGUI_SUPPORT_DLL "libvgui_support." OS_LIB_EXT
 
 	// Windows-specific
 	#define __cdecl
 	#define __stdcall
+
 	#define _inline	static inline
 	#define FORCEINLINE inline __attribute__((always_inline))
 
-	#if XASH_POSIX
+#if XASH_POSIX
-		#include <unistd.h>
+	#define PATH_SPLITTER "/"
-		#if XASH_NSWITCH
+	#include <unistd.h>
-			#define SOLDER_LIBDL_COMPAT
+	#include <dlfcn.h>
-			#include <solder.h>
+	#define O_BINARY 0 // O_BINARY is Windows extension
-		#elif XASH_PSVITA
+	#define O_TEXT 0 // O_TEXT is Windows extension
-			#define VRTLD_LIBDL_COMPAT
+	// Windows functions to posix equivalent
-			#include <vrtld.h>
+	#define _mkdir( x )					mkdir( x, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH )
-			#define O_BINARY 0
+	#define LoadLibrary( x )			dlopen( x, RTLD_NOW )
-		#else
+	#define GetProcAddress( x, y )		dlsym( x, y )
-			#include <dlfcn.h>
+	#define FreeLibrary( x )			dlclose( x )
-			#define HAVE_DUP
+	#define tell( a )					lseek(a, 0, SEEK_CUR)
-			#define O_BINARY 0
+	#define HAVE_DUP
-		#endif
+#endif
-		#define O_TEXT 0
+
-		#define _mkdir( x ) mkdir( x, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH )
+#if XASH_DOS4GW
-	#endif
+	#define PATH_SPLITTER "\\"
+	#define LoadLibrary( x ) (0)
+	#define GetProcAddress( x, y ) (0)
+	#define FreeLibrary( x ) (0)
+#endif
+	//#define MAKEWORD( a, b )			((short int)(((unsigned char)(a))|(((short int)((unsigned char)(b)))<<8)))
+	#define max( a, b )                 (((a) > (b)) ? (a) : (b))
+	#define min( a, b )                 (((a) < (b)) ? (a) : (b))
+
+	/// TODO: check if we may clean this defines, it should not appear in non-platform code!
+	typedef unsigned char	BYTE;
+	typedef short int	    WORD;
+	typedef unsigned int    DWORD;
+	typedef int	    LONG;
+	typedef unsigned int   ULONG;
+	typedef int			WPARAM;
+	typedef unsigned int    LPARAM;
 
 	typedef void* HANDLE;
+	typedef void* HMODULE;
 	typedef void* HINSTANCE;
 
+	typedef char* LPSTR;
+
 	typedef struct tagPOINT
 	{
 		int x, y;
 	} POINT;
 #else // WIN32
+	#define PATH_SPLITTER "\\"
 	#ifdef __MINGW32__
 		#define _inline static inline
 		#define FORCEINLINE inline __attribute__((always_inline))
@@ -74,6 +108,19 @@ GNU General Public License for more details.
 	#define read _read
 	#define alloca _alloca
 
+	// shut-up compiler warnings
+	#pragma warning(disable : 4244)	// MIPS
+	#pragma warning(disable : 4018)	// signed/unsigned mismatch
+	#pragma warning(disable : 4305)	// truncation from const double to float
+	#pragma warning(disable : 4115)	// named type definition in parentheses
+	#pragma warning(disable : 4100)	// unreferenced formal parameter
+	#pragma warning(disable : 4127)	// conditional expression is constant
+	#pragma warning(disable : 4057)	// differs in indirection to slightly different base types
+	#pragma warning(disable : 4201)	// nonstandard extension used
+	#pragma warning(disable : 4706)	// assignment within conditional expression
+	#pragma warning(disable : 4054)	// type cast' : from function pointer
+	#pragma warning(disable : 4310)	// cast truncates constant value
+
 	#define HSPRITE WINAPI_HSPRITE
 		#define WIN32_LEAN_AND_MEAN
 		#include <winsock2.h>
@@ -83,9 +130,13 @@ GNU General Public License for more details.
 	#define OS_LIB_PREFIX ""
 	#define OS_LIB_EXT "dll"
 	#define VGUI_SUPPORT_DLL "../vgui_support." OS_LIB_EXT
+	#ifdef XASH_64BIT
+		// windows NameForFunction not implemented yet
+		#define XASH_ALLOW_SAVERESTORE_OFFSETS
+	#endif
 	#define HAVE_DUP
-#endif //WIN32
 
+#endif //WIN32
 #ifndef XASH_LOW_MEMORY
 #define XASH_LOW_MEMORY 0
 #endif

common/render_api.h

@@ -82,7 +82,7 @@ typedef enum
 	TF_KEEP_SOURCE	= (1<<1),		// some images keep source
 	TF_NOFLIP_TGA	= (1<<2),		// Steam background completely ignore tga attribute 0x20
 	TF_EXPAND_SOURCE	= (1<<3),		// Don't keep source as 8-bit expand to RGBA
-// reserved
+	TF_ALLOW_EMBOSS	= (1<<4),		// Allow emboss-mapping for this image
 	TF_RECTANGLE	= (1<<5),		// this is GL_TEXTURE_RECTANGLE
 	TF_CUBEMAP	= (1<<6),		// it's cubemap texture
 	TF_DEPTHMAP	= (1<<7),		// custom texture filter used
@@ -107,7 +107,6 @@ typedef enum
 	TF_ARB_FLOAT	= (1<<26),	// float textures
 	TF_NOCOMPARE	= (1<<27),	// disable comparing for depth textures
 	TF_ARB_16BIT	= (1<<28),	// keep image as 16-bit (not 24)
-	TF_MULTISAMPLE	= (1<<29)	// multisampling texture
 } texFlags_t;
 
 typedef enum
@@ -161,7 +160,7 @@ struct ref_viewpass_s;
 typedef struct render_api_s
 {
 	// Get renderer info (doesn't changes engine state at all)
-	intptr_t	(*RenderGetParm)( int parm, int arg );	// generic
+	int		(*RenderGetParm)( int parm, int arg );	// generic
 	void		(*GetDetailScaleForTexture)( int texture, float *xScale, float *yScale );
 	void		(*GetExtraParmsForTexture)( int texture, byte *red, byte *green, byte *blue, byte *alpha );
 	lightstyle_t*	(*GetLightStyle)( int number );

common/synctype.h

@@ -1,24 +0,0 @@
-/*
-synctype.h -- shared synctype_t definition
-Copyright (C) 1996-1997 Id Software, Inc.
-Copyright (C) 2023 Alibek Omarov
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef SYNCTYPE_H
-#define SYNCTYPE_H
-typedef enum {ST_SYNC=0, ST_RAND } synctype_t;
-#endif

common/xash3d_types.h

@@ -2,19 +2,12 @@
 #ifndef XASH_TYPES_H
 #define XASH_TYPES_H
 
-#include "build.h"
+#ifdef _WIN32
-
-#if XASH_IRIX
-#include <port.h>
-#endif
-
-#if XASH_WIN32
 #include <wchar.h> // off_t
 #endif // _WIN32
 
 #include <sys/types.h> // off_t
 #include STDINT_H
-#include <assert.h>
 
 typedef unsigned char byte;
 typedef int		sound_t;
@@ -27,12 +20,7 @@ typedef byte		rgba_t[4];	// unsigned byte colorpack
 typedef byte		rgb_t[3];		// unsigned byte colorpack
 typedef vec_t		matrix3x4[3][4];
 typedef vec_t		matrix4x4[4][4];
-
-#if XASH_64BIT
 typedef uint32_t        poolhandle_t;
-#else
-typedef void*           poolhandle_t;
-#endif
 
 #undef true
 #undef false
@@ -50,7 +38,6 @@ typedef uint64_t longtime_t;
 #define MAX_SERVERINFO_STRING	512	// server handles too many settings. expand to 1024?
 #define MAX_LOCALINFO_STRING	32768	// localinfo used on server and not sended to the clients
 #define MAX_SYSPATH		1024	// system filepath
-#define MAX_VA_STRING	1024	// string length returned by va()
 #define MAX_PRINT_MSG	8192	// how many symbols can handle single call of Con_Printf or Con_DPrintf
 #define MAX_TOKEN		2048	// parse token length
 #define MAX_MODS		512	// environment games that engine can keep visible
@@ -77,48 +64,21 @@ typedef uint64_t longtime_t;
 #define ColorIndex( c )	((( c ) - '0' ) & 7 )
 
 #if defined(__GNUC__)
-	#ifdef __i386__
+#ifdef __i386__
-		#define EXPORT __attribute__ ((visibility ("default"),force_align_arg_pointer))
+#define EXPORT __attribute__ ((visibility ("default"),force_align_arg_pointer))
-		#define GAME_EXPORT __attribute((force_align_arg_pointer))
+#define GAME_EXPORT __attribute((force_align_arg_pointer))
-	#else
+#else
-		#define EXPORT __attribute__ ((visibility ("default")))
+#define EXPORT __attribute__ ((visibility ("default")))
-		#define GAME_EXPORT
+#define GAME_EXPORT
-	#endif
+#endif
-	#define _format(x) __attribute__((format(printf, x, x+1)))
-	#define NORETURN __attribute__((noreturn))
 #elif defined(_MSC_VER)
-	#define EXPORT          __declspec( dllexport )
+#define EXPORT          __declspec( dllexport )
-	#define GAME_EXPORT
+#define GAME_EXPORT
-	#define _format(x)
-	#define NORETURN
 #else
-	#define EXPORT
+#define EXPORT
-	#define GAME_EXPORT
+#define GAME_EXPORT
-	#define _format(x)
-	#define NORETURN
 #endif
 
-#if ( __GNUC__ >= 3 )
-	#define unlikely(x) __builtin_expect(x, 0)
-	#define likely(x)   __builtin_expect(x, 1)
-#elif defined( __has_builtin )
-	#if __has_builtin( __builtin_expect )
-		#define unlikely(x) __builtin_expect(x, 0)
-		#define likely(x)   __builtin_expect(x, 1)
-	#else
-		#define unlikely(x) (x)
-		#define likely(x)   (x)
-	#endif
-#else
-	#define unlikely(x) (x)
-	#define likely(x)   (x)
-#endif
-
-#if defined( static_assert ) // C11 static_assert
-#define STATIC_ASSERT static_assert
-#else
-#define STATIC_ASSERT( x, y ) extern int _static_assert_##__LINE__[( x ) ? 1 : -1]
-#endif
 
 #ifdef XASH_BIG_ENDIAN
 #define LittleLong(x) (((int)(((x)&255)<<24)) + ((int)((((x)>>8)&255)<<16)) + ((int)(((x)>>16)&255)<<8) + (((x) >> 24)&255))
@@ -154,13 +114,9 @@ typedef unsigned int	dword;
 typedef unsigned int	uint;
 typedef char		string[MAX_STRING];
 typedef struct file_s	file_t;		// normal file
+typedef struct wfile_s	wfile_t;		// wad file
 typedef struct stream_s	stream_t;		// sound stream for background music playing
 typedef off_t fs_offset_t;
-#if XASH_WIN32
-typedef int fs_size_t; // return type of _read, _write funcs
-#else /* !XASH_WIN32 */
-typedef ssize_t fs_size_t;
-#endif /* !XASH_WIN32 */
 
 typedef struct dllfunc_s
 {
@@ -176,7 +132,7 @@ typedef struct dll_info_s
 	void		*link;	// hinstance of loading library
 } dll_info_t;
 
-typedef void (*setpair_t)( const char *key, const void *value, const void *buffer, void *numpairs );
+typedef void (*setpair_t)( const char *key, const void *value, void *buffer, void *numpairs );
 
 // config strings are a general means of communication from
 // the server to all connected clients.

engine/alias.h

@@ -16,10 +16,6 @@
 #ifndef ALIAS_H
 #define ALIAS_H
 
-#include "build.h"
-#include STDINT_H
-#include "synctype.h"
-
 /*
 ==============================================================================
 
@@ -43,6 +39,16 @@ Alias models are position independent, so the cache manager can move them.
 #define ALIAS_TRACER2		0x0040	// orange split trail + rotate
 #define ALIAS_TRACER3		0x0080	// purple trail
 
+// must match definition in sprite.h
+#ifndef SYNCTYPE_T
+#define SYNCTYPE_T
+typedef enum
+{
+	ST_SYNC = 0,
+	ST_RAND
+} synctype_t;
+#endif
+
 typedef enum
 {
 	ALIAS_SINGLE = 0,
@@ -57,42 +63,36 @@ typedef enum
 
 typedef struct
 {
-	int32_t		ident;
+	int		ident;
-	int32_t		version;
+	int		version;
 	vec3_t		scale;
 	vec3_t		scale_origin;
 	float		boundingradius;
 	vec3_t		eyeposition;
-	int32_t		numskins;
+	int		numskins;
-	int32_t		skinwidth;
+	int		skinwidth;
-	int32_t		skinheight;
+	int		skinheight;
-	int32_t		numverts;
+	int		numverts;
-	int32_t		numtris;
+	int		numtris;
-	int32_t		numframes;
+	int		numframes;
-	uint32_t	synctype; // was synctype_t
+	synctype_t	synctype;
-	int32_t		flags;
+	int		flags;
 	float		size;
 } daliashdr_t;
 
-STATIC_ASSERT( sizeof( daliashdr_t ) == 84, "invalid daliashdr_t size" );
-
 typedef struct
 {
-	int32_t		onseam;
+	int		onseam;
-	int32_t		s;
+	int		s;
-	int32_t		t;
+	int		t;
 } stvert_t;
 
-STATIC_ASSERT( sizeof( stvert_t ) == 12, "invalid stvert_t size" );
-
 typedef struct dtriangle_s
 {
-	int32_t		facesfront;
+	int		facesfront;
-	int32_t		vertindex[3];
+	int		vertindex[3];
 } dtriangle_t;
 
-STATIC_ASSERT( sizeof( dtriangle_t ) == 16, "invalid dtriangle_t size" );
-
 #define DT_FACES_FRONT	0x0010
 #define ALIAS_ONSEAM	0x0020
 
@@ -103,50 +103,36 @@ typedef struct
 	char		name[16];	// frame name from grabbing
 } daliasframe_t;
 
-STATIC_ASSERT( sizeof( daliasframe_t ) == 24, "invalid daliasframe_t size" );
-
 typedef struct
 {
-	int32_t		numframes;
+	int		numframes;
 	trivertex_t	bboxmin;	// lightnormal isn't used
 	trivertex_t	bboxmax;	// lightnormal isn't used
 } daliasgroup_t;
 
-STATIC_ASSERT( sizeof( daliasgroup_t ) == 12, "invalid daliasgrou_t size" );
-
 typedef struct
 {
-	int32_t		numskins;
+	int		numskins;
 } daliasskingroup_t;
 
-STATIC_ASSERT( sizeof( daliasskingroup_t ) == 4, "invalid daliasskingroup_t size" );
-
 typedef struct
 {
 	float		interval;
 } daliasinterval_t;
 
-STATIC_ASSERT( sizeof( daliasinterval_t ) == 4, "invalid daliasinterval_t size" );
-
 typedef struct
 {
 	float		interval;
 } daliasskininterval_t;
 
-STATIC_ASSERT( sizeof( daliasskininterval_t ) == 4, "invalid daliasskininterval_t size" );
-
 typedef struct
 {
-	uint32_t	type; // was aliasframetype_t
+	aliasframetype_t	type;
 } daliasframetype_t;
 
-STATIC_ASSERT( sizeof( daliasframetype_t ) == 4, "invalid daliasframetype_t size" );
-
 typedef struct
 {
-	uint32_t	type; // was aliasskintype_t
+	aliasskintype_t	type;
 } daliasskintype_t;
 
-STATIC_ASSERT( sizeof( daliasskintype_t ) == 4, "invalid daliasskintype_t size" );
-
 #endif//ALIAS_H

engine/client/avi/avi.h

@@ -27,6 +27,7 @@ int AVI_GetAudioChunk( movie_state_t *Avi, char *audiodata, int offset, int leng
 void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audio, int quiet );
 movie_state_t *AVI_LoadVideo( const char *filename, qboolean load_audio );
 int AVI_TimeToSoundPosition( movie_state_t *Avi, int time );
+int AVI_GetVideoFrameCount( movie_state_t *Avi );
 void AVI_CloseVideo( movie_state_t *Avi );
 qboolean AVI_IsActive( movie_state_t *Avi );
 void AVI_FreeVideo( movie_state_t *Avi );

engine/client/avi/avi_stub.c

@@ -57,6 +57,11 @@ int AVI_TimeToSoundPosition( movie_state_t *Avi, int time )
 	return 0;
 }
 
+int AVI_GetVideoFrameCount( movie_state_t *Avi )
+{
+	return 0;
+}
+
 void AVI_CloseVideo( movie_state_t *Avi )
 {
 	;

engine/client/avi/avi_win.c

@@ -1,6 +1,5 @@
 /*
 avi_win.c - playing AVI files (based on original AVIKit code, Win32 version)
-Copyright (c) 2003-2004, Ruari O'Sullivan
 Copyright (C) 2010 Uncle Mike
 
 This program is free software: you can redistribute it and/or modify
@@ -64,7 +63,7 @@ static int (_stdcall *pAVIStreamTimeToSample)( PAVISTREAM pavi, LONG lTime );
 static void* (_stdcall *pAVIStreamGetFrame)( PGETFRAME pg, LONG lPos );
 static int (_stdcall *pAVIStreamGetFrameClose)( PGETFRAME pg );
 static dword (_stdcall *pAVIStreamRelease)( PAVISTREAM pavi );
-static int (_stdcall *pAVIFileOpenW)( PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode, LPCLSID lpHandler );
+static int (_stdcall *pAVIFileOpen)( PAVIFILE *ppfile, LPCSTR szFile, UINT uMode, LPCLSID lpHandler );
 static int (_stdcall *pAVIFileGetStream)( PAVIFILE pfile, PAVISTREAM *ppavi, DWORD fccType, LONG lParam );
 static int (_stdcall *pAVIStreamReadFormat)( PAVISTREAM pavi, LONG lPos,LPVOID lpFormat, LONG *lpcbFormat );
 static int (_stdcall *pAVIStreamStart)( PAVISTREAM pavi );
@@ -77,7 +76,7 @@ static dllfunc_t avifile_funcs[] =
 { "AVIFileExit", (void **) &pAVIFileExit },
 { "AVIFileGetStream", (void **) &pAVIFileGetStream },
 { "AVIFileInit", (void **) &pAVIFileInit },
-{ "AVIFileOpenW", (void **) &pAVIFileOpenW },
+{ "AVIFileOpenA", (void **) &pAVIFileOpen },
 { "AVIFileRelease", (void **) &pAVIFileRelease },
 { "AVIStreamGetFrame", (void **) &pAVIStreamGetFrame },
 { "AVIStreamGetFrameClose", (void **) &pAVIStreamGetFrameClose },
@@ -279,6 +278,14 @@ int AVI_GetVideoFrameNumber( movie_state_t *Avi, float time )
 	return (time * Avi->video_fps);
 }
 
+int AVI_GetVideoFrameCount( movie_state_t *Avi )
+{
+	if( !Avi->active )
+		return 0;
+
+	return Avi->video_frames;
+}
+
 int AVI_TimeToSoundPosition( movie_state_t *Avi, int time )
 {
 	if( !Avi->active || !Avi->audio_stream )
@@ -486,7 +493,6 @@ void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audi
 	AVISTREAMINFO	stream_info;
 	int		opened_streams = 0;
 	LONG		hr;
-	wchar_t		pathBuffer[MAX_PATH];
 
 	// default state: non-working.
 	Avi->active = false;
@@ -495,15 +501,8 @@ void AVI_OpenVideo( movie_state_t *Avi, const char *filename, qboolean load_audi
 	// can't load Video For Windows :-(
 	if( !avi_initialized ) return;
 
-	// convert to wide char
-	if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, pathBuffer, ARRAYSIZE( pathBuffer )) <= 0 )
-	{
-		Con_DPrintf( S_ERROR "filename buffer limit exceeded\n" );
-		return;
-	}
-
 	// load the AVI
-	hr = pAVIFileOpenW( &Avi->pfile, pathBuffer, OF_SHARE_DENY_WRITE, 0L );
+	hr = pAVIFileOpen( &Avi->pfile, filename, OF_SHARE_DENY_WRITE, 0L );
 
 	if( hr != 0 ) // error opening AVI:
 	{
@@ -658,7 +657,7 @@ movie_state_t *AVI_LoadVideo( const char *filename, qboolean load_audio )
 
 	// open cinematic
 	Q_snprintf( path, sizeof( path ), "media/%s", filename );
-	COM_DefaultExtension( path, ".avi", sizeof( path ));
+	COM_DefaultExtension( path, ".avi" );
 	fullpath = FS_GetDiskPath( path, false );
 
 	if( FS_FileExists( path, false ) && !fullpath )

engine/client/cl_cmds.c

@@ -145,7 +145,7 @@ void CL_PlayCDTrack_f( void )
 CL_ScreenshotGetName
 ==================
 */
-static qboolean CL_ScreenshotGetName( int lastnum, char *filename, size_t size )
+qboolean CL_ScreenshotGetName( int lastnum, char *filename )
 {
 	if( lastnum < 0 || lastnum > 9999 )
 	{
@@ -153,7 +153,9 @@ static qboolean CL_ScreenshotGetName( int lastnum, char *filename, size_t size )
 		return false;
 	}
 
-	return Q_snprintf( filename, size, "scrshots/%s_shot%04d.png", clgame.mapname, lastnum ) > 0;
+	Q_sprintf( filename, "scrshots/%s_shot%04d.png", clgame.mapname, lastnum );
+
+	return true;
 }
 
 /*
@@ -161,7 +163,7 @@ static qboolean CL_ScreenshotGetName( int lastnum, char *filename, size_t size )
 CL_SnapshotGetName
 ==================
 */
-static qboolean CL_SnapshotGetName( int lastnum, char *filename, size_t size )
+qboolean CL_SnapshotGetName( int lastnum, char *filename )
 {
 	if( lastnum < 0 || lastnum > 9999 )
 	{
@@ -170,7 +172,9 @@ static qboolean CL_SnapshotGetName( int lastnum, char *filename, size_t size )
 		return false;
 	}
 
-	return Q_snprintf( filename, size, "../%s_%04d.png", clgame.mapname, lastnum ) > 0;
+	Q_sprintf( filename, "../%s_%04d.png", clgame.mapname, lastnum );
+
+	return true;
 }
 
 /*
@@ -203,7 +207,7 @@ void CL_ScreenShot_f( void )
 		// scan for a free filename
 		for( i = 0; i < 9999; i++ )
 		{
-			if( !CL_ScreenshotGetName( i, checkname, sizeof( checkname )))
+			if( !CL_ScreenshotGetName( i, checkname ))
 				return;	// no namespace
 
 			if( !FS_FileExists( checkname, false ))
@@ -243,7 +247,7 @@ void CL_SnapShot_f( void )
 		// scan for a free filename
 		for( i = 0; i < 9999; i++ )
 		{
-			if( !CL_SnapshotGetName( i, checkname, sizeof( checkname )))
+			if( !CL_SnapshotGetName( i, checkname ))
 				return;	// no namespace
 
 			if( !FS_FileExists( checkname, false ))
@@ -274,7 +278,7 @@ void CL_EnvShot_f( void )
 		return;
 	}
 
-	Q_snprintf( cls.shotname, sizeof( cls.shotname ), "gfx/env/%s", Cmd_Argv( 1 ));
+	Q_sprintf( cls.shotname, "gfx/env/%s", Cmd_Argv( 1 ));
 	cls.scrshot_action = scrshot_envshot;	// build new frame for envshot
 	cls.envshot_vieworg = NULL; // no custom view
 	cls.envshot_viewsize = 0;
@@ -295,7 +299,7 @@ void CL_SkyShot_f( void )
 		return;
 	}
 
-	Q_snprintf( cls.shotname, sizeof( cls.shotname ),"gfx/env/%s", Cmd_Argv( 1 ));
+	Q_sprintf( cls.shotname, "gfx/env/%s", Cmd_Argv( 1 ));
 	cls.scrshot_action = scrshot_skyshot;	// build new frame for skyshot
 	cls.envshot_vieworg = NULL; // no custom view
 	cls.envshot_viewsize = 0;
@@ -319,8 +323,7 @@ void CL_LevelShot_f( void )
 	// check for exist
 	if( cls.demoplayback && ( cls.demonum != -1 ))
 	{
-		Q_snprintf( cls.shotname, sizeof( cls.shotname ),
+		Q_sprintf( cls.shotname, "levelshots/%s_%s.bmp", cls.demoname, refState.wideScreen ? "16x9" : "4x3" );
-			"levelshots/%s_%s.bmp", cls.demoname, refState.wideScreen ? "16x9" : "4x3" );
 		Q_snprintf( filename, sizeof( filename ), "%s.dem", cls.demoname );
 
 		// make sure what levelshot is newer than demo
@@ -329,8 +332,7 @@ void CL_LevelShot_f( void )
 	}
 	else
 	{
-		Q_snprintf( cls.shotname, sizeof( cls.shotname ),
+		Q_sprintf( cls.shotname, "levelshots/%s_%s.bmp", clgame.mapname, refState.wideScreen ? "16x9" : "4x3" );
-			"levelshots/%s_%s.bmp", clgame.mapname, refState.wideScreen ? "16x9" : "4x3" );
 
 		// make sure what levelshot is newer than bsp
 		ft1 = FS_FileTime( cl.worldmodel->name, false );
@@ -358,7 +360,7 @@ void CL_SaveShot_f( void )
 		return;
 	}
 
-	Q_snprintf( cls.shotname, sizeof( cls.shotname ), DEFAULT_SAVE_DIRECTORY "%s.bmp", Cmd_Argv( 1 ));
+	Q_sprintf( cls.shotname, DEFAULT_SAVE_DIRECTORY "%s.bmp", Cmd_Argv( 1 ));
 	cls.scrshot_action = scrshot_savegame;	// build new frame for saveshot
 }
 

engine/client/cl_custom.c

@@ -78,7 +78,7 @@ qboolean CL_CheckFile( sizebuf_t *msg, resource_t *pResource )
 	}
 
 	MSG_BeginClientCmd( msg, clc_stringcmd );
-	MSG_WriteStringf( msg, "dlfile %s", filepath );
+	MSG_WriteString( msg, va( "dlfile %s", filepath ));
 	host.downloadcount++;
 
 	return false;
@@ -106,7 +106,7 @@ void CL_RemoveFromResourceList( resource_t *pResource )
 	if( pResource->pPrev == NULL || pResource->pNext == NULL )
 		Host_Error( "mislinked resource in CL_RemoveFromResourceList\n" );
 
-	if( pResource->pNext == pResource || pResource->pPrev == pResource )
+	if ( pResource->pNext == pResource || pResource->pPrev == pResource )
 		Host_Error( "attempt to free last entry in list.\n" );
 
 	pResource->pPrev->pNext = pResource->pNext;

engine/client/cl_debug.c

@@ -25,6 +25,70 @@ GNU General Public License for more details.
 #define MSG_COUNT		32		// last 32 messages parsed
 #define MSG_MASK		(MSG_COUNT - 1)
 
+const char *svc_strings[svc_lastmsg+1] =
+{
+	"svc_bad",
+	"svc_nop",
+	"svc_disconnect",
+	"svc_event",
+	"svc_changing",
+	"svc_setview",
+	"svc_sound",
+	"svc_time",
+	"svc_print",
+	"svc_stufftext",
+	"svc_setangle",
+	"svc_serverdata",
+	"svc_lightstyle",
+	"svc_updateuserinfo",
+	"svc_deltatable",
+	"svc_clientdata",
+	"svc_resource",
+	"svc_pings",
+	"svc_particle",
+	"svc_restoresound",
+	"svc_spawnstatic",
+	"svc_event_reliable",
+	"svc_spawnbaseline",
+	"svc_temp_entity",
+	"svc_setpause",
+	"svc_signonnum",
+	"svc_centerprint",
+	"svc_unused27",
+	"svc_unused28",
+	"svc_unused29",
+	"svc_intermission",
+	"svc_finale",
+	"svc_cdtrack",
+	"svc_restore",
+	"svc_cutscene",
+	"svc_weaponanim",
+	"svc_bspdecal",
+	"svc_roomtype",
+	"svc_addangle",
+	"svc_usermessage",
+	"svc_packetentities",
+	"svc_deltapacketentities",
+	"svc_choke",
+	"svc_resourcelist",
+	"svc_deltamovevars",
+	"svc_resourcerequest",
+	"svc_customization",
+	"svc_crosshairangle",
+	"svc_soundfade",
+	"svc_filetxferfailed",
+	"svc_hltv",
+	"svc_director",
+	"svc_voiceinit",
+	"svc_voicedata",
+	"svc_deltapacketbones",
+	"svc_unused55",
+	"svc_resourcelocation",
+	"svc_querycvarvalue",
+	"svc_querycvarvalue2",
+	"svc_exec",
+};
+
 typedef struct
 {
 	int	command;
@@ -45,7 +109,7 @@ const char *CL_MsgInfo( int cmd )
 {
 	static string	sz;
 
-	Q_strncpy( sz, "???", sizeof( sz ));
+	Q_strcpy( sz, "???" );
 
 	if( cmd >= 0 && cmd <= svc_lastmsg )
 	{

engine/client/cl_demo.c

@@ -518,26 +518,14 @@ CL_ReadDemoCmdHeader
 read the demo command
 =================
 */
-qboolean CL_ReadDemoCmdHeader( byte *cmd, float *dt )
+void CL_ReadDemoCmdHeader( byte *cmd, float *dt )
 {
 	// read the command
-	// HACKHACK: skip NOPs
+	FS_Read( cls.demofile, cmd, sizeof( byte ));
-	do
+	Assert( *cmd >= 1 && *cmd <= dem_lastcmd );
-	{
-		FS_Read( cls.demofile, cmd, sizeof( byte ));
-	} while( *cmd == dem_unknown );
-
-	if( *cmd > dem_lastcmd )
-	{
-		Con_Printf( S_ERROR "Demo cmd %d > %d, file offset = %d\n", *cmd, dem_lastcmd, (int)FS_Tell( cls.demofile ));
-		CL_DemoCompleted();
-		return false;
-	}
 
 	// read the timestamp
 	FS_Read( cls.demofile, dt, sizeof( float ));
-
-	return true;
 }
 
 /*
@@ -900,7 +888,7 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length )
 	qboolean		swallowmessages = true;
 	static int	tdlastdemoframe = 0;
 	byte		*userbuf = NULL;
-	size_t		size = 0;
+	size_t		size;
 	byte		cmd;
 
 	if( !cls.demofile )
@@ -925,8 +913,7 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length )
 		if( !cls.demofile ) break;
 		curpos = FS_Tell( cls.demofile );
 
-		if( !CL_ReadDemoCmdHeader( &cmd, &demo.timestamp ))
+		CL_ReadDemoCmdHeader( &cmd, &demo.timestamp );
-			return false;
 
 		fElapsedTime = CL_GetDemoPlaybackClock() - demo.starttime;
 		if( !cls.timedemo ) bSkipMessage = ((demo.timestamp - cl_serverframetime()) >= fElapsedTime) ? true : false;
@@ -1317,16 +1304,16 @@ void CL_CheckStartupDemos( void )
 CL_DemoGetName
 ==================
 */
-static void CL_DemoGetName( int lastnum, char *filename, size_t size )
+static void CL_DemoGetName( int lastnum, char *filename )
 {
 	if( lastnum < 0 || lastnum > 9999 )
 	{
 		// bound
-		Q_strncpy( filename, "demo9999.dem", size );
+		Q_strcpy( filename, "demo9999" );
 		return;
 	}
 
-	Q_snprintf( filename, size, "demo%04d.dem", lastnum );
+	Q_sprintf( filename, "demo%04d", lastnum );
 }
 
 /*
@@ -1380,8 +1367,8 @@ void CL_Record_f( void )
 		// scan for a free filename
 		for( n = 0; n < 10000; n++ )
 		{
-			CL_DemoGetName( n, demoname, sizeof( demoname ));
+			CL_DemoGetName( n, demoname );
-			if( !FS_FileExists( demoname, true ))
+			if( !FS_FileExists( va( "%s.dem", demoname ), true ))
 				break;
 		}
 
@@ -1394,7 +1381,7 @@ void CL_Record_f( void )
 	else Q_strncpy( demoname, name, sizeof( demoname ));
 
 	// open the demo file
-	Q_snprintf( demopath, sizeof( demopath ), "%s.dem", demoname );
+	Q_sprintf( demopath, "%s.dem", demoname );
 
 	// make sure that old demo is removed
 	if( FS_FileExists( demopath, false ))
@@ -1421,7 +1408,7 @@ void CL_PlayDemo_f( void )
 
 	if( Cmd_Argc() < 2 )
 	{
-		Con_Printf( S_USAGE "%s <demoname>\n", Cmd_Argv( 0 ));
+		Con_Printf( S_USAGE "playdemo <demoname>\n" );
 		return;
 	}
 
@@ -1548,6 +1535,12 @@ timedemo <demoname>
 */
 void CL_TimeDemo_f( void )
 {
+	if( Cmd_Argc() != 2 )
+	{
+		Con_Printf( S_USAGE "timedemo <demoname>\n" );
+		return;
+	}
+
 	CL_PlayDemo_f ();
 
 	// cls.td_starttime will be grabbed at the second frame of the demo, so

engine/client/cl_efrag.c

@@ -33,6 +33,46 @@ static mnode_t	*r_pefragtopnode;
 static vec3_t	r_emins, r_emaxs;
 static cl_entity_t	*r_addent;
 
+/*
+================
+R_RemoveEfrags
+
+Call when removing an object from the world or moving it to another position
+================
+*/
+void R_RemoveEfrags( cl_entity_t *ent )
+{
+	efrag_t	*ef, *old, *walk, **prev;
+
+	ef = ent->efrag;
+
+	while( ef )
+	{
+		prev = &ef->leaf->efrags;
+		while( 1 )
+		{
+			walk = *prev;
+			if( !walk ) break;
+
+			if( walk == ef )
+			{
+				// remove this fragment
+				*prev = ef->leafnext;
+				break;
+			}
+			else prev = &walk->leafnext;
+		}
+
+		old = ef;
+		ef = ef->entnext;
+
+		// put it on the free list
+		old->entnext = clgame.free_efrags;
+		clgame.free_efrags = old;
+	}
+	ent->efrag = NULL;
+}
+
 /*
 ===================
 R_SplitEntityOnNode
@@ -148,6 +188,8 @@ void R_StoreEfrags( efrag_t **ppefrag, int framecount )
 		case mod_brush:
 		case mod_studio:
 		case mod_sprite:
+			pent = pefrag->entity;
+
 			if( pent->visframe != framecount )
 			{
 				if( CL_AddVisibleEntity( pent, ET_FRAGMENTED ))

engine/client/cl_efx.c

@@ -46,7 +46,7 @@ short GAME_EXPORT R_LookupColor( byte r, byte g, byte b )
 	float	rf, gf, bf;
 
 	bestdiff = 999999;
-	best = -1;
+	best = 65535;
 
 	for( i = 0; i < 256; i++ )
 	{
@@ -140,6 +140,26 @@ void CL_FreeParticles( void )
 	cl_particles = NULL;
 }
 
+/*
+================
+CL_FreeParticle
+
+move particle to freelist
+================
+*/
+void CL_FreeParticle( particle_t *p )
+{
+	if( p->deathfunc )
+	{
+		// call right the deathfunc before die
+		p->deathfunc( p );
+		p->deathfunc = NULL;
+	}
+
+	p->next = cl_free_particles;
+	cl_free_particles = p;
+}
+
 /*
 ================
 CL_AllocParticleFast
@@ -663,46 +683,42 @@ void CL_ParseViewBeam( sizebuf_t *msg, int beamType )
 	switch( beamType )
 	{
 	case TE_BEAMPOINTS:
-	case TE_BEAMENTPOINT:
+		start[0] = MSG_ReadCoord( msg );
-	case TE_BEAMENTS:
+		start[1] = MSG_ReadCoord( msg );
-		if( beamType == TE_BEAMENTS )
+		start[2] = MSG_ReadCoord( msg );
-		{
+		end[0] = MSG_ReadCoord( msg );
-			startEnt = MSG_ReadShort( msg );
+		end[1] = MSG_ReadCoord( msg );
-			endEnt = MSG_ReadShort( msg );
+		end[2] = MSG_ReadCoord( msg );
-		}
-		else
-		{
-			if( beamType == TE_BEAMENTPOINT )
-			{
-				startEnt = MSG_ReadShort( msg );
-			}
-			else
-			{
-				start[0] = MSG_ReadCoord( msg );
-				start[1] = MSG_ReadCoord( msg );
-				start[2] = MSG_ReadCoord( msg );
-			}
-			end[0] = MSG_ReadCoord( msg );
-			end[1] = MSG_ReadCoord( msg );
-			end[2] = MSG_ReadCoord( msg );
-		}
 		modelIndex = MSG_ReadShort( msg );
 		startFrame = MSG_ReadByte( msg );
-		frameRate = (float)MSG_ReadByte( msg ) * 0.1f;
+		frameRate = (float)MSG_ReadByte( msg );
-		life = (float)MSG_ReadByte( msg ) * 0.1f;
+		life = (float)(MSG_ReadByte( msg ) * 0.1f);
-		width = (float)MSG_ReadByte( msg ) * 0.1f;
+		width = (float)(MSG_ReadByte( msg ) * 0.1f);
-		noise = (float)MSG_ReadByte( msg ) * 0.01f;
+		noise = (float)(MSG_ReadByte( msg ) * 0.01f);
 		r = (float)MSG_ReadByte( msg ) / 255.0f;
 		g = (float)MSG_ReadByte( msg ) / 255.0f;
 		b = (float)MSG_ReadByte( msg ) / 255.0f;
 		a = (float)MSG_ReadByte( msg ) / 255.0f;
-		speed = (float)MSG_ReadByte( msg ) * 0.1f;
+		speed = (float)(MSG_ReadByte( msg ) * 0.1f);
-		if( beamType == TE_BEAMENTS )
+		R_BeamPoints( start, end, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
-			R_BeamEnts( startEnt, endEnt, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
+		break;
-		else if( beamType == TE_BEAMENTPOINT )
+	case TE_BEAMENTPOINT:
-			R_BeamEntPoint( startEnt, end, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
+		startEnt = MSG_ReadShort( msg );
-		else
+		end[0] = MSG_ReadCoord( msg );
-			R_BeamPoints( start, end, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
+		end[1] = MSG_ReadCoord( msg );
+		end[2] = MSG_ReadCoord( msg );
+		modelIndex = MSG_ReadShort( msg );
+		startFrame = MSG_ReadByte( msg );
+		frameRate = (float)MSG_ReadByte( msg );
+		life = (float)(MSG_ReadByte( msg ) * 0.1f);
+		width = (float)(MSG_ReadByte( msg ) * 0.1f);
+		noise = (float)(MSG_ReadByte( msg ) * 0.01f);
+		r = (float)MSG_ReadByte( msg ) / 255.0f;
+		g = (float)MSG_ReadByte( msg ) / 255.0f;
+		b = (float)MSG_ReadByte( msg ) / 255.0f;
+		a = (float)MSG_ReadByte( msg ) / 255.0f;
+		speed = (float)(MSG_ReadByte( msg ) * 0.1f);
+		R_BeamEntPoint( startEnt, end, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
 		break;
 	case TE_LIGHTNING:
 		start[0] = MSG_ReadCoord( msg );
@@ -711,11 +727,27 @@ void CL_ParseViewBeam( sizebuf_t *msg, int beamType )
 		end[0] = MSG_ReadCoord( msg );
 		end[1] = MSG_ReadCoord( msg );
 		end[2] = MSG_ReadCoord( msg );
-		life = (float)MSG_ReadByte( msg ) * 0.1f;
+		life = (float)(MSG_ReadByte( msg ) * 0.1f);
-		width = (float)MSG_ReadByte( msg ) * 0.1f;
+		width = (float)(MSG_ReadByte( msg ) * 0.1f);
-		noise = (float)MSG_ReadByte( msg ) * 0.01f;
+		noise = (float)(MSG_ReadByte( msg ) * 0.01f);
 		modelIndex = MSG_ReadShort( msg );
-		R_BeamLightning( start, end, modelIndex, life, width, noise, 0.6f, 3.5f );
+		R_BeamLightning( start, end, modelIndex, life, width, noise, 0.6F, 3.5f );
+		break;
+	case TE_BEAMENTS:
+		startEnt = MSG_ReadShort( msg );
+		endEnt = MSG_ReadShort( msg );
+		modelIndex = MSG_ReadShort( msg );
+		startFrame = MSG_ReadByte( msg );
+		frameRate = (float)(MSG_ReadByte( msg ) * 0.1f);
+		life = (float)(MSG_ReadByte( msg ) * 0.1f);
+		width = (float)(MSG_ReadByte( msg ) * 0.1f);
+		noise = (float)(MSG_ReadByte( msg ) * 0.01f);
+		r = (float)MSG_ReadByte( msg ) / 255.0f;
+		g = (float)MSG_ReadByte( msg ) / 255.0f;
+		b = (float)MSG_ReadByte( msg ) / 255.0f;
+		a = (float)MSG_ReadByte( msg ) / 255.0f;
+		speed = (float)(MSG_ReadByte( msg ) * 0.1f);
+		R_BeamEnts( startEnt, endEnt, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
 		break;
 	case TE_BEAM:
 		break;
@@ -741,21 +773,21 @@ void CL_ParseViewBeam( sizebuf_t *msg, int beamType )
 		end[2] = MSG_ReadCoord( msg );
 		modelIndex = MSG_ReadShort( msg );
 		startFrame = MSG_ReadByte( msg );
-		frameRate = (float)MSG_ReadByte( msg ) * 0.1f;
+		frameRate = (float)(MSG_ReadByte( msg ));
-		life = (float)MSG_ReadByte( msg ) * 0.1f;
+		life = (float)(MSG_ReadByte( msg ) * 0.1f);
-		width = (float)MSG_ReadByte( msg );
+		width = (float)(MSG_ReadByte( msg ));
-		noise = (float)MSG_ReadByte( msg ) * 0.01f;
+		noise = (float)(MSG_ReadByte( msg ) * 0.1f);
 		r = (float)MSG_ReadByte( msg ) / 255.0f;
 		g = (float)MSG_ReadByte( msg ) / 255.0f;
 		b = (float)MSG_ReadByte( msg ) / 255.0f;
 		a = (float)MSG_ReadByte( msg ) / 255.0f;
-		speed = (float)MSG_ReadByte( msg ) * 0.1f;
+		speed = (float)(MSG_ReadByte( msg ) / 0.1f);
 		R_BeamCirclePoints( beamType, start, end, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
 		break;
 	case TE_BEAMFOLLOW:
 		startEnt = MSG_ReadShort( msg );
 		modelIndex = MSG_ReadShort( msg );
-		life = (float)MSG_ReadByte( msg ) * 0.1f;
+		life = (float)(MSG_ReadByte( msg ) * 0.1f);
 		width = (float)MSG_ReadByte( msg );
 		r = (float)MSG_ReadByte( msg ) / 255.0f;
 		g = (float)MSG_ReadByte( msg ) / 255.0f;
@@ -768,15 +800,15 @@ void CL_ParseViewBeam( sizebuf_t *msg, int beamType )
 		endEnt = MSG_ReadShort( msg );
 		modelIndex = MSG_ReadShort( msg );
 		startFrame = MSG_ReadByte( msg );
-		frameRate = (float)MSG_ReadByte( msg ) * 0.1f;
+		frameRate = (float)MSG_ReadByte( msg );
-		life = (float)MSG_ReadByte( msg ) * 0.1f;
+		life = (float)(MSG_ReadByte( msg ) * 0.1f);
-		width = (float)MSG_ReadByte( msg ) * 0.1f;
+		width = (float)(MSG_ReadByte( msg ) * 0.1f);
-		noise = (float)MSG_ReadByte( msg ) * 0.01f;
+		noise = (float)(MSG_ReadByte( msg ) * 0.01f);
 		r = (float)MSG_ReadByte( msg ) / 255.0f;
 		g = (float)MSG_ReadByte( msg ) / 255.0f;
 		b = (float)MSG_ReadByte( msg ) / 255.0f;
 		a = (float)MSG_ReadByte( msg ) / 255.0f;
-		speed = (float)MSG_ReadByte( msg ) * 0.1f;
+		speed = (float)(MSG_ReadByte( msg ) * 0.1f);
 		R_BeamRing( startEnt, endEnt, modelIndex, life, width, noise, a, speed, startFrame, frameRate, r, g, b );
 		break;
 	case TE_BEAMHOSE:
@@ -1091,13 +1123,9 @@ R_ParticleExplosion2
 void GAME_EXPORT R_ParticleExplosion2( const vec3_t org, int colorStart, int colorLength )
 {
 	int		i, j;
-	int		colorMod = 0, packedColor;
+	int		colorMod = 0;
 	particle_t	*p;
 
-	if( FBitSet( host.features, ENGINE_QUAKE_COMPATIBLE ))
-		packedColor = 255; // use old code for blob particles
-	else packedColor = 0;
-
 	for( i = 0; i < 512; i++ )
 	{
 		p = R_AllocParticle( NULL );
@@ -1105,7 +1133,7 @@ void GAME_EXPORT R_ParticleExplosion2( const vec3_t org, int colorStart, int col
 
 		p->die = cl.time + 0.3f;
 		p->color = colorStart + ( colorMod % colorLength );
-		p->packedColor = packedColor;
+		p->packedColor = 255; // use old code for blob particles
 		colorMod++;
 
 		p->type = pt_blob;
@@ -1127,19 +1155,15 @@ R_BlobExplosion
 void GAME_EXPORT R_BlobExplosion( const vec3_t org )
 {
 	particle_t	*p;
-	int		i, j, packedColor;
+	int		i, j;
-
-	if( FBitSet( host.features, ENGINE_QUAKE_COMPATIBLE ))
-		packedColor = 255; // use old code for blob particles
-	else packedColor = 0;
 
 	for( i = 0; i < 1024; i++ )
 	{
 		p = R_AllocParticle( NULL );
 		if( !p ) return;
 
-		p->die = cl.time + COM_RandomFloat( 1.0f, 1.4f );
+		p->die = cl.time + COM_RandomFloat( 2.0f, 2.4f );
-		p->packedColor = packedColor;
+		p->packedColor = 255; // use old code for blob particles
 
 		if( i & 1 )
 		{
@@ -1241,7 +1265,7 @@ void GAME_EXPORT R_BloodStream( const vec3_t org, const vec3_t dir, int pcolor,
 	particle_t	*p;
 	int		i, j;
 	float		arc;
-	int		accel = speed; // must be integer due to bug in GoldSrc
+	float		accel = speed;
 
 	for( arc = 0.05f, i = 0; i < 100; i++ )
 	{

engine/client/cl_events.c

@@ -158,7 +158,7 @@ CL_EventIndex
 */
 word CL_EventIndex( const char *name )
 {
-	word	i;
+	int	i;
 
 	if( !COM_CheckString( name ))
 		return 0;
@@ -484,7 +484,7 @@ void GAME_EXPORT CL_PlaybackEvent( int flags, const edict_t *pInvoker, word even
 		return;
 
 	// first check event for out of bounds
-	if( eventindex < 1 || eventindex >= MAX_EVENTS )
+	if( eventindex < 1 || eventindex > MAX_EVENTS )
 	{
 		Con_DPrintf( S_ERROR "CL_PlaybackEvent: invalid eventindex %i\n", eventindex );
 		return;

engine/client/cl_font.c

@@ -1,350 +0,0 @@
-/*
-cl_font.c - bare bones engine font manager
-Copyright (C) 2023 Alibek Omarov
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#include "common.h"
-#include "filesystem.h"
-#include "client.h"
-#include "qfont.h"
-
-qboolean CL_FixedFont( cl_font_t *font )
-{
-	return font && font->valid && font->type == FONT_FIXED;
-}
-
-static int CL_LoadFontTexture( const char *fontname, uint texFlags, int *width )
-{
-	int font_width;
-	int tex;
-
-	if( !g_fsapi.FileExists( fontname, false ))
-		return 0;
-
-	tex = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, texFlags );
-	if( !tex )
-		return 0;
-
-	font_width = REF_GET_PARM( PARM_TEX_WIDTH, tex );
-	if( !font_width )
-	{
-		ref.dllFuncs.GL_FreeTexture( tex );
-		return 0;
-	}
-
-	*width = font_width;
-	return tex;
-}
-
-qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float scale, int rendermode, uint texFlags )
-{
-	int font_width, i;
-
-	if( font->valid )
-		return true; // already loaded
-
-	font->hFontTexture = CL_LoadFontTexture( fontname, texFlags, &font_width );
-	if( !font->hFontTexture )
-		return false;
-
-	font->type = FONT_FIXED;
-	font->valid = true;
-	font->scale = scale;
-	font->nearest = FBitSet( texFlags, TF_NEAREST );
-	font->rendermode = rendermode;
-	font->charHeight = Q_rint( font_width / 16 * scale );
-
-	for( i = 0; i < ARRAYSIZE( font->fontRc ); i++ )
-	{
-		font->fontRc[i].left   = ( i * font_width / 16 ) % font_width;
-		font->fontRc[i].right  = font->fontRc[i].left + font_width / 16;
-		font->fontRc[i].top    = ( i / 16 ) * ( font_width / 16 );
-		font->fontRc[i].bottom = font->fontRc[i].top + font_width / 16;
-
-		font->charWidths[i] = Q_rint( font_width / 16 * scale );
-	}
-
-	return true;
-}
-
-qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font, float scale, int rendermode, uint texFlags )
-{
-	fs_offset_t length;
-	qfont_t src;
-	byte *pfile;
-	int font_width, i;
-
-	if( font->valid )
-		return true;
-
-	pfile = g_fsapi.LoadFile( fontname, &length, false );
-	if( !pfile )
-		return false;
-
-	if( length < sizeof( src ))
-	{
-		Mem_Free( pfile );
-		return false;
-	}
-
-	memcpy( &src, pfile, sizeof( src ));
-	Mem_Free( pfile );
-
-	font->hFontTexture = CL_LoadFontTexture( fontname, texFlags, &font_width );
-	if( !font->hFontTexture )
-		return false;
-
-	font->type = FONT_VARIABLE;
-	font->valid = true;
-	font->scale = scale;
-	font->nearest = FBitSet( texFlags, TF_NEAREST );
-	font->rendermode = rendermode;
-	font->charHeight = Q_rint( src.rowheight * scale );
-
-	for( i = 0; i < ARRAYSIZE( font->fontRc ); i++ )
-	{
-		const charinfo *ci = &src.fontinfo[i];
-
-		font->fontRc[i].left   = (word)ci->startoffset % font_width;
-		font->fontRc[i].right  = font->fontRc[i].left + ci->charwidth;
-		font->fontRc[i].top    = (word)ci->startoffset / font_width;
-		font->fontRc[i].bottom = font->fontRc[i].top + src.rowheight;
-
-		font->charWidths[i] = Q_rint( src.fontinfo[i].charwidth * scale );
-	}
-
-	return true;
-}
-
-void CL_FreeFont( cl_font_t *font )
-{
-	if( !font || !font->valid )
-		return;
-
-	ref.dllFuncs.GL_FreeTexture( font->hFontTexture );
-	memset( font, 0, sizeof( *font ));
-}
-
-static int CL_CalcTabStop( const cl_font_t *font, int x )
-{
-	int space = font->charWidths[' '];
-	int tab   = space * 6; // 6 spaces
-	int stop  = tab - x % tab;
-
-	if( stop < space )
-		return tab * 2 - x % tab; // select next
-
-	return stop;
-}
-
-int CL_DrawCharacter( float x, float y, int number, rgba_t color, cl_font_t *font, int flags )
-{
-	wrect_t *rc;
-	float w, h;
-	float s1, t1, s2, t2, half = 0.5f;
-	int texw, texh;
-
-	if( !font || !font->valid || y < -font->charHeight )
-		return 0;
-
-	// check if printable
-	if( number <= 32 )
-	{
-		if( number == ' ' )
-			return font->charWidths[' '];
-		else if( number == '\t' )
-			return CL_CalcTabStop( font, x );
-		return 0;
-	}
-
-	if( FBitSet( flags, FONT_DRAW_UTF8 ))
-		number = Con_UtfProcessChar( number & 255 );
-	else number &= 255;
-
-	if( !number || !font->charWidths[number])
-		return 0;
-
-	R_GetTextureParms( &texw, &texh, font->hFontTexture );
-	if( !texw || !texh )
-		return font->charWidths[number];
-
-	rc = &font->fontRc[number];
-	if( font->nearest || font->scale <= 1.0f )
-		half = 0;
-
-	s1 = ((float)rc->left + half ) / texw;
-	t1 = ((float)rc->top + half ) / texh;
-	s2 = ((float)rc->right - half ) / texw;
-	t2 = ((float)rc->bottom - half ) / texh;
-	w = ( rc->right - rc->left ) * font->scale;
-	h = ( rc->bottom - rc->top ) * font->scale;
-
-	if( FBitSet( flags, FONT_DRAW_HUD ))
-		SPR_AdjustSize( &x, &y, &w, &h );
-
-	if( !FBitSet( flags, FONT_DRAW_NORENDERMODE ))
-		ref.dllFuncs.GL_SetRenderMode( font->rendermode );
-
-	// don't apply color to fixed fonts it's already colored
-	if( font->type != FONT_FIXED || REF_GET_PARM( PARM_TEX_GLFORMAT, font->hFontTexture ) == 0x8045 ) // GL_LUMINANCE8_ALPHA8
-		ref.dllFuncs.Color4ub( color[0], color[1], color[2], color[3] );
-	else ref.dllFuncs.Color4ub( 255, 255, 255, color[3] );
-	ref.dllFuncs.R_DrawStretchPic( x, y, w, h, s1, t1, s2, t2, font->hFontTexture );
-
-	return font->charWidths[number];
-}
-
-int CL_DrawString( float x, float y, const char *s, rgba_t color, cl_font_t *font, int flags )
-{
-	rgba_t current_color;
-	int draw_len = 0;
-
-	if( !font || !font->valid )
-		return 0;
-
-	if( FBitSet( flags, FONT_DRAW_UTF8 ))
-		Con_UtfProcessChar( 0 ); // clear utf state
-
-	if( !FBitSet( flags, FONT_DRAW_NORENDERMODE ))
-		ref.dllFuncs.GL_SetRenderMode( font->rendermode );
-
-	Vector4Copy( color, current_color );
-
-	while( *s )
-	{
-		if( *s == '\n' )
-		{
-			s++;
-
-			if( !*s )
-				break;
-
-			// some client functions ignore newlines
-			if( !FBitSet( flags, FONT_DRAW_NOLF ))
-			{
-				draw_len = 0;
-				y += font->charHeight;
-			}
-
-			if( FBitSet( flags, FONT_DRAW_RESETCOLORONLF ))
-				 Vector4Copy( color, current_color );
-			continue;
-		}
-
-		if( IsColorString( s ))
-		{
-			// don't copy alpha
-			if( !FBitSet( flags, FONT_DRAW_FORCECOL ))
-				VectorCopy( g_color_table[ColorIndex(*( s + 1 ))], current_color );
-
-			s += 2;
-			continue;
-		}
-
-		// skip setting rendermode, it was changed for this string already
-		draw_len += CL_DrawCharacter( x + draw_len, y, (byte)*s, current_color, font, flags | FONT_DRAW_NORENDERMODE );
-
-		s++;
-	}
-
-	return draw_len;
-}
-
-int CL_DrawStringf( cl_font_t *font, float x, float y, rgba_t color, int flags, const char *fmt, ... )
-{
-	va_list va;
-	char buf[MAX_VA_STRING];
-
-	va_start( va, fmt );
-	Q_vsnprintf( buf, sizeof( buf ), fmt, va );
-	va_end( va );
-
-	return CL_DrawString( x, y, buf, color, font, flags );
-}
-
-void CL_DrawCharacterLen( cl_font_t *font, int number, int *width, int *height )
-{
-	if( !font || !font->valid ) return;
-	if( width )
-	{
-		if( number == '\t' )
-			*width = CL_CalcTabStop( font, 0 ); // at least return max tabstop
-		else *width = font->charWidths[number & 255];
-	}
-	if( height ) *height = font->charHeight;
-}
-
-void CL_DrawStringLen( cl_font_t *font, const char *s, int *width, int *height, int flags )
-{
-	int draw_len = 0;
-
-	if( !font || !font->valid )
-		return;
-
-	if( height )
-		*height = font->charHeight;
-
-	if( width )
-		*width = 0;
-
-	if( !COM_CheckString( s ))
-		return;
-
-	if( FBitSet( flags, FONT_DRAW_UTF8 ))
-		Con_UtfProcessChar( 0 ); // reset utf state
-
-	while( *s )
-	{
-		int number;
-
-		if( *s == '\n' )
-		{
-			// BUG: no check for end string here
-			// but high chances somebody's relying on this
-			s++;
-			draw_len = 0;
-			if( !FBitSet( flags, FONT_DRAW_NOLF ))
-			{
-				if( height )
-					*height += font->charHeight;
-			}
-			continue;
-		}
-		else if( *s == '\t' )
-		{
-			draw_len += CL_CalcTabStop( font, 0 ); // at least return max tabstop
-			s++;
-			continue;
-		}
-
-		if( IsColorString( s ))
-		{
-			s += 2;
-			continue;
-		}
-
-		if( FBitSet( flags, FONT_DRAW_UTF8 ))
-			number = Con_UtfProcessChar( (byte)*s );
-		else number = (byte)*s;
-
-		if( number )
-		{
-			draw_len += font->charWidths[number];
-
-			if( draw_len > *width )
-				*width = draw_len;
-		}
-
-		s++;
-	}
-}

engine/client/cl_frame.c

@@ -58,13 +58,10 @@ void CL_UpdatePositions( cl_entity_t *ent )
 
 	ent->current_position = (ent->current_position + 1) & HISTORY_MASK;
 	ph = &ent->ph[ent->current_position];
+
 	VectorCopy( ent->curstate.origin, ph->origin );
 	VectorCopy( ent->curstate.angles, ph->angles );
-
+	ph->animtime = ent->curstate.animtime;	// !!!
-	if( ent->model && ent->model->type == mod_brush )
-		ph->animtime = ent->curstate.animtime;
-	else
-		ph->animtime = cl.time;
 }
 
 /*
@@ -222,7 +219,7 @@ void CL_UpdateLatchedVars( cl_entity_t *ent )
 
 	if( ent->curstate.sequence != ent->prevstate.sequence )
 	{
-		memcpy( ent->latched.prevseqblending, ent->prevstate.blending, sizeof( ent->latched.prevseqblending ));
+		memcpy( ent->prevstate.blending, ent->latched.prevseqblending, sizeof( ent->prevstate.blending ));
 		ent->latched.prevsequence = ent->prevstate.sequence;
 		ent->latched.sequencetime = ent->curstate.animtime;
 	}
@@ -241,7 +238,7 @@ CL_GetStudioEstimatedFrame
 
 ====================
 */
-static float CL_GetStudioEstimatedFrame( cl_entity_t *ent )
+float CL_GetStudioEstimatedFrame( cl_entity_t *ent )
 {
 	studiohdr_t	*pstudiohdr;
 	mstudioseqdesc_t	*pseqdesc;
@@ -255,7 +252,7 @@ static float CL_GetStudioEstimatedFrame( cl_entity_t *ent )
 		{
 			sequence = bound( 0, ent->curstate.sequence, pstudiohdr->numseq - 1 );
 			pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + sequence;
-			return ref.dllFuncs.R_StudioEstimateFrame( ent, pseqdesc, cl.time );
+			return ref.dllFuncs.R_StudioEstimateFrame( ent, pseqdesc );
 		}
 	}
 
@@ -313,7 +310,7 @@ void CL_ProcessEntityUpdate( cl_entity_t *ent )
 	if( FBitSet( ent->curstate.entityType, ENTITY_NORMAL ))
 		COM_NormalizeAngles( ent->curstate.angles );
 
-	parametric = ent->curstate.starttime != 0.0f && ent->curstate.impacttime != 0.0f;
+	parametric = CL_ParametricMove( ent );
 
 	// allow interpolation on bmodels too
 	if( ent->model && ent->model->type == mod_brush )
@@ -352,7 +349,7 @@ find two timestamps
 qboolean CL_FindInterpolationUpdates( cl_entity_t *ent, float targettime, position_history_t **ph0, position_history_t **ph1 )
 {
 	qboolean	extrapolate = true;
-	uint		i, i0, i1, imod;
+	int	i, i0, i1, imod;
 	float	at;
 
 	imod = ent->current_position;
@@ -409,7 +406,7 @@ void CL_PureOrigin( cl_entity_t *ent, float t, vec3_t outorigin, vec3_t outangle
 
 		VectorSubtract( ph0->origin, ph1->origin, delta );
 
-		if( !Q_equal( t0, t1 ))
+		if( t0 != t1 )
 			frac = ( t - t1 ) / ( t0 - t1 );
 		else frac = 1.0f;
 
@@ -489,9 +486,7 @@ int CL_InterpolateModel( cl_entity_t *e )
 		return 0;
 	}
 
-	// HACKHACK: workaround buggy position history animtime
+	if( t2 == t1 )
-	// going backward sometimes
-	if( Q_equal( t2, t1 ) || t2 < t1 )
 	{
 		VectorCopy( ph0->origin, e->origin );
 		VectorCopy( ph0->angles, e->angles );
@@ -534,7 +529,7 @@ void CL_ComputePlayerOrigin( cl_entity_t *ent )
 	vec3_t	origin;
 	vec3_t	angles;
 
-	if( !ent->player )
+	if( !ent->player || ent->index == ( cl.playernum + 1 ))
 		return;
 
 	if( cl_nointerp->value > 0.f )
@@ -654,24 +649,6 @@ FRAME PARSING
 
 =========================================================================
 */
-static qboolean CL_ParseEntityNumFromPacket( sizebuf_t *msg, int *newnum )
-{
-	if( cls.legacymode )
-	{
-		*newnum = MSG_ReadWord( msg );
-		if( *newnum == 0 )
-			return false;
-	}
-	else
-	{
-		*newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
-		if( *newnum == LAST_EDICT )
-			return false;
-	}
-
-	return true;
-}
-
 /*
 =================
 CL_FlushEntityPacket
@@ -692,8 +669,8 @@ void CL_FlushEntityPacket( sizebuf_t *msg )
 	// read it all, but ignore it
 	while( 1 )
 	{
-		if( !CL_ParseEntityNumFromPacket( msg, &newnum ))
+		newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
-			break; // done
+		if( newnum == LAST_EDICT ) break; // done
 
 		if( MSG_CheckOverflow( msg ))
 			Host_Error( "CL_FlushEntityPacket: overflow\n" );
@@ -865,12 +842,21 @@ int CL_ParsePacketEntities( sizebuf_t *msg, qboolean delta )
 
 	while( 1 )
 	{
-		if( !CL_ParseEntityNumFromPacket( msg, &newnum ))
+		int lastedict;
-			break; // done
+		if( cls.legacymode )
+		{
+			newnum = MSG_ReadWord( msg );
+			lastedict = 0;
+		}
+		else
+		{
+			newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
+			lastedict = LAST_EDICT;
+		}
 
+		if( newnum == lastedict ) break; // end of packet entities
 		if( MSG_CheckOverflow( msg ))
 			Host_Error( "CL_ParsePacketEntities: overflow\n" );
-
 		player = CL_IsPlayerIndex( newnum );
 
 		while( oldnum < newnum )
@@ -979,25 +965,9 @@ all the visible entities should pass this filter
 */
 qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType )
 {
-	qboolean draw_player = true;
-
 	if( !ent || !ent->model )
 		return false;
 
-	// don't add the player in firstperson mode
-	if( RP_LOCALCLIENT( ent ))
-	{
-		cl.local.apply_effects = true;
-
-		if( !CL_IsThirdPerson( ) && ( ent->index == cl.viewentity ))
-		{
-			// we don't draw player in default renderer in firstperson mode
-			// but let the client.dll know about player entity anyway
-			// for use in custom renderers
-			draw_player = false;
-		}
-	}
-
 	// check for adding this entity
 	if( !clgame.dllFuncs.pfnAddEntity( entityType, ent, ent->model->name ))
 	{
@@ -1007,7 +977,8 @@ qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType )
 		return false;
 	}
 
-	if( !draw_player )
+	// don't add the player in firstperson mode
+	if( RP_LOCALCLIENT( ent ) && !CL_IsThirdPerson( ) && ( ent->index == cl.viewentity ))
 		return false;
 
 	if( entityType == ET_BEAM )
@@ -1022,8 +993,12 @@ qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType )
 
 	// because pTemp->entity.curstate.effects
 	// is already occupied by FTENT_FLICKER
-	if( entityType != ET_TEMPENTITY && !RP_LOCALCLIENT( ent ) )
+	if( entityType != ET_TEMPENTITY )
 	{
+		// no reason to do it twice
+		if( RP_LOCALCLIENT( ent ))
+			cl.local.apply_effects = false;
+
 		// apply client-side effects
 		CL_AddEntityEffects( ent );
 
@@ -1075,6 +1050,7 @@ void CL_LinkPlayers( frame_t *frame )
 	// apply muzzleflash to weaponmodel
 	if( ent && FBitSet( ent->curstate.effects, EF_MUZZLEFLASH ))
 		SetBits( clgame.viewent.curstate.effects, EF_MUZZLEFLASH );
+	cl.local.apply_effects = true;
 
 	// check all the clients but add only visible
 	for( i = 0, state = frame->playerstate; i < MAX_CLIENTS; i++, state++ )
@@ -1113,9 +1089,6 @@ void CL_LinkPlayers( frame_t *frame )
 
 		if ( i == cl.playernum )
 		{
-			// using interpolation only for local player angles
-			CL_ComputePlayerOrigin( ent );
-
 			if( cls.demoplayback == DEMO_QUAKE1 )
 				VectorLerp( ent->prevstate.origin, cl.lerpFrac, ent->curstate.origin, cl.simorg );
 			VectorCopy( cl.simorg, ent->origin );

engine/client/cl_gameui.c

@@ -309,7 +309,7 @@ static void GAME_EXPORT UI_DrawLogo( const char *filename, float x, float y, flo
 
 		// run cinematic if not
 		Q_snprintf( path, sizeof( path ), "media/%s", filename );
-		COM_DefaultExtension( path, ".avi", sizeof( path ));
+		COM_DefaultExtension( path, ".avi" );
 		fullpath = FS_GetDiskPath( path, false );
 
 		if( FS_FileExists( path, false ) && !fullpath )
@@ -417,8 +417,54 @@ static void UI_ConvertGameInfo( GAMEINFO *out, gameinfo_t *in )
 		out->flags |= GFL_NOMODELS;
 	if( in->noskills )
 		out->flags |= GFL_NOSKILLS;
-	if( in->render_picbutton_text )
+}
-		out->flags |= GFL_RENDER_PICBUTTON_TEXT;
+
+static qboolean PIC_Scissor( float *x, float *y, float *width, float *height, float *u0, float *v0, float *u1, float *v1 )
+{
+	float	dudx, dvdy;
+
+	// clip sub rect to sprite
+	if(( width == 0 ) || ( height == 0 ))
+		return false;
+
+	if( *x + *width <= gameui.ds.scissor_x )
+		return false;
+	if( *x >= gameui.ds.scissor_x + gameui.ds.scissor_width )
+		return false;
+	if( *y + *height <= gameui.ds.scissor_y )
+		return false;
+	if( *y >= gameui.ds.scissor_y + gameui.ds.scissor_height )
+		return false;
+
+	dudx = (*u1 - *u0) / *width;
+	dvdy = (*v1 - *v0) / *height;
+
+	if( *x < gameui.ds.scissor_x )
+	{
+		*u0 += (gameui.ds.scissor_x - *x) * dudx;
+		*width -= gameui.ds.scissor_x - *x;
+		*x = gameui.ds.scissor_x;
+	}
+
+	if( *x + *width > gameui.ds.scissor_x + gameui.ds.scissor_width )
+	{
+		*u1 -= (*x + *width - (gameui.ds.scissor_x + gameui.ds.scissor_width)) * dudx;
+		*width = gameui.ds.scissor_x + gameui.ds.scissor_width - *x;
+	}
+
+	if( *y < gameui.ds.scissor_y )
+	{
+		*v0 += (gameui.ds.scissor_y - *y) * dvdy;
+		*height -= gameui.ds.scissor_y - *y;
+		*y = gameui.ds.scissor_y;
+	}
+
+	if( *y + *height > gameui.ds.scissor_y + gameui.ds.scissor_height )
+	{
+		*v1 -= (*y + *height - (gameui.ds.scissor_y + gameui.ds.scissor_height)) * dvdy;
+		*height = gameui.ds.scissor_y + gameui.ds.scissor_height - *y;
+	}
+	return true;
 }
 
 /*
@@ -439,10 +485,10 @@ static void PIC_DrawGeneric( float x, float y, float width, float height, const
 	if( prc )
 	{
 		// calc user-defined rectangle
-		s1 = prc->left / (float)w;
+		s1 = (float)prc->left / (float)w;
-		t1 = prc->top / (float)h;
+		t1 = (float)prc->top / (float)h;
-		s2 = prc->right / (float)w;
+		s2 = (float)prc->right / (float)w;
-		t2 = prc->bottom / (float)h;
+		t2 = (float)prc->bottom / (float)h;
 
 		if( width == -1 && height == -1 )
 		{
@@ -463,9 +509,10 @@ static void PIC_DrawGeneric( float x, float y, float width, float height, const
 	}
 
 	// pass scissor test if supposed
-	if( !CL_Scissor( &gameui.ds.scissor, &x, &y, &width, &height, &s1, &t1, &s2, &t2 ))
+	if( gameui.ds.scissor_test && !PIC_Scissor( &x, &y, &width, &height, &s1, &t1, &s2, &t2 ))
 		return;
 
+	PicAdjustSize( &x, &y, &width, &height );
 	ref.dllFuncs.R_DrawStretchPic( x, y, width, height, s1, t1, s2, t2, gameui.ds.gl_texturenum );
 	ref.dllFuncs.Color4ub( 255, 255, 255, 255 );
 }
@@ -610,7 +657,11 @@ static void GAME_EXPORT pfnPIC_EnableScissor( int x, int y, int width, int heigh
 	width = bound( 0, width, gameui.globals->scrWidth - x );
 	height = bound( 0, height, gameui.globals->scrHeight - y );
 
-	CL_EnableScissor( &gameui.ds.scissor, x, y, width, height );
+	gameui.ds.scissor_x = x;
+	gameui.ds.scissor_width = width;
+	gameui.ds.scissor_y = y;
+	gameui.ds.scissor_height = height;
+	gameui.ds.scissor_test = true;
 }
 
 /*
@@ -621,7 +672,11 @@ pfnPIC_DisableScissor
 */
 static void GAME_EXPORT pfnPIC_DisableScissor( void )
 {
-	CL_DisableScissor( &gameui.ds.scissor );
+	gameui.ds.scissor_x = 0;
+	gameui.ds.scissor_width = 0;
+	gameui.ds.scissor_y = 0;
+	gameui.ds.scissor_height = 0;
+	gameui.ds.scissor_test = false;
 }
 
 /*
@@ -709,7 +764,7 @@ static void GAME_EXPORT pfnDrawCharacter( int ix, int iy, int iwidth, int iheigh
 	t2 = t1 + size;
 
 	// pass scissor test if supposed
-	if( !CL_Scissor( &gameui.ds.scissor, &x, &y, &width, &height, &s1, &t1, &s2, &t2 ))
+	if( gameui.ds.scissor_test && !PIC_Scissor( &x, &y, &width, &height, &s1, &t1, &s2, &t2 ))
 		return;
 
 	ref.dllFuncs.GL_SetRenderMode( kRenderTransTexture );
@@ -838,7 +893,7 @@ send client connect
 */
 static void GAME_EXPORT pfnClientJoin( const netadr_t adr )
 {
-	Cbuf_AddTextf( "connect %s\n", NET_AdrToString( adr ));
+	Cbuf_AddText( va( "connect %s\n", NET_AdrToString( adr )));
 }
 
 /*
@@ -923,7 +978,7 @@ pfnGetGamesList
 */
 static GAMEINFO ** GAME_EXPORT pfnGetGamesList( int *numGames )
 {
-	if( numGames ) *numGames = FI->numgames;
+	if( numGames ) *numGames = SI.numgames;
 	return gameui.modsInfo;
 }
 
@@ -1003,7 +1058,10 @@ pfnChangeInstance
 */
 static void GAME_EXPORT pfnChangeInstance( const char *newInstance, const char *szFinalMessage )
 {
-	Con_Reportf( S_ERROR "ChangeInstance menu call is deprecated!\n" );
+	if( !szFinalMessage ) szFinalMessage = "";
+	if( !newInstance || !*newInstance ) return;
+
+	Host_NewInstance( newInstance, szFinalMessage );
 }
 
 /*
@@ -1060,30 +1118,6 @@ static char *pfnParseFile( char *buf, char *token )
 	return COM_ParseFile( buf, token, INT_MAX );
 }
 
-/*
-=============
-pfnFileExists
-
-legacy wrapper
-=============
-*/
-static int pfnFileExists( const char *path, int gamedironly )
-{
-	return FS_FileExists( path, gamedironly );
-}
-
-/*
-=============
-pfnDelete
-
-legacy wrapper
-=============
-*/
-static int pfnDelete( const char *path )
-{
-	return FS_Delete( path );
-}
-
 // engine callbacks
 static ui_enginefuncs_t gEngfuncs =
 {
@@ -1130,7 +1164,7 @@ static ui_enginefuncs_t gEngfuncs =
 	pfnRenderScene,
 	pfnAddEntity,
 	Host_Error,
-	pfnFileExists,
+	FS_FileExists,
 	pfnGetGameDir,
 	Cmd_CheckMapsList,
 	CL_Active,
@@ -1169,7 +1203,7 @@ static ui_enginefuncs_t gEngfuncs =
 	COM_CompareFileTime,
 	VID_GetModeString,
 	(void*)COM_SaveFile,
-	pfnDelete
+	(void*)FS_Delete
 };
 
 static void pfnEnableTextInput( int enable )
@@ -1191,11 +1225,6 @@ static int pfnGetRenderers( unsigned int num, char *shortName, size_t size1, cha
 	return 1;
 }
 
-static char *pfnParseFileSafe( char *data, char *buf, const int size, unsigned int flags, int *len )
-{
-	return COM_ParseFileSafe( data, buf, size, flags, len, NULL );
-}
-
 static ui_extendedfuncs_t gExtendedfuncs =
 {
 	pfnEnableTextInput,
@@ -1204,9 +1233,7 @@ static ui_extendedfuncs_t gExtendedfuncs =
 	Con_UtfMoveRight,
 	pfnGetRenderers,
 	Sys_DoubleTime,
-	pfnParseFileSafe,
+	_COM_ParseFileSafe
-	NET_AdrToString,
-	NET_CompareAdrSort,
 };
 
 void UI_UnloadProgs( void )
@@ -1326,13 +1353,13 @@ qboolean UI_LoadProgs( void )
 	Cvar_FullSet( "host_gameuiloaded", "1", FCVAR_READ_ONLY );
 
 	// setup gameinfo
-	for( i = 0; i < FI->numgames; i++ )
+	for( i = 0; i < SI.numgames; i++ )
 	{
 		gameui.modsInfo[i] = Mem_Calloc( gameui.mempool, sizeof( GAMEINFO ));
-		UI_ConvertGameInfo( gameui.modsInfo[i], FI->games[i] );
+		UI_ConvertGameInfo( gameui.modsInfo[i], SI.games[i] );
 	}
 
-	UI_ConvertGameInfo( &gameui.gameInfo, FI->GameInfo ); // current gameinfo
+	UI_ConvertGameInfo( &gameui.gameInfo, SI.GameInfo ); // current gameinfo
 
 	// setup globals
 	gameui.globals->developer = host.allow_console;

engine/client/cl_main.c

@@ -22,14 +22,12 @@ GNU General Public License for more details.
 #include "vgui_draw.h"
 #include "library.h"
 #include "vid_common.h"
-#include "pm_local.h"
-#include "sequence.h"
 
 #define MAX_TOTAL_CMDS		32
 #define MAX_CMD_BUFFER		8000
 #define CONNECTION_PROBLEM_TIME	15.0	// 15 seconds
 #define CL_CONNECTION_RETRIES		10
-#define CL_TEST_RETRIES_NORESPONCE	3
+#define CL_TEST_RETRIES_NORESPONCE	2
 #define CL_TEST_RETRIES		5
 
 CVAR_DEFINE_AUTO( mp_decals, "300", FCVAR_ARCHIVE, "decals limit in multiplayer" );
@@ -40,8 +38,8 @@ CVAR_DEFINE_AUTO( cl_allow_upload, "1", FCVAR_ARCHIVE, "allow to uploading resou
 CVAR_DEFINE_AUTO( cl_download_ingame, "1", FCVAR_ARCHIVE, "allow to downloading resources while client is active" );
 CVAR_DEFINE_AUTO( cl_logofile, "lambda", FCVAR_ARCHIVE, "player logo name" );
 CVAR_DEFINE_AUTO( cl_logocolor, "orange", FCVAR_ARCHIVE, "player logo color" );
-CVAR_DEFINE_AUTO( cl_logoext, "bmp", FCVAR_ARCHIVE, "temporary cvar to tell engine which logo must be packed" );
 CVAR_DEFINE_AUTO( cl_test_bandwidth, "1", FCVAR_ARCHIVE, "test network bandwith before connection" );
+convar_t	*rcon_client_password;
 convar_t	*rcon_address;
 convar_t	*cl_timeout;
 convar_t	*cl_nopred;
@@ -58,7 +56,6 @@ convar_t	*cl_nosmooth;
 convar_t	*cl_smoothtime;
 convar_t	*cl_clockreset;
 convar_t	*cl_fixtimerate;
-convar_t	*hud_fontscale;
 convar_t	*hud_scale;
 convar_t	*cl_solid_players;
 convar_t	*cl_draw_beams;
@@ -73,7 +70,6 @@ convar_t	*cl_upmax;
 convar_t	*cl_lw;
 convar_t	*cl_charset;
 convar_t	*cl_trace_messages;
-convar_t	*cl_nat;
 convar_t	*hud_utf8;
 convar_t	*ui_renderworld;
 
@@ -150,6 +146,16 @@ qboolean CL_DisableVisibility( void )
 	return cls.envshot_disable_vis;
 }
 
+qboolean CL_IsBackgroundDemo( void )
+{
+	return ( cls.demoplayback && cls.demonum != -1 );
+}
+
+qboolean CL_IsBackgroundMap( void )
+{
+	return ( cl.background && !cls.demoplayback );
+}
+
 char *CL_Userinfo( void )
 {
 	return cls.userinfo;
@@ -189,6 +195,8 @@ void CL_CheckClientState( void )
 		Netchan_ReportFlow( &cls.netchan );
 
 		Con_DPrintf( "client connected at %.2f sec\n", Sys_DoubleTime() - cls.timestart );
+		if(( cls.demoplayback || cls.disable_servercount != cl.servercount ) && cl.video_prepped )
+			SCR_EndLoadingPlaque(); // get rid of loading plaque
 	}
 }
 
@@ -226,17 +234,18 @@ void CL_SignonReply( void )
 			Mem_PrintStats();
 		break;
 	case 2:
-		SCR_EndLoadingPlaque();
 		if( cl.proxy_redirect && !cls.spectator )
 			CL_Disconnect();
 		cl.proxy_redirect = false;
-
-		if( cls.demoplayback )
-			Sequence_OnLevelLoad( clgame.mapname );
 		break;
 	}
 }
 
+float CL_LerpInterval( void )
+{
+	return max( cl_interp->value, 1.f / cl_updaterate->value );
+}
+
 /*
 ===============
 CL_LerpPoint
@@ -247,26 +256,55 @@ should be put at.
 */
 static float CL_LerpPoint( void )
 {
-	double f = cl_serverframetime();
+	float frac = 1.0f;
-	double frac;
+	float server_frametime = cl_serverframetime();
 
-	if( f == 0.0 || cls.timedemo )
+	if( server_frametime == 0.0f || cls.timedemo )
 	{
-		double fgap = cl_clientframetime();
 		cl.time = cl.mtime[0];
-
-		// maybe don't need for Xash demos
-		if( cls.demoplayback )
-			cl.oldtime = cl.mtime[0] - fgap;
-
 		return 1.0f;
 	}
 
-	if( cl_interp->value <= 0.001 )
+	if( server_frametime > 0.1f )
-		return 1.0f;
+	{
-
+		// dropped packet, or start of demo
-	frac = ( cl.time - cl.mtime[0] ) / cl_interp->value;
+		cl.mtime[1] = cl.mtime[0] - 0.1f;
-
+		server_frametime = 0.1f;
+	}
+#if 0
+	/*
+	g-cont: this code more suitable for singleplayer
+	NOTE in multiplayer causes significant framerate stutter/jitter and
+	occuring frames with zero time delta and even with negative time delta.
+	game becomes more twitchy and as if without interpolation.
+	*/
+	frac = (cl.time - cl.mtime[1]) / f;
+	if( frac < 0.0f )
+	{
+		if( frac < -0.01f )
+			cl.time = cl.mtime[1];
+		frac = 0.0f;
+	}
+	else if( frac > 1.0f )
+	{
+		if( frac > 1.01f )
+			cl.time = cl.mtime[0];
+		frac = 1.0f;
+	}
+#else
+	// for multiplayer
+	if( cl_interp->value > 0.001f )
+	{
+		// manual lerp value (goldsrc mode)
+		float td = max( 0.f, cl.time - cl.mtime[0] );
+		frac = td / CL_LerpInterval();
+	}
+	else if( server_frametime > 0.001f )
+	{
+		// automatic lerp (classic mode)
+		frac = ( cl.time - cl.mtime[1] ) / server_frametime;  
+	}
+#endif
 	return frac;
 }
 
@@ -308,7 +346,7 @@ Validate interpolation cvars, calc interpolation window
 void CL_ComputeClientInterpolationAmount( usercmd_t *cmd )
 {
 	const float epsilon = 0.001f; // to avoid float invalid comparision
-	float min_interp;
+	float min_interp = MIN_EX_INTERP;
 	float max_interp = MAX_EX_INTERP;
 	float interpolation_time;
 
@@ -328,7 +366,7 @@ void CL_ComputeClientInterpolationAmount( usercmd_t *cmd )
 		max_interp = 0.2f;
 
 	min_interp = 1.0f / cl_updaterate->value;
-	interpolation_time = cl_interp->value * 1000.0;
+	interpolation_time = CL_LerpInterval( );
 	
 	if( (cl_interp->value + epsilon) < min_interp )
 	{
@@ -490,7 +528,7 @@ qboolean CL_ProcessShowTexturesCmds( usercmd_t *cmd )
 	if( released & ( IN_RIGHT|IN_MOVERIGHT ))
 		Cvar_SetValue( "r_showtextures", gl_showtextures->value + 1 );
 	if( released & ( IN_LEFT|IN_MOVELEFT ))
-		Cvar_SetValue( "r_showtextures", Q_max( 1, gl_showtextures->value - 1 ));
+		Cvar_SetValue( "r_showtextures", max( 1, gl_showtextures->value - 1 ));
 	oldbuttons = cmd->buttons;
 
 	return true;
@@ -584,7 +622,7 @@ CL_CreateCmd
 */
 void CL_CreateCmd( void )
 {
-	usercmd_t	nullcmd, *cmd;
+	usercmd_t		cmd;
 	runcmd_t		*pcmd;
 	vec3_t		angles;
 	qboolean		active;
@@ -597,6 +635,7 @@ void CL_CreateCmd( void )
 	// store viewangles in case it's will be freeze
 	VectorCopy( cl.viewangles, angles );
 	ms = bound( 1, host.frametime * 1000, 255 );
+	memset( &cmd, 0, sizeof( cmd ));
 	input_override = 0;
 
 	CL_SetSolidEntities();
@@ -615,18 +654,12 @@ void CL_CreateCmd( void )
 		pcmd->receivedtime = -1.0;
 		pcmd->heldback = false;
 		pcmd->sendsize = 0;
-		cmd = &pcmd->cmd;
-	}
-	else
-	{
-		memset( &nullcmd, 0, sizeof( nullcmd ));
-		cmd = &nullcmd;
 	}
 
 	active = (( cls.signon == SIGNONS ) && !cl.paused && !cls.demoplayback );
 	Platform_PreCreateMove();
-	clgame.dllFuncs.CL_CreateMove( host.frametime, cmd, active );
+	clgame.dllFuncs.CL_CreateMove( host.frametime, &pcmd->cmd, active );
-	IN_EngineAppendMove( host.frametime, cmd, active  );
+	IN_EngineAppendMove( host.frametime, &pcmd->cmd, active  );
 
 	CL_PopPMStates();
 
@@ -703,22 +736,15 @@ void CL_WritePacket( void )
 
 	CL_ComputePacketLoss ();
 
-	memset( data, 0, sizeof( data ));
 	MSG_Init( &buf, "ClientData", data, sizeof( data ));
 
 	// Determine number of backup commands to send along
-	numbackup = bound( 0, cl_cmdbackup->value, cls.legacymode ? MAX_LEGACY_BACKUP_CMDS : MAX_BACKUP_COMMANDS );
+	numbackup = bound( 0, cl_cmdbackup->value, MAX_BACKUP_COMMANDS );
 	if( cls.state == ca_connected ) numbackup = 0;
 
 	// clamp cmdrate
-	if( cl_cmdrate->value < 10.0f )
+	if( cl_cmdrate->value < 0.0f ) Cvar_SetValue( "cl_cmdrate", 0.0f );
-	{
+	else if( cl_cmdrate->value > 100.0f ) Cvar_SetValue( "cl_cmdrate", 100.0f );
-		Cvar_SetValue( "cl_cmdrate", 10.0f );
-	}
-	else if( cl_cmdrate->value > 100.0f )
-	{
-		Cvar_SetValue( "cl_cmdrate", 100.0f );
-	}
 
 	// Check to see if we can actually send this command
 
@@ -748,7 +774,6 @@ void CL_WritePacket( void )
 		if(( host.realtime - cls.netchan.last_received ) > CONNECTION_PROBLEM_TIME )
 		{
 			Con_NPrintf( 1, "^3Warning:^1 Connection Problem^7\n" );
-			Con_NPrintf( 2, "^1Auto-disconnect in %.1f seconds^7", cl_timeout->value - ( host.realtime - cls.netchan.last_received ));
 			cl.validsequence = 0;
 		}
 	}
@@ -788,13 +813,12 @@ void CL_WritePacket( void )
 		newcmds = ( cls.netchan.outgoing_sequence - cls.lastoutgoingcommand );
 
 		// put an upper/lower bound on this
-		newcmds = bound( 0, newcmds, cls.legacymode ? MAX_LEGACY_TOTAL_CMDS: MAX_TOTAL_CMDS );
+		newcmds = bound( 0, newcmds, cls.legacymode?MAX_LEGACY_TOTAL_CMDS:MAX_TOTAL_CMDS );
 		if( cls.state == ca_connected ) newcmds = 0;
 
 		MSG_WriteByte( &buf, newcmds );
 
 		numcmds = newcmds + numbackup;
-
 		from = -1;
 
 		for( i = numcmds - 1; i >= 0; i-- )
@@ -840,9 +864,6 @@ void CL_WritePacket( void )
 		cl.commands[cls.netchan.outgoing_sequence & CL_UPDATE_MASK].sendsize = MSG_GetNumBytesWritten( &buf );
 		cl.commands[cls.netchan.outgoing_sequence & CL_UPDATE_MASK].heldback = false;
 
-		// send voice data to the server
-		CL_AddVoiceToDatagram();
-
 		// composite the rest of the datagram..
 		if( MSG_GetNumBitsWritten( &cls.datagram ) <= MSG_GetNumBitsLeft( &buf ))
 			MSG_WriteBits( &buf, MSG_GetData( &cls.datagram ), MSG_GetNumBitsWritten( &cls.datagram ));
@@ -1020,12 +1041,9 @@ void CL_SendConnectPacket( void )
 		input_devices = IN_CollectInputDevices();
 		IN_LockInputDevices( true );
 
-		Cvar_SetCheatState();
+		Info_SetValueForKey( protinfo, "d", va( "%d", input_devices ), sizeof( protinfo ) );
-		Cvar_FullSet( "sv_cheats", "0", FCVAR_READ_ONLY | FCVAR_SERVER );
-
-		Info_SetValueForKeyf( protinfo, "d", sizeof( protinfo ),  "%d", input_devices );
 		Info_SetValueForKey( protinfo, "v", XASH_VERSION, sizeof( protinfo ) );
-		Info_SetValueForKeyf( protinfo, "b", sizeof( protinfo ), "%d", Q_buildnum( ));
+		Info_SetValueForKey( protinfo, "b", va( "%d", Q_buildnum() ), sizeof( protinfo ) );
 		Info_SetValueForKey( protinfo, "o", Q_buildos(), sizeof( protinfo ) );
 		Info_SetValueForKey( protinfo, "a", Q_buildarch(), sizeof( protinfo ) );
 	}
@@ -1059,7 +1077,7 @@ void CL_SendConnectPacket( void )
 
 		Info_SetValueForKey( protinfo, "uuid", key, sizeof( protinfo ));
 		Info_SetValueForKey( protinfo, "qport", qport, sizeof( protinfo ));
-		Info_SetValueForKeyf( protinfo, "ext", sizeof( protinfo ), "%d", extensions);
+		Info_SetValueForKey( protinfo, "ext", va("%d", extensions), sizeof( protinfo ));
 
 		Netchan_OutOfBandPrint( NS_CLIENT, adr, "connect %i %i \"%s\" \"%s\"\n", PROTOCOL_VERSION, cls.challenge, protinfo, cls.userinfo );
 		Con_Printf( "Trying to connect by modern protocol\n" );
@@ -1077,9 +1095,8 @@ Resend a connect message if the last one has timed out
 */
 void CL_CheckForResend( void )
 {
-	netadr_t adr;
+	netadr_t	adr;
-	net_gai_state_t res;
+	int res;
-	qboolean bandwidthTest;
 
 	if( cls.internetservers_wait )
 		CL_InternetServers_f();
@@ -1111,13 +1128,13 @@ void CL_CheckForResend( void )
 
 	res = NET_StringToAdrNB( cls.servername, &adr );
 
-	if( res == NET_EAI_NONAME )
+	if( !res )
 	{
 		CL_Disconnect();
 		return;
 	}
 
-	if( res == NET_EAI_AGAIN )
+	if( res == 2 )
 	{
 		cls.connect_time = MAX_HEARTBEAT;
 		return;
@@ -1144,18 +1161,14 @@ void CL_CheckForResend( void )
 		return;
 	}
 
-	bandwidthTest = !cls.legacymode && cl_test_bandwidth.value;
 	cls.serveradr = adr;
-	cls.max_fragment_size = Q_min( FRAGMENT_MAX_SIZE, cls.max_fragment_size / (cls.connect_retry + 1));
+	cls.max_fragment_size = Q_max( FRAGMENT_MAX_SIZE, cls.max_fragment_size >> Q_min( 1, cls.connect_retry ));
 	cls.connect_time = host.realtime; // for retransmit requests
 	cls.connect_retry++;
 
-	if( bandwidthTest )
+	Con_Printf( "Connecting to %s... [retry #%i]\n", cls.servername, cls.connect_retry );
-		Con_Printf( "Connecting to %s... [retry #%i, max fragment size %i]\n", cls.servername, cls.connect_retry, cls.max_fragment_size );
-	else
-		Con_Printf( "Connecting to %s... [retry #%i]\n", cls.servername, cls.connect_retry );
 
-	if( bandwidthTest )
+	if( !cls.legacymode && cl_test_bandwidth.value )
 		Netchan_OutOfBandPrint( NS_CLIENT, adr, "bandwidth %i %i\n", PROTOCOL_VERSION, cls.max_fragment_size );
 	else
 		Netchan_OutOfBandPrint( NS_CLIENT, adr, "getchallenge\n" );
@@ -1180,7 +1193,7 @@ resource_t *CL_AddResource( resourcetype_t type, const char *name, int size, qbo
 
 void CL_CreateResourceList( void )
 {
-	char szFileName[MAX_OSPATH];
+	char		szFileName[MAX_OSPATH];
 	byte		rgucMD5_hash[16];
 	resource_t	*pNewResource;
 	int		nSize;
@@ -1188,36 +1201,30 @@ void CL_CreateResourceList( void )
 
 	HPAK_FlushHostQueue();
 	cl.num_resources = 0;
+
+	Q_snprintf( szFileName, sizeof( szFileName ), "logos/remapped.bmp" );
 	memset( rgucMD5_hash, 0, sizeof( rgucMD5_hash ));
 
-	// sanitize cvar value
-	if( Q_strcmp( cl_logoext.string, "bmp" ) &&
-		 Q_strcmp( cl_logoext.string, "png" ))
-		Cvar_DirectSet( &cl_logoext, "bmp" );
-
-	Q_snprintf( szFileName, sizeof( szFileName ),
-		"logos/remapped.%s", cl_logoext.string );
 	fp = FS_Open( szFileName, "rb", true );
 
-	if( !fp )
+	if( fp )
-		return;
-
-	MD5_HashFile( rgucMD5_hash, szFileName, NULL );
-	nSize = FS_FileLength( fp );
-
-	if( nSize != 0 )
 	{
-		pNewResource = CL_AddResource( t_decal, szFileName, nSize, false, 0 );
+		MD5_HashFile( rgucMD5_hash, szFileName, NULL );
+		nSize = FS_FileLength( fp );
 
-		if( pNewResource )
+		if( nSize != 0 )
 		{
-			SetBits( pNewResource->ucFlags, RES_CUSTOM );
+			pNewResource = CL_AddResource( t_decal, szFileName, nSize, false, 0 );
-			memcpy( pNewResource->rgucMD5_hash, rgucMD5_hash, 16 );
-			HPAK_AddLump( false, CUSTOM_RES_PATH, pNewResource, NULL, fp );
-		}
-	}
 
-	FS_Close( fp );
+			if( pNewResource )
+			{
+				SetBits( pNewResource->ucFlags, RES_CUSTOM );
+				memcpy( pNewResource->rgucMD5_hash, rgucMD5_hash, 16 );
+				HPAK_AddLump( false, CUSTOM_RES_PATH, pNewResource, NULL, fp );
+			}
+		}
+		FS_Close( fp );
+	}
 }
 
 /*
@@ -1246,7 +1253,7 @@ void CL_Connect_f( void )
 
 	// if running a local server, kill it and reissue
 	if( SV_Active( )) Host_ShutdownServer();
-	NET_Config( true, !CVAR_TO_BOOL( cl_nat )); // allow remote
+	NET_Config( true ); // allow remote
 
 	Con_Printf( "server %s\n", server );
 	CL_Disconnect();
@@ -1277,10 +1284,9 @@ void CL_Rcon_f( void )
 {
 	char	message[1024];
 	netadr_t	to;
-	string command;
 	int	i;
 
-	if( !COM_CheckString( rcon_password.string ))
+	if( !COM_CheckString( rcon_client_password->string ))
 	{
 		Con_Printf( "You must set 'rcon_password' before issuing an rcon command.\n" );
 		return;
@@ -1292,17 +1298,16 @@ void CL_Rcon_f( void )
 	message[3] = (char)255;
 	message[4] = 0;
 
-	NET_Config( true, false );	// allow remote
+	NET_Config( true );	// allow remote
 
-	Q_strncat( message, "rcon ", sizeof( message ));
+	Q_strcat( message, "rcon " );
-	Q_strncat( message, rcon_password.string, sizeof( message ));
+	Q_strcat( message, rcon_client_password->string );
-	Q_strncat( message, " ", sizeof( message ) );
+	Q_strcat( message, " " );
 
 	for( i = 1; i < Cmd_Argc(); i++ )
 	{
-		Cmd_Escape( command, Cmd_Argv( i ), sizeof( command ));
+		Q_strcat( message, Cmd_Argv( i ));
-		Q_strncat( message, command, sizeof( message ));
+		Q_strcat( message, " " );
-		Q_strncat( message, " ", sizeof( message ));
 	}
 
 	if( cls.state >= ca_connected )
@@ -1344,7 +1349,7 @@ void CL_ClearState( void )
 	CL_ClearEffects ();
 	CL_FreeEdicts ();
 
-	PM_ClearPhysEnts( clgame.pmove );
+	CL_ClearPhysEnts ();
 	NetAPI_CancelAllRequests();
 
 	// wipe the entire cl structure
@@ -1352,7 +1357,6 @@ void CL_ClearState( void )
 	MSG_Clear( &cls.netchan.message );
 	memset( &clgame.fade, 0, sizeof( clgame.fade ));
 	memset( &clgame.shake, 0, sizeof( clgame.shake ));
-	clgame.mapname[0] = '\0';
 	Cvar_FullSet( "cl_background", "0", FCVAR_READ_ONLY );
 	cl.maxclients = 1; // allow to drawing player in menu
 	cl.mtime[0] = cl.mtime[1] = 1.0f; // because level starts from 1.0f second
@@ -1494,7 +1498,6 @@ void CL_Disconnect( void )
 	cls.connect_time = 0;
 	cls.changedemo = false;
 	cls.max_fragment_size = FRAGMENT_MAX_SIZE; // reset fragment size
-	Voice_Disconnect();
 	CL_Stop_f();
 
 	// send a disconnect message to the server
@@ -1557,43 +1560,17 @@ void CL_LocalServers_f( void )
 	netadr_t	adr;
 
 	Con_Printf( "Scanning for servers on the local network area...\n" );
-	NET_Config( true, true ); // allow remote
+	NET_Config( true ); // allow remote
+	cls.legacyservercount = 0;
 
 	// send a broadcast packet
 	adr.type = NA_BROADCAST;
 	adr.port = MSG_BigShort( PORT_SERVER );
-	Netchan_OutOfBandPrint( NS_CLIENT, adr, "info %i", PROTOCOL_VERSION );
 
-	adr.type = NA_MULTICAST_IP6;
 	Netchan_OutOfBandPrint( NS_CLIENT, adr, "info %i", PROTOCOL_VERSION );
 }
 
-/*
+#define MS_SCAN_REQUEST "1\xFF" "0.0.0.0:0\0"
-=================
-CL_BuildMasterServerScanRequest
-=================
-*/
-size_t CL_BuildMasterServerScanRequest( char *buf, size_t size, qboolean nat )
-{
-	size_t remaining;
-	char *info;
-
-	if( unlikely( size < sizeof( MS_SCAN_REQUEST )))
-		return 0;
-
-	Q_strncpy( buf, MS_SCAN_REQUEST, size );
-
-	info = buf + sizeof( MS_SCAN_REQUEST ) - 1;
-	remaining = size - sizeof( MS_SCAN_REQUEST );
-
-	info[0] = 0;
-
-	Info_SetValueForKey( info, "gamedir", GI->gamefolder, remaining );
-	Info_SetValueForKey( info, "clver", XASH_VERSION, remaining ); // let master know about client version
-	Info_SetValueForKey( info, "nat", nat ? "1" : "0", remaining );
-
-	return sizeof( MS_SCAN_REQUEST ) + Q_strlen( info );
-}
 
 /*
 =================
@@ -1602,17 +1579,19 @@ CL_InternetServers_f
 */
 void CL_InternetServers_f( void )
 {
-	char	fullquery[512];
+	char	fullquery[512] = MS_SCAN_REQUEST;
-	size_t len;
+	char *info = fullquery + sizeof( MS_SCAN_REQUEST ) - 1;
-	qboolean nat = cl_nat->value != 0.0f;
+	const size_t remaining = sizeof( fullquery ) - sizeof( MS_SCAN_REQUEST );
 
-	len = CL_BuildMasterServerScanRequest( fullquery, sizeof( fullquery ), nat );
+	NET_Config( true ); // allow remote
 
 	Con_Printf( "Scanning for servers on the internet area...\n" );
+	Info_SetValueForKey( info, "gamedir", GI->gamefolder, remaining );
+	Info_SetValueForKey( info, "clver", XASH_VERSION, remaining ); // let master know about client version
+	// Info_SetValueForKey( info, "nat", cl_nat->string, remaining );
+	cls.legacyservercount = 0;
 
-	NET_Config( true, true ); // allow remote
+	cls.internetservers_wait = NET_SendToMasters( NS_CLIENT, sizeof( MS_SCAN_REQUEST ) + Q_strlen( info ), fullquery );
-
-	cls.internetservers_wait = NET_SendToMasters( NS_CLIENT, len, fullquery );
 	cls.internetservers_pending = true;
 
 	if( !cls.internetservers_wait )
@@ -1646,8 +1625,6 @@ void CL_Reconnect_f( void )
 
 	if( COM_CheckString( cls.servername ))
 	{
-		qboolean legacy = cls.legacymode;
-
 		if( cls.state >= ca_connected )
 			CL_Disconnect();
 
@@ -1655,7 +1632,6 @@ void CL_Reconnect_f( void )
 		cls.demonum = cls.movienum = -1;	// not in the demo loop now
 		cls.state = ca_connecting;
 		cls.signon = 0;
-		cls.legacymode = legacy; // don't change protocol
 
 		Con_Printf( "reconnecting...\n" );
 	}
@@ -1737,40 +1713,37 @@ void CL_ParseStatusMessage( netadr_t from, sizebuf_t *msg )
 	static char	infostring[MAX_INFO_STRING+8];
 	char		*s = MSG_ReadString( msg );
 	int i;
-	const char *magic = ": wrong version\n";
-	size_t len = Q_strlen( s ), magiclen = Q_strlen( magic );
-
-	if( len >= magiclen && !Q_strcmp( s + len - magiclen, magic ))
-	{
-		Netchan_OutOfBandPrint( NS_CLIENT, from, "info %i", PROTOCOL_LEGACY_VERSION );
-		return;
-	}
-
-	if( !Info_IsValid( s ))
-	{
-		Con_Printf( "^1Server^7: %s, invalid infostring\n", NET_AdrToString( from ));
-		return;
-	}
 
 	CL_FixupColorStringsForInfoString( s, infostring );
 
+	if( Q_strstr( infostring, "wrong version" ) )
+	{
+		Netchan_OutOfBandPrint( NS_CLIENT, from, "info %i", PROTOCOL_LEGACY_VERSION );
+		Con_Printf( "^1Server^7: %s, Info: %s\n", NET_AdrToString( from ), infostring );
+		if( cls.legacyservercount < MAX_LEGACY_SERVERS )
+			cls.legacyservers[cls.legacyservercount++] = from;
+		return;
+	}
+
 	if( !COM_CheckString( Info_ValueForKey( infostring, "gamedir" )))
 	{
 		Con_Printf( "^1Server^7: %s, Info: %s\n", NET_AdrToString( from ), infostring );
 		return; // unsupported proto
 	}
 
-	if( !COM_CheckString( Info_ValueForKey( infostring, "p" )))
+	for( i = 0; i < cls.legacyservercount; i++ )
 	{
-		Info_SetValueForKey( infostring, "legacy", "1", sizeof( infostring ) );
+		if( NET_CompareAdr( cls.legacyservers[i], from ) )
-		Con_Printf( "^3Server^7: %s, Game: %s\n", NET_AdrToString( from ), Info_ValueForKey( infostring, "gamedir" ));
+		{
-	}
+			Info_SetValueForKey( infostring, "legacy", "1", sizeof( infostring ) );
-	else
+			Con_Print("Legacy: ");
-	{
+			break;
-		// more info about servers
+		}
-		Con_Printf( "^2Server^7: %s, Game: %s\n", NET_AdrToString( from ), Info_ValueForKey( infostring, "gamedir" ));
 	}
 
+	// more info about servers
+	Con_Printf( "^2Server^7: %s, Game: %s\n", NET_AdrToString( from ), Info_ValueForKey( infostring, "gamedir" ));
+
 	UI_AddServerToList( from, infostring );
 }
 
@@ -2080,7 +2053,7 @@ void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 
 		if( NET_CompareAdr( from, cls.legacyserver ))
 		{
-			Cbuf_AddTextf( "connect %s legacy\n", NET_AdrToString( from ));
+			Cbuf_AddText( va( "connect %s legacy\n", NET_AdrToString( from )));
 			memset( &cls.legacyserver, 0, sizeof( cls.legacyserver ));
 		}
 	}
@@ -2128,12 +2101,6 @@ void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 	}
 	else if( !Q_strcmp( c, "f" ))
 	{
-		if( !NET_IsMasterAdr( from ))
-		{
-			Con_Printf( S_WARN "unexpected server list packet from %s\n", NET_AdrToString( from ));
-			return;
-		}
-
 		// serverlist got from masterserver
 		while( MSG_GetNumBitsLeft( msg ) > 8 )
 		{
@@ -2192,7 +2159,7 @@ void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 			}
 			else if( clgame.request_type == NET_REQUEST_GAMEUI )
 			{
-				NET_Config( true, false ); // allow remote
+				NET_Config( true ); // allow remote
 				Netchan_OutOfBandPrint( NS_CLIENT, servadr, "info %i", PROTOCOL_VERSION );
 			}
 		}
@@ -2384,10 +2351,11 @@ Replace the displayed name for some resources
 */
 const char *CL_CleanFileName( const char *filename )
 {
-	if( COM_CheckString( filename ) && filename[0] == '!' )
+	const char	*pfilename = filename;
-		return "customization";
 
-	return filename;
+	if( COM_CheckString( filename ) && filename[0] == '!' )
+		pfilename = "customization";
+	return pfilename;
 }
 
 
@@ -2444,18 +2412,11 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename )
 	{
 		if( filename[0] != '!' )
 			Con_Printf( "processing %s\n", filename );
-
-		if( !Q_strnicmp( filename, "downloaded/", 11 ))
-		{
-			// skip "downloaded/" part to avoid mismatch with needed resources list
-			filename += 11; 
-		}
 	}
 	else if( !successfully_received )
 	{
 		Con_Printf( S_ERROR "server failed to transmit file '%s'\n", CL_CleanFileName( filename ));
 	}
-
 	if( cls.legacymode )
 	{
 		if( host.downloadcount > 0 )
@@ -2583,7 +2544,7 @@ void CL_ServerCommand( qboolean reliable, const char *fmt, ... )
 		return;
 
 	va_start( argptr, fmt );
-	Q_vsnprintf( string, sizeof( string ), fmt, argptr );
+	Q_vsprintf( string, fmt, argptr );
 	va_end( argptr );
 
 	if( reliable )
@@ -2852,23 +2813,20 @@ void CL_InitLocal( void )
 	Cvar_RegisterVariable( &cl_download_ingame );
 	Cvar_RegisterVariable( &cl_logofile );
 	Cvar_RegisterVariable( &cl_logocolor );
-	Cvar_RegisterVariable( &cl_logoext );
 	Cvar_RegisterVariable( &cl_test_bandwidth );
 
-	Voice_RegisterCvars();
-	VGui_RegisterCvars();
-
 	// register our variables
 	cl_crosshair = Cvar_Get( "crosshair", "1", FCVAR_ARCHIVE, "show weapon chrosshair" );
 	cl_nodelta = Cvar_Get ("cl_nodelta", "0", 0, "disable delta-compression for server messages" );
 	cl_idealpitchscale = Cvar_Get( "cl_idealpitchscale", "0.8", 0, "how much to look up/down slopes and stairs when not using freelook" );
 	cl_solid_players = Cvar_Get( "cl_solid_players", "1", 0, "Make all players not solid (can't traceline them)" );
-	cl_interp = Cvar_Get( "ex_interp", "0.1", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "Interpolate object positions starting this many seconds in past" );
+	cl_interp = Cvar_Get( "ex_interp", "0.1", FCVAR_ARCHIVE, "Interpolate object positions starting this many seconds in past" );
 	cl_timeout = Cvar_Get( "cl_timeout", "60", 0, "connect timeout (in-seconds)" );
 	cl_charset = Cvar_Get( "cl_charset", "utf-8", FCVAR_ARCHIVE, "1-byte charset to use (iconv style)" );
 	hud_utf8 = Cvar_Get( "hud_utf8", "0", FCVAR_ARCHIVE, "Use utf-8 encoding for hud text" );
 
-	rcon_address = Cvar_Get( "rcon_address", "", FCVAR_PRIVILEGED, "remote control address" );
+	rcon_client_password = Cvar_Get( "rcon_password", "", 0, "remote control client password" );
+	rcon_address = Cvar_Get( "rcon_address", "", 0, "remote control address" );
 
 	cl_trace_messages = Cvar_Get( "cl_trace_messages", "0", FCVAR_ARCHIVE|FCVAR_CHEAT, "enable message names tracing (good for developers)");
 
@@ -2879,8 +2837,7 @@ void CL_InitLocal( void )
 	cl_updaterate = Cvar_Get( "cl_updaterate", "20", FCVAR_USERINFO|FCVAR_ARCHIVE, "refresh rate of server messages" );
 	cl_dlmax = Cvar_Get( "cl_dlmax", "0", FCVAR_USERINFO|FCVAR_ARCHIVE, "max allowed outcoming fragment size" );
 	cl_upmax = Cvar_Get( "cl_upmax", "1200", FCVAR_ARCHIVE, "max allowed incoming fragment size" );
-	cl_nat = Cvar_Get( "cl_nat", "0", 0, "show servers running under NAT" );
+	rate = Cvar_Get( "rate", "3500", FCVAR_USERINFO|FCVAR_ARCHIVE, "player network rate" );
-	rate = Cvar_Get( "rate", "3500", FCVAR_USERINFO|FCVAR_ARCHIVE|FCVAR_FILTERABLE, "player network rate" );
 	topcolor = Cvar_Get( "topcolor", "0", FCVAR_USERINFO|FCVAR_ARCHIVE, "player top color" );
 	bottomcolor = Cvar_Get( "bottomcolor", "0", FCVAR_USERINFO|FCVAR_ARCHIVE, "player bottom color" );
 	cl_lw = Cvar_Get( "cl_lw", "1", FCVAR_ARCHIVE|FCVAR_USERINFO, "enable client weapon predicting" );
@@ -2891,9 +2848,9 @@ void CL_InitLocal( void )
 
 	cl_nosmooth = Cvar_Get( "cl_nosmooth", "0", FCVAR_ARCHIVE, "disable smooth up stair climbing" );
 	cl_nointerp = Cvar_Get( "cl_nointerp", "0", FCVAR_CLIENTDLL, "disable interpolation of entities and players" );
-	cl_smoothtime = Cvar_Get( "cl_smoothtime", "0.1", FCVAR_ARCHIVE, "time to smooth up" );
+	cl_smoothtime = Cvar_Get( "cl_smoothtime", "0", FCVAR_ARCHIVE, "time to smooth up" );
 	cl_cmdbackup = Cvar_Get( "cl_cmdbackup", "10", FCVAR_ARCHIVE, "how many additional history commands are sent" );
-	cl_cmdrate = Cvar_Get( "cl_cmdrate", "60", FCVAR_ARCHIVE, "Max number of command packets sent to server per second" );
+	cl_cmdrate = Cvar_Get( "cl_cmdrate", "30", FCVAR_ARCHIVE, "Max number of command packets sent to server per second" );
 	cl_draw_particles = Cvar_Get( "r_drawparticles", "1", FCVAR_CHEAT, "render particles" );
 	cl_draw_tracers = Cvar_Get( "r_drawtracers", "1", FCVAR_CHEAT, "render tracers" );
 	cl_draw_beams = Cvar_Get( "r_drawbeams", "1", FCVAR_CHEAT, "render beams" );
@@ -2902,7 +2859,6 @@ void CL_InitLocal( void )
 	cl_bmodelinterp = Cvar_Get( "cl_bmodelinterp", "1", FCVAR_ARCHIVE, "enable bmodel interpolation" );
 	cl_clockreset = Cvar_Get( "cl_clockreset", "0.1", FCVAR_ARCHIVE, "frametime delta maximum value before reset" );
 	cl_fixtimerate = Cvar_Get( "cl_fixtimerate", "7.5", FCVAR_ARCHIVE, "time in msec to client clock adjusting" );
-	hud_fontscale = Cvar_Get( "hud_fontscale", "1.0", FCVAR_ARCHIVE|FCVAR_LATCH, "scale hud font texture" );
 	hud_scale = Cvar_Get( "hud_scale", "0", FCVAR_ARCHIVE|FCVAR_LATCH, "scale hud at current resolution" );
 	Cvar_Get( "cl_background", "0", FCVAR_READ_ONLY, "indicate what background map is running" );
 	cl_showevents = Cvar_Get( "cl_showevents", "0", FCVAR_ARCHIVE, "show events playback" );
@@ -2920,15 +2876,10 @@ void CL_InitLocal( void )
 	Cmd_AddCommand ("give", NULL, "give specified item or weapon" );
 	Cmd_AddCommand ("drop", NULL, "drop current/specified item or weapon" );
 	Cmd_AddCommand ("gametitle", NULL, "show game logo" );
-	Cmd_AddRestrictedCommand ("kill", NULL, "die instantly" );
+	Cmd_AddCommand( "kill", NULL, "die instantly" );
 	Cmd_AddCommand ("god", NULL, "enable godmode" );
 	Cmd_AddCommand ("fov", NULL, "set client field of view" );
-
+	Cmd_AddCommand ("log", NULL, "logging server events" );
-	Cmd_AddRestrictedCommand ("ent_list", NULL, "list entities on server" );
-	Cmd_AddRestrictedCommand ("ent_fire", NULL, "fire entity command (be careful)" );
-	Cmd_AddRestrictedCommand ("ent_info", NULL, "dump entity information" );
-	Cmd_AddRestrictedCommand ("ent_create", NULL, "create entity with specified values (be careful)" );
-	Cmd_AddRestrictedCommand ("ent_getvars", NULL, "put parameters of specified entities to client's' ent_last_* cvars" );
 
 	// register our commands
 	Cmd_AddCommand ("pause", NULL, "pause the game (if the server allows pausing)" );
@@ -2938,8 +2889,8 @@ void CL_InitLocal( void )
 	Cmd_AddCommand ("mp3", CL_PlayCDTrack_f, "Play mp3-track (based on virtual cd-player)" );
 	Cmd_AddCommand ("waveplaylen", CL_WavePlayLen_f, "Get approximate length of wave file");
 
-	Cmd_AddRestrictedCommand ("setinfo", CL_SetInfo_f, "examine or change the userinfo string (alias of userinfo)" );
+	Cmd_AddCommand ("setinfo", CL_SetInfo_f, "examine or change the userinfo string (alias of userinfo)" );
-	Cmd_AddRestrictedCommand ("userinfo", CL_SetInfo_f, "examine or change the userinfo string (alias of setinfo)" );
+	Cmd_AddCommand ("userinfo", CL_SetInfo_f, "examine or change the userinfo string (alias of setinfo)" );
 	Cmd_AddCommand ("physinfo", CL_Physinfo_f, "print current client physinfo" );
 	Cmd_AddCommand ("disconnect", CL_Disconnect_f, "disconnect from server" );
 	Cmd_AddCommand ("record", CL_Record_f, "record a demo" );
@@ -2958,8 +2909,8 @@ void CL_InitLocal( void )
 	Cmd_AddCommand ("fullserverinfo", CL_FullServerinfo_f, "sent by server when serverinfo changes" );
 	Cmd_AddCommand ("upload", CL_BeginUpload_f, "uploading file to the server" );
 
-	Cmd_AddRestrictedCommand ("quit", CL_Quit_f, "quit from game" );
+	Cmd_AddCommand ("quit", CL_Quit_f, "quit from game" );
-	Cmd_AddRestrictedCommand ("exit", CL_Quit_f, "quit from game" );
+	Cmd_AddCommand ("exit", CL_Quit_f, "quit from game" );
 
 	Cmd_AddCommand ("screenshot", CL_ScreenShot_f, "takes a screenshot of the next rendered frame" );
 	Cmd_AddCommand ("snapshot", CL_SnapShot_f, "takes a snapshot of the next rendered frame" );
@@ -2996,12 +2947,12 @@ void CL_AdjustClock( void )
 	if( fabs( cl.timedelta ) >= 0.001f )
 	{
 		double msec, adjust;
-		double sign;
+		float sign;
 
-		msec = ( cl.timedelta * 1000.0 );
+		msec = ( cl.timedelta * 1000.0f );
-		sign = ( msec < 0 ) ? 1.0 : -1.0;
+		sign = ( msec < 0 ) ? 1.0f : -1.0f;
-		msec = Q_min( cl_fixtimerate->value, fabs( msec ));
+		msec = fabs( msec );
-		adjust = sign * ( msec / 1000.0 );
+		adjust = sign * ( cl_fixtimerate->value / 1000.0f );
 
 		if( fabs( adjust ) < fabs( cl.timedelta ))
 		{
@@ -3065,8 +3016,8 @@ void Host_ClientFrame( void )
 	// a new portion updates from server
 	CL_RedoPrediction ();
 
-	// update voice
+	// TODO: implement
-	Voice_Idle( host.frametime );
+//	Voice_Idle( host.frametime );
 
 	// emit visible entities
 	CL_EmitEntities ();
@@ -3086,6 +3037,9 @@ void Host_ClientFrame( void )
 	// catch changes video settings
 	VID_CheckChanges();
 
+	// process VGUI
+	VGui_RunFrame ();
+
 	// update the screen
 	SCR_UpdateScreen ();
 
@@ -3117,13 +3071,12 @@ void CL_Init( void )
 
 	VID_Init();	// init video
 	S_Init();	// init sound
-	Voice_Init( VOICE_DEFAULT_CODEC, 3 ); // init voice
-	Sequence_Init();
 
 	// unreliable buffer. unsed for unreliable commands and voice stream
 	MSG_Init( &cls.datagram, "cls.datagram", cls.datagram_buf, sizeof( cls.datagram_buf ));
 
 	// IN_TouchInit();
+	Con_LoadHistory();
 
 	COM_GetCommonLibraryPath( LIBRARY_CLIENT, libpath, sizeof( libpath ));
 
@@ -3144,9 +3097,13 @@ CL_Shutdown
 */
 void CL_Shutdown( void )
 {
+	// already freed
+	if( !cls.initialized ) return;
+	cls.initialized = false;
+
 	Con_Printf( "CL_Shutdown()\n" );
 
-	if( !host.crashed && cls.initialized )
+	if( !host.crashed )
 	{
 		Host_WriteOpenGLConfig ();
 		Host_WriteVideoConfig ();
@@ -3160,18 +3117,11 @@ void CL_Shutdown( void )
 	Mobile_Shutdown ();
 	SCR_Shutdown ();
 	CL_UnloadProgs ();
-	cls.initialized = false;
 
-	// for client-side VGUI support we use other order
+	FS_Delete( "demoheader.tmp" ); // remove tmp file
-	if( FI && FI->GameInfo && !FI->GameInfo->internal_vgui_support )
-		VGui_Shutdown();
-
-	if( g_fsapi.Delete )
-		g_fsapi.Delete( "demoheader.tmp" ); // remove tmp file
 	SCR_FreeCinematic (); // release AVI's *after* client.dll because custom renderer may use them
 	S_Shutdown ();
 	R_Shutdown ();
 
 	Con_Shutdown ();
-
 }

engine/client/cl_mobile.c

@@ -25,9 +25,6 @@ mobile_engfuncs_t *gMobileEngfuncs;
 convar_t *vibration_length;
 convar_t *vibration_enable;
 
-static cl_font_t g_scaled_font;
-static float g_font_scale;
-
 static void pfnVibrate( float life, char flags )
 {
 	if( !vibration_enable->value )
@@ -63,28 +60,28 @@ static void pfnEnableTextInput( int enable )
 
 static int pfnDrawScaledCharacter( int x, int y, int number, int r, int g, int b, float scale )
 {
-	// this call is very ineffective and possibly broken!
+	int width  = clgame.scrInfo.charWidths[number] * scale * hud_scale->value;
-	rgba_t color = { r, g, b, 255 };
+	int height = clgame.scrInfo.iCharHeight        * scale * hud_scale->value;
-	int flags = FONT_DRAW_HUD;
 
-	if( hud_utf8->value )
+	if( !cls.creditsFont.valid )
-		SetBits( flags, FONT_DRAW_UTF8 );
+		return 0;
 
-	if( fabs( g_font_scale - scale ) > 0.1f ||
+	x *= hud_scale->value;
-		g_scaled_font.hFontTexture != cls.creditsFont.hFontTexture )
+	y *= hud_scale->value;
-	{
-		int i;
 
-		g_scaled_font = cls.creditsFont;
+	number &= 255;
-		g_scaled_font.scale *= scale;
+	number = Con_UtfProcessChar( number );
-		g_scaled_font.charHeight *= scale;
-		for( i = 0; i < ARRAYSIZE( g_scaled_font.charWidths ); i++ )
-			g_scaled_font.charWidths[i] *= scale;
 
-		g_font_scale = scale;
+	if( number < 32 )
-	}
+		return 0;
 
-	return CL_DrawCharacter( x, y, number, color, &g_scaled_font, flags );
+	if( y < -height )
+		return 0;
+
+	pfnPIC_Set( cls.creditsFont.hFontTexture, r, g, b, 255 );
+	pfnPIC_DrawAdditive( x, y, width, height, &cls.creditsFont.fontRc[number] );
+
+	return width;
 }
 
 static void *pfnGetNativeObject( const char *obj )
@@ -96,20 +93,6 @@ static void *pfnGetNativeObject( const char *obj )
 	return Platform_GetNativeObject( obj );
 }
 
-static void pfnTouch_HideButtons( const char *name, byte state )
-{
-	Touch_HideButtons( name, state, true );
-}
-
-static void pfnTouch_RemoveButton( const char *name )
-{
-	Touch_RemoveButton( name, true );
-}
-
-static char *pfnParseFileSafe( char *data, char *buf, const int size, unsigned int flags, int *len )
-{
-	return COM_ParseFileSafe( data, buf, size, flags, len, NULL );
-}
 
 static mobile_engfuncs_t gpMobileEngfuncs =
 {
@@ -118,15 +101,15 @@ static mobile_engfuncs_t gpMobileEngfuncs =
 	pfnEnableTextInput,
 	Touch_AddClientButton,
 	Touch_AddDefaultButton,
-	pfnTouch_HideButtons,
+	Touch_HideButtons,
-	pfnTouch_RemoveButton,
+	Touch_RemoveButton,
-	Touch_SetClientOnly,
+	(void*)Touch_SetClientOnly,
 	Touch_ResetDefaultButtons,
 	pfnDrawScaledCharacter,
 	Sys_Warn,
 	pfnGetNativeObject,
 	ID_SetCustomClientID,
-	pfnParseFileSafe
+	_COM_ParseFileSafe
 };
 
 qboolean Mobile_Init( void )
@@ -142,8 +125,8 @@ qboolean Mobile_Init( void )
 		success = true;
 
 	Cmd_AddCommand( "vibrate", (xcommand_t)Vibrate_f, "Vibrate for specified time");
-	vibration_length = Cvar_Get( "vibration_length", "1.0", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "Vibration length");
+	vibration_length = Cvar_Get( "vibration_length", "1.0", FCVAR_ARCHIVE, "Vibration length");
-	vibration_enable = Cvar_Get( "vibration_enable", "1", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "Enable vibration");
+	vibration_enable = Cvar_Get( "vibration_enable", "1", FCVAR_ARCHIVE, "Enable vibration");
 
 	return success;
 }

engine/client/cl_netgraph.c

@@ -158,7 +158,6 @@ static void NetGraph_InitColors( void )
 			f = (float)(i - hfrac) / (float)(NETGRAPH_LERP_HEIGHT - hfrac );
 			VectorMA( mincolor[1], f, dc[1], netcolors[NETGRAPH_NET_COLORS + i] );
 		}
-		netcolors[NETGRAPH_NET_COLORS + i][3] = 255;
 	}
 }
 
@@ -260,7 +259,7 @@ static void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 	for( a = 0; a < w; a++ )
 	{
 		i = ( cls.netchan.outgoing_sequence - a ) & NET_TIMINGS_MASK;
-		h = Q_min(( netstat_cmdinfo[i].cmd_lerp / 3.0f ) * NETGRAPH_LERP_HEIGHT, net_graphheight->value * 0.7f);
+		h = ( netstat_cmdinfo[i].cmd_lerp / 3.0f ) * NETGRAPH_LERP_HEIGHT;
 
 		fill.left = x + w - a - 1;
 		fill.right = fill.bottom = 1;
@@ -281,10 +280,7 @@ static void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 
 			for( j = start; j < h; j++ )
 			{
-				int color = NETGRAPH_NET_COLORS + j + extrap_point;
+				NetGraph_DrawRect( &fill, netcolors[NETGRAPH_NET_COLORS + j + extrap_point] );
-				color = Q_min( color, ARRAYSIZE( netcolors ) - 1 );
-
-				NetGraph_DrawRect( &fill, netcolors[color] );
 				fill.top--;
 			}
 		}
@@ -300,10 +296,7 @@ static void NetGraph_DrawTimes( wrect_t rect, int x, int w )
 
 			for( j = 0; j < h; j++ )
 			{
-				int color = NETGRAPH_NET_COLORS + j + oldh;
+				NetGraph_DrawRect( &fill, netcolors[NETGRAPH_NET_COLORS + j + oldh] );
-				color = Q_min( color, ARRAYSIZE( netcolors ) - 1 );
-
-				NetGraph_DrawRect( &fill, netcolors[color] );
 				fill.top--;
 			}
 		}
@@ -364,7 +357,6 @@ NetGraph_DrawTextFields
 static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int count, float avg, int packet_loss, int packet_choke, int graphtype )
 {
 	static int	lastout;
-	cl_font_t *font = Con_GetFont( 0 );
 	rgba_t		colors = { 0.9 * 255, 0.9 * 255, 0.7 * 255, 255 };
 	int		ptx = Q_max( x + w - NETGRAPH_LERP_HEIGHT - 1, 1 );
 	int		pty = Q_max( rect.top + rect.bottom - NETGRAPH_LERP_HEIGHT - 3, 1 );
@@ -386,17 +378,16 @@ static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int coun
 
 	// move rolling average
 	framerate = FRAMERATE_AVG_FRAC * host.frametime + ( 1.0f - FRAMERATE_AVG_FRAC ) * framerate;
-
+	Con_SetFont( 0 );
-	ref.dllFuncs.GL_SetRenderMode( font->rendermode );
 
 	if( framerate > 0.0f )
 	{
 		y -= net_graphheight->value;
 
-		CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE, "%.1f fps" , 1.0f / framerate);
+		Con_DrawString( x, y, va( "%.1f fps" , 1.0f / framerate ), colors );
 
 		if( avg > 1.0f )
-			CL_DrawStringf( font, x + 75, y, colors, FONT_DRAW_NORENDERMODE, "%i ms" , (int)avg );
+			Con_DrawString( x + 75, y, va( "%i ms" , (int)avg ), colors );
 
 		y += 15;
 
@@ -404,12 +395,10 @@ static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int coun
 		if( !out ) out = lastout;
 		else lastout = out;
 
-		CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE,
+		Con_DrawString( x, y, va( "in :  %i %.2f k/s", netstat_graph[j].msgbytes, cls.netchan.flow[FLOW_INCOMING].avgkbytespersec ), colors );
-			"in :  %i %.2f kb/s", netstat_graph[j].msgbytes, cls.netchan.flow[FLOW_INCOMING].avgkbytespersec );
 		y += 15;
 
-		CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE,
+		Con_DrawString( x, y, va( "out:  %i %.2f k/s", out, cls.netchan.flow[FLOW_OUTGOING].avgkbytespersec ), colors );
-			"out:  %i %.2f kb/s", out, cls.netchan.flow[FLOW_OUTGOING].avgkbytespersec );
 		y += 15;
 
 		if( graphtype > 2 )
@@ -417,14 +406,16 @@ static void NetGraph_DrawTextFields( int x, int y, int w, wrect_t rect, int coun
 			int	loss = (int)(( packet_loss + PACKETLOSS_AVG_FRAC ) - 0.01f );
 			int	choke = (int)(( packet_choke + PACKETCHOKE_AVG_FRAC ) - 0.01f );
 
-			CL_DrawStringf( font, x, y, colors, FONT_DRAW_NORENDERMODE, "loss: %i choke: %i", loss, choke );
+			Con_DrawString( x, y, va( "loss: %i choke: %i", loss, choke ), colors );
 		}
 	}
 
 	if( graphtype < 3 )
-		CL_DrawStringf( font, ptx, pty, colors, FONT_DRAW_NORENDERMODE, "%i/s", (int)cl_cmdrate->value );
+		Con_DrawString( ptx, pty, va( "%i/s", (int)cl_cmdrate->value ), colors );
 
-	CL_DrawStringf( font, ptx, last_y, colors, FONT_DRAW_NORENDERMODE, "%i/s" , (int)cl_updaterate->value );
+	Con_DrawString( ptx, last_y, va( "%i/s" , (int)cl_updaterate->value ), colors );
+
+	Con_RestoreFont();
 }
 
 /*
@@ -624,7 +615,7 @@ static void NetGraph_GetScreenPos( wrect_t *rect, int *w, int *x, int *y )
 		*x = rect->left + rect->right - 5 - *w;
 		break;
 	case 2: // center
-		*x = ( rect->left + ( rect->right - 10 - *w )) / 2;
+		*x = rect->left + ( rect->right - 10 - *w ) / 2;
 		break;
 	default: // left sided
 		*x = rect->left + 5;
@@ -681,7 +672,7 @@ void SCR_DrawNetGraph( void )
 
 	if( graphtype < 3 )
 	{
-		ref.dllFuncs.GL_SetRenderMode( kRenderTransColor );
+		ref.dllFuncs.GL_SetRenderMode( kRenderTransAdd );
 		ref.dllFuncs.GL_Bind( XASH_TEXTURE0, R_GetBuiltinTexture( REF_WHITE_TEXTURE ) );
 		ref.dllFuncs.Begin( TRI_QUADS ); // draw all the fills as a long solid sequence of quads for speedup reasons
 

engine/client/cl_parse.c

@@ -484,8 +484,6 @@ void CL_BatchResourceRequest( qboolean initialize )
 		switch( p->type )
 		{
 		case t_sound:
-		case t_model:
-		case t_eventscript:
 			if( !CL_CheckFile( &msg, p ))
 				break;
 			CL_MoveToOnHandList( p );
@@ -493,13 +491,18 @@ void CL_BatchResourceRequest( qboolean initialize )
 		case t_skin:
 			CL_MoveToOnHandList( p );
 			break;
+		case t_model:
+			if( !CL_CheckFile( &msg, p ))
+				break;
+			CL_MoveToOnHandList( p );
+			break;
 		case t_decal:
 			if( !HPAK_GetDataPointer( CUSTOM_RES_PATH, p, NULL, NULL ))
 			{
 				if( !FBitSet( p->ucFlags, RES_REQUESTED ))
 				{
 					MSG_BeginClientCmd( &msg, clc_stringcmd );
-					MSG_WriteStringf( &msg, "dlfile !MD5%s", MD5_Print( p->rgucMD5_hash ));;
+					MSG_WriteString( &msg, va( "dlfile !MD5%s", MD5_Print( p->rgucMD5_hash ) ) );
 					SetBits( p->ucFlags, RES_REQUESTED );
 				}
 				break;
@@ -517,6 +520,11 @@ void CL_BatchResourceRequest( qboolean initialize )
 				break;
 			CL_MoveToOnHandList( p );
 			break;
+		case t_eventscript:
+			if( !CL_CheckFile( &msg, p ))
+				break;
+			CL_MoveToOnHandList( p );
+			break;
 		case t_world:
 			ASSERT( 0 );
 			break;
@@ -587,7 +595,7 @@ int CL_EstimateNeededResources( void )
 	return nTotalSize;
 }
 
-static void CL_StartResourceDownloading( const char *pszMessage, qboolean bCustom )
+void CL_StartResourceDownloading( const char *pszMessage, qboolean bCustom )
 {
 	resourceinfo_t	ri;
 
@@ -603,8 +611,6 @@ static void CL_StartResourceDownloading( const char *pszMessage, qboolean bCusto
 	}
 	else
 	{
-		HTTP_ResetProcessState();
-
 		cls.state = ca_validate;
 		cls.dl.custom = false;
 	}
@@ -845,76 +851,54 @@ void CL_ParseFileTransferFailed( sizebuf_t *msg )
 CL_ParseServerData
 ==================
 */
-void CL_ParseServerData( sizebuf_t *msg, qboolean legacy )
+void CL_ParseServerData( sizebuf_t *msg )
 {
 	char	gamefolder[MAX_QPATH];
 	qboolean	background;
 	int	i;
 
-	HPAK_CheckSize( CUSTOM_RES_PATH );
+	Con_Reportf( "Serverdata packet received.\n" );
-
-	Con_Reportf( "%s packet received.\n", legacy ? "Legacy serverdata" : "Serverdata" );
-
 	cls.timestart = Sys_DoubleTime();
+
 	cls.demowaiting = false;	// server is changed
 
 	// wipe the client_t struct
 	if( !cls.changelevel && !cls.changedemo )
 		CL_ClearState ();
-
-	// Re-init hud video, especially if we changed game directories
-	clgame.dllFuncs.pfnVidInit();
-
 	cls.state = ca_connected;
 
 	// parse protocol version number
 	i = MSG_ReadLong( msg );
 
-	if( legacy )
+	if( i != PROTOCOL_VERSION )
-	{
+		Host_Error( "Server use invalid protocol (%i should be %i)\n", i, PROTOCOL_VERSION );
-		if( i != PROTOCOL_LEGACY_VERSION )
-			Host_Error( "Server use invalid protocol (%i should be %i)\n", i, PROTOCOL_LEGACY_VERSION );
-	}
-	else
-	{
-		if( i != PROTOCOL_VERSION )
-			Host_Error( "Server use invalid protocol (%i should be %i)\n", i, PROTOCOL_VERSION );
-	}
 
 	cl.servercount = MSG_ReadLong( msg );
 	cl.checksum = MSG_ReadLong( msg );
 	cl.playernum = MSG_ReadByte( msg );
 	cl.maxclients = MSG_ReadByte( msg );
 	clgame.maxEntities = MSG_ReadWord( msg );
-	if( legacy )
+	clgame.maxEntities = bound( MIN_EDICTS, clgame.maxEntities, MAX_EDICTS );
-	{
+	clgame.maxModels = MSG_ReadWord( msg );
-		clgame.maxEntities = bound( MIN_LEGACY_EDICTS, clgame.maxEntities, MAX_LEGACY_EDICTS );
+	Q_strncpy( clgame.mapname, MSG_ReadString( msg ), MAX_STRING );
-		clgame.maxModels = 512; // ???
+	Q_strncpy( clgame.maptitle, MSG_ReadString( msg ), MAX_STRING );
-	}
-	else
-	{
-		clgame.maxEntities = bound( MIN_EDICTS, clgame.maxEntities, MAX_EDICTS );
-		clgame.maxModels = MSG_ReadWord( msg );
-	}
-	Q_strncpy( clgame.mapname, MSG_ReadString( msg ), sizeof( clgame.mapname ));
-	Q_strncpy( clgame.maptitle, MSG_ReadString( msg ), sizeof( clgame.maptitle ));
 	background = MSG_ReadOneBit( msg );
-	Q_strncpy( gamefolder, MSG_ReadString( msg ), sizeof( gamefolder ));
+	Q_strncpy( gamefolder, MSG_ReadString( msg ), MAX_QPATH );
 	host.features = (uint)MSG_ReadLong( msg );
 
-	if( !legacy )
+	// receive the player hulls
+	for( i = 0; i < MAX_MAP_HULLS * 3; i++ )
 	{
-		// receive the player hulls
+		host.player_mins[i/3][i%3] = MSG_ReadChar( msg );
-		for( i = 0; i < MAX_MAP_HULLS * 3; i++ )
+		host.player_maxs[i/3][i%3] = MSG_ReadChar( msg );
-		{
-			host.player_mins[i/3][i%3] = MSG_ReadChar( msg );
-			host.player_maxs[i/3][i%3] = MSG_ReadChar( msg );
-		}
 	}
 
 	if( clgame.maxModels > MAX_MODELS )
 		Con_Printf( S_WARN "server model limit is above client model limit %i > %i\n", clgame.maxModels, MAX_MODELS );
 
+	// Re-init hud video, especially if we changed game directories
+	clgame.dllFuncs.pfnVidInit();
+
 	if( Con_FixedFont( ))
 	{
 		// seperate the printfs so the server message can have a color
@@ -938,7 +922,11 @@ void CL_ParseServerData( sizebuf_t *msg, qboolean legacy )
 
 	// set the background state
 	if( cls.demoplayback && ( cls.demonum != -1 ))
+	{
+		// re-init mouse
+		host.mouse_visible = false;
 		cl.background = true;
+	}
 	else cl.background = background;
 
 	if( cl.background )	// tell the game parts about background state
@@ -985,11 +973,8 @@ void CL_ParseServerData( sizebuf_t *msg, qboolean legacy )
 		COM_ClearCustomizationList( &cl.players[i].customdata, true );
 	CL_CreateCustomizationList();
 
-	if( !legacy )
+	// request resources from server
-	{
+	CL_ServerCommand( true, "sendres %i\n", cl.servercount );
-		// request resources from server
-		CL_ServerCommand( true, "sendres %i\n", cl.servercount );
-	}
 
 	memset( &clgame.movevars, 0, sizeof( clgame.movevars ));
 	memset( &clgame.oldmovevars, 0, sizeof( clgame.oldmovevars ));
@@ -1164,7 +1149,7 @@ void CL_ParseClientData( sizebuf_t *msg )
 CL_ParseBaseline
 ==================
 */
-void CL_ParseBaseline( sizebuf_t *msg, qboolean legacy )
+void CL_ParseBaseline( sizebuf_t *msg )
 {
 	int		i, newnum;
 	entity_state_t	nullstate;
@@ -1177,15 +1162,8 @@ void CL_ParseBaseline( sizebuf_t *msg, qboolean legacy )
 
 	while( 1 )
 	{
-		if( legacy )
+		newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
-		{
+		if( newnum == LAST_EDICT ) break; // end of baselines
-			newnum = MSG_ReadWord( msg );
-		}
-		else
-		{
-			newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
-			if( newnum == LAST_EDICT ) break; // end of baselines
-		}
 		player = CL_IsPlayerIndex( newnum );
 
 		if( newnum >= clgame.maxEntities )
@@ -1196,22 +1174,14 @@ void CL_ParseBaseline( sizebuf_t *msg, qboolean legacy )
 		ent->index = newnum;
 
 		MSG_ReadDeltaEntity( msg, &ent->prevstate, &ent->baseline, newnum, player, 1.0f );
-
-		if( legacy )
-		{
-			break; // only one baseline allowed in legacy protocol
-		}
 	}
 
-	if( !legacy )
+	cl.instanced_baseline_count = MSG_ReadUBitLong( msg, 6 );
-	{
-		cl.instanced_baseline_count = MSG_ReadUBitLong( msg, 6 );
 
-		for( i = 0; i < cl.instanced_baseline_count; i++ )
+	for( i = 0; i < cl.instanced_baseline_count; i++ )
-		{
+	{
-			newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
+		newnum = MSG_ReadUBitLong( msg, MAX_ENTITY_BITS );
-			MSG_ReadDeltaEntity( msg, &nullstate, &cl.instanced_baseline[i], newnum, false, 1.0f );
+		MSG_ReadDeltaEntity( msg, &nullstate, &cl.instanced_baseline[i], newnum, false, 1.0f );
-		}
 	}
 }
 
@@ -1240,9 +1210,11 @@ CL_ParseSetAngle
 set the view angle to this absolute value
 ================
 */
-static void CL_ParseSetAngle( sizebuf_t *msg )
+void CL_ParseSetAngle( sizebuf_t *msg )
 {
-	MSG_ReadVec3Angles( msg, cl.viewangles );
+	cl.viewangles[0] = MSG_ReadBitAngle( msg, 16 );
+	cl.viewangles[1] = MSG_ReadBitAngle( msg, 16 );
+	cl.viewangles[2] = MSG_ReadBitAngle( msg, 16 );
 }
 
 /*
@@ -1350,6 +1322,30 @@ void CL_RegisterUserMessage( sizebuf_t *msg )
 	CL_LinkUserMessage( pszName, svc_num, size );
 }
 
+/*
+================
+CL_RegisterUserMessage
+
+register new user message or update existing
+================
+*/
+/*
+void CL_LegacyRegisterUserMessage( sizebuf_t *msg )
+{
+	char	*pszName;
+	int	svc_num, size;
+
+	svc_num = MSG_ReadByte( msg );
+	size = MSG_ReadByte( msg );
+	pszName = MSG_ReadString( msg );
+
+	// important stuff
+	if( size == 0xFF ) size = -1;
+	svc_num = bound( 0, svc_num, 255 );
+
+	CL_LinkUserMessage( pszName, svc_num, size );
+}
+*/
 /*
 ================
 CL_UpdateUserinfo
@@ -1357,7 +1353,7 @@ CL_UpdateUserinfo
 collect userinfo from all players
 ================
 */
-void CL_UpdateUserinfo( sizebuf_t *msg, qboolean legacy )
+void CL_UpdateUserinfo( sizebuf_t *msg )
 {
 	int		slot, id;
 	qboolean		active;
@@ -1368,8 +1364,7 @@ void CL_UpdateUserinfo( sizebuf_t *msg, qboolean legacy )
 	if( slot >= MAX_CLIENTS )
 		Host_Error( "CL_ParseServerMessage: svc_updateuserinfo >= MAX_CLIENTS\n" );
 
-	if( !legacy )
+	id = MSG_ReadLong( msg );	// unique user ID
-		id = MSG_ReadLong( msg );	// unique user ID
 	player = &cl.players[slot];
 	active = MSG_ReadOneBit( msg ) ? true : false;
 
@@ -1381,17 +1376,11 @@ void CL_UpdateUserinfo( sizebuf_t *msg, qboolean legacy )
 		player->topcolor = Q_atoi( Info_ValueForKey( player->userinfo, "topcolor" ));
 		player->bottomcolor = Q_atoi( Info_ValueForKey( player->userinfo, "bottomcolor" ));
 		player->spectator = Q_atoi( Info_ValueForKey( player->userinfo, "*hltv" ));
-		if( !legacy )
+		MSG_ReadBytes( msg, player->hashedcdkey, sizeof( player->hashedcdkey ));
-			MSG_ReadBytes( msg, player->hashedcdkey, sizeof( player->hashedcdkey ));
 
 		if( slot == cl.playernum ) memcpy( &gameui.playerinfo, player, sizeof( player_info_t ));
 	}
-	else
+	else memset( player, 0, sizeof( *player ));
-	{
-		COM_ClearCustomizationList( &player->customdata, true );
-
-		memset( player, 0, sizeof( *player ));
-	}
 }
 
 /*
@@ -1543,42 +1532,6 @@ void CL_SendConsistencyInfo( sizebuf_t *msg )
 	MSG_WriteOneBit( msg, 0 );
 }
 
-/*
-==================
-CL_StartDark
-==================
-*/
-static void CL_StartDark( void )
-{
-	if( Cvar_VariableValue( "v_dark" ))
-	{
-		screenfade_t		*sf = &clgame.fade;
-		float			fadetime = 5.0f;
-		client_textmessage_t	*title;
-
-		title = CL_TextMessageGet( "GAMETITLE" );
-		if( Host_IsQuakeCompatible( ))
-			fadetime = 1.0f;
-
-		if( title )
-		{
-			// get settings from titles.txt
-			sf->fadeEnd = title->holdtime + title->fadeout;
-			sf->fadeReset = title->fadeout;
-		}
-		else sf->fadeEnd = sf->fadeReset = fadetime;
-
-		sf->fadeFlags = FFADE_IN;
-		sf->fader = sf->fadeg = sf->fadeb = 0;
-		sf->fadealpha = 255;
-		sf->fadeSpeed = (float)sf->fadealpha / sf->fadeReset;
-		sf->fadeReset += cl.time;
-		sf->fadeEnd += sf->fadeReset;
-
-		Cvar_SetValue( "v_dark", 0.0f );
-	}
-}
-
 /*
 ==================
 CL_RegisterResources
@@ -1628,9 +1581,6 @@ void CL_RegisterResources( sizebuf_t *msg )
 			// tell rendering system we have a new set of models.
 			ref.dllFuncs.R_NewMap ();
 
-			// check if this map must start from dark screen
-			CL_StartDark ();
-
 			CL_SetupOverviewParams();
 
 			// release unused SpriteTextures
@@ -1648,7 +1598,7 @@ void CL_RegisterResources( sizebuf_t *msg )
 			// done with all resources, issue prespawn command.
 			// Include server count in case server disconnects and changes level during d/l
 			MSG_BeginClientCmd( msg, clc_stringcmd );
-			MSG_WriteStringf( msg, "spawn %i", cl.servercount );
+			MSG_WriteString( msg, va( "spawn %i", cl.servercount ));
 		}
 	}
 	else
@@ -1762,10 +1712,7 @@ CL_ParseVoiceInit
 */
 void CL_ParseVoiceInit( sizebuf_t *msg )
 {
-	char *pszCodec = MSG_ReadString( msg );
+	// TODO: ???
-	int quality = MSG_ReadByte( msg );
-
-	Voice_Init( pszCodec, quality );
 }
 
 /*
@@ -1776,31 +1723,7 @@ CL_ParseVoiceData
 */
 void CL_ParseVoiceData( sizebuf_t *msg )
 {
-	int size, idx, frames;
+	// TODO: ???
-	byte received[8192];
-
-	idx = MSG_ReadByte( msg ) + 1;
-
-	frames = MSG_ReadByte( msg );
-
-	size = MSG_ReadShort( msg );
-	size = Q_min( size, sizeof( received ));
-
-	MSG_ReadBytes( msg, received, size );
-
-	if ( idx <= 0 || idx > cl.maxclients )
-		return;
-
-	// must notify through as both local player and normal client
-	if( idx == cl.playernum + 1 )
-		Voice_StatusAck( &voice.local, VOICE_LOOPBACK_INDEX );
-
-	Voice_StatusAck( &voice.players_status[idx], idx );
-
-	if ( !size )
-		return;
-
-	Voice_AddIncomingData( idx, received, size, frames );
 }
 
 /*
@@ -1893,17 +1816,10 @@ Set screen shake
 */
 void CL_ParseScreenShake( sizebuf_t *msg )
 {
-	float amplitude = (float)(word)MSG_ReadShort( msg ) * ( 1.0f / (float)( 1 << 12 ));
+	clgame.shake.amplitude = (float)(word)MSG_ReadShort( msg ) * (1.0f / (float)(1<<12));
-	float duration  = (float)(word)MSG_ReadShort( msg ) * ( 1.0f / (float)( 1 << 12 ));
+	clgame.shake.duration = (float)(word)MSG_ReadShort( msg ) * (1.0f / (float)(1<<12));
-	float frequency = (float)(word)MSG_ReadShort( msg ) * ( 1.0f / (float)( 1 << 8 ));
+	clgame.shake.frequency = (float)(word)MSG_ReadShort( msg ) * (1.0f / (float)(1<<8));
-
+	clgame.shake.time = cl.time + max( clgame.shake.duration, 0.01f );
-	// don't overwrite larger existing shake
-	if( amplitude > clgame.shake.amplitude )
-		clgame.shake.amplitude = amplitude;
-
-	clgame.shake.duration = duration;
-	clgame.shake.time = cl.time + clgame.shake.duration;
-	clgame.shake.frequency = frequency;
 	clgame.shake.next_shake = 0.0f; // apply immediately
 }
 
@@ -1923,7 +1839,7 @@ void CL_ParseScreenFade( sizebuf_t *msg )
 	duration = (float)MSG_ReadWord( msg );
 	holdTime = (float)MSG_ReadWord( msg );
 	sf->fadeFlags = MSG_ReadShort( msg );
-	flScale = FBitSet( sf->fadeFlags, FFADE_LONGFADE ) ? (1.0f / 256.0f) : (1.0f / 4096.0f);
+	flScale = ( sf->fadeFlags & FFADE_LONGFADE ) ? (1.0f / 256.0f) : (1.0f / 4096.0f);
 
 	sf->fader = MSG_ReadByte( msg );
 	sf->fadeg = MSG_ReadByte( msg );
@@ -1936,7 +1852,7 @@ void CL_ParseScreenFade( sizebuf_t *msg )
 	// calc fade speed
 	if( duration > 0 )
 	{
-		if( FBitSet( sf->fadeFlags, FFADE_OUT ))
+		if( sf->fadeFlags & FFADE_OUT )
 		{
 			if( sf->fadeEnd )
 			{
@@ -1944,7 +1860,6 @@ void CL_ParseScreenFade( sizebuf_t *msg )
 			}
 
 			sf->fadeEnd += cl.time;
-			sf->fadeTotalEnd = sf->fadeEnd;
 			sf->fadeReset += sf->fadeEnd;
 		}
 		else
@@ -1968,42 +1883,46 @@ Find the client cvar value
 and sent it back to the server
 ==============
 */
-void CL_ParseCvarValue( sizebuf_t *msg, const qboolean ext )
+void CL_ParseCvarValue( sizebuf_t *msg )
 {
-	const char *cvarName, *response;
+	const char *cvarName = MSG_ReadString( msg );
-	convar_t *cvar;
+	convar_t *cvar = Cvar_FindVar( cvarName );
-	int requestID;
 
-	if( ext )
+	// build the answer
-		requestID = MSG_ReadLong( msg );
+	MSG_BeginClientCmd( &cls.netchan.message, clc_requestcvarvalue );
+	MSG_WriteString( &cls.netchan.message, cvar ? cvar->string : "Not Found" );
+}
 
-	cvarName = MSG_ReadString( msg );
+/*
-	cvar = Cvar_FindVar( cvarName );
+==============
+CL_ParseCvarValue2
+
+Find the client cvar value
+and sent it back to the server
+==============
+*/
+void CL_ParseCvarValue2( sizebuf_t *msg )
+{
+	int requestID = MSG_ReadLong( msg );
+	const char *cvarName = MSG_ReadString( msg );
+	convar_t *cvar = Cvar_FindVar( cvarName );
+
+	// build the answer
+	MSG_BeginClientCmd( &cls.netchan.message, clc_requestcvarvalue2 );
+	MSG_WriteLong( &cls.netchan.message, requestID );
+	MSG_WriteString( &cls.netchan.message, cvarName );
 
 	if( cvar )
 	{
-		if( cvar->flags & FCVAR_PRIVILEGED )
+		// cheater can change value ignoring Cvar_Set so we responce incorrect value
-			response = "CVAR is privileged";
+		if( cvar->value != Q_atof( cvar->string ))
-		else if( cvar->flags & FCVAR_SERVER )
+			MSG_WriteString( &cls.netchan.message, va( "%s (%g)", cvar->string, cvar->value ));
-			response = "CVAR is server-only";
+		else MSG_WriteString( &cls.netchan.message, cvar->string );
-		else if( cvar->flags & FCVAR_PROTECTED )
-			response = "CVAR is protected";
-		else
-			response = cvar->string;
-	}
-	else response = "Bad CVAR request";
-
-	if( ext )
-	{
-		MSG_BeginClientCmd( &cls.netchan.message, clc_requestcvarvalue2 );
-		MSG_WriteLong( &cls.netchan.message, requestID );
-		MSG_WriteString( &cls.netchan.message, cvarName );
 	}
 	else
 	{
-		MSG_BeginClientCmd( &cls.netchan.message, clc_requestcvarvalue );
+		MSG_WriteString( &cls.netchan.message, "Not Found" );
 	}
-	MSG_WriteString( &cls.netchan.message, response );
 }
 
 /*
@@ -2046,10 +1965,10 @@ void CL_ParseExec( sizebuf_t *msg )
 	{
 		Cbuf_AddText( "exec mapdefault.cfg\n" );
 
-		COM_FileBase( clgame.mapname, mapname, sizeof( mapname ));
+		COM_FileBase( clgame.mapname, mapname );
 
 		if ( COM_CheckString( mapname ) )
-			Cbuf_AddTextf( "exec %s.cfg\n", mapname );
+			Cbuf_AddText( va( "exec %s.cfg\n", mapname ) );
 	}
 }
 
@@ -2289,7 +2208,6 @@ void CL_ParseServerMessage( sizebuf_t *msg, qboolean normal_message )
 				else cls.state = ca_connecting;
 				cl.background = old_background;
 				cls.connect_time = MAX_HEARTBEAT;
-				cls.connect_retry = 0;
 			}
 			break;
 		case svc_setview:
@@ -2308,24 +2226,24 @@ void CL_ParseServerMessage( sizebuf_t *msg, qboolean normal_message )
 		case svc_stufftext:
 			s = MSG_ReadString( msg );
 #ifdef HACKS_RELATED_HLMODS
-			// disable Cry Of Fear antisave protection
+			// dsiable Cry Of Fear antisave protection
 			if( !Q_strnicmp( s, "disconnect", 10 ) && cls.signon != SIGNONS )
 				break; // too early
 #endif
-			Cbuf_AddFilteredText( s );
+			Cbuf_AddText( s );
 			break;
 		case svc_setangle:
 			CL_ParseSetAngle( msg );
 			break;
 		case svc_serverdata:
 			Cbuf_Execute(); // make sure any stuffed commands are done
-			CL_ParseServerData( msg, false );
+			CL_ParseServerData( msg );
 			break;
 		case svc_lightstyle:
 			CL_ParseLightStyle( msg );
 			break;
 		case svc_updateuserinfo:
-			CL_UpdateUserinfo( msg, false );
+			CL_UpdateUserinfo( msg );
 			break;
 		case svc_deltatable:
 			Delta_ParseTableField( msg );
@@ -2355,7 +2273,7 @@ void CL_ParseServerMessage( sizebuf_t *msg, qboolean normal_message )
 			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_spawnbaseline:
-			CL_ParseBaseline( msg, false );
+			CL_ParseBaseline( msg );
 			break;
 		case svc_temp_entity:
 			CL_ParseTempEntity( msg );
@@ -2453,16 +2371,15 @@ void CL_ParseServerMessage( sizebuf_t *msg, qboolean normal_message )
 			break;
 		case svc_voicedata:
 			CL_ParseVoiceData( msg );
-			cl.frames[cl.parsecountmod].graphdata.voicebytes += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_resourcelocation:
 			CL_ParseResLocation( msg );
 			break;
 		case svc_querycvarvalue:
-			CL_ParseCvarValue( msg, false );
+			CL_ParseCvarValue( msg );
 			break;
 		case svc_querycvarvalue2:
-			CL_ParseCvarValue( msg, true );
+			CL_ParseCvarValue2( msg );
 			break;
 		case svc_exec:
 			CL_ParseExec( msg );
@@ -2492,6 +2409,163 @@ void CL_ParseServerMessage( sizebuf_t *msg, qboolean normal_message )
 	}
 }
 
+/*
+==================
+CL_ParseBaseline
+==================
+*/
+void CL_LegacyParseBaseline( sizebuf_t *msg )
+{
+	int		i, newnum;
+	entity_state_t	nullstate;
+	qboolean		player;
+	cl_entity_t	*ent;
+
+	Delta_InitClient ();	// finalize client delta's
+
+	memset( &nullstate, 0, sizeof( nullstate ));
+
+	newnum = MSG_ReadWord( msg );
+	player = CL_IsPlayerIndex( newnum );
+
+	if( newnum >= clgame.maxEntities )
+		Host_Error( "CL_AllocEdict: no free edicts\n" );
+
+	ent = CL_EDICT_NUM( newnum );
+	memset( &ent->prevstate, 0, sizeof( ent->prevstate ));
+	ent->index = newnum;
+
+	MSG_ReadDeltaEntity( msg, &ent->prevstate, &ent->baseline, newnum, player, 1.0f );
+
+}
+
+/*
+==================
+CL_ParseServerData
+==================
+*/
+void CL_ParseLegacyServerData( sizebuf_t *msg )
+{
+	string	gamefolder;
+	qboolean	background;
+	int	i;
+
+	Con_Reportf( "Legacy serverdata packet received.\n" );
+
+	cls.timestart = Sys_DoubleTime();
+
+	cls.demowaiting = false;	// server is changed
+	//clgame.load_sequence++;	// now all hud sprites are invalid
+
+	// wipe the client_t struct
+	if( !cls.changelevel && !cls.changedemo )
+		CL_ClearState ();
+	cls.state = ca_connected;
+
+	// parse protocol version number
+	i = MSG_ReadLong( msg );
+	//cls.serverProtocol = i;
+
+	if( i != 48 )
+		Host_Error( "Server uses invalid protocol (%i should be %i)\n", i, PROTOCOL_VERSION );
+
+	cl.servercount = MSG_ReadLong( msg );
+	cl.checksum = MSG_ReadLong( msg );
+	cl.playernum = MSG_ReadByte( msg );
+	cl.maxclients = MSG_ReadByte( msg );
+	clgame.maxEntities = MSG_ReadWord( msg );
+	clgame.maxEntities = bound( 30, clgame.maxEntities, 4096 );
+	clgame.maxModels = 512;
+	Q_strncpy( clgame.mapname, MSG_ReadString( msg ), MAX_STRING );
+	Q_strncpy( clgame.maptitle, MSG_ReadString( msg ), MAX_STRING );
+	background = MSG_ReadOneBit( msg );
+	Q_strncpy( gamefolder, MSG_ReadString( msg ), MAX_STRING );
+	host.features = (uint)MSG_ReadLong( msg );
+
+	// Re-init hud video, especially if we changed game directories
+	clgame.dllFuncs.pfnVidInit();
+
+	if( Con_FixedFont( ))
+	{
+		// seperate the printfs so the server message can have a color
+		Con_Print( "\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n" );
+		Con_Print( va( "%c%s\n\n", 2, clgame.maptitle ));
+	}
+
+	// multiplayer game?
+	if( cl.maxclients > 1 )
+	{
+		// allow console in multiplayer games
+		host.allow_console = true;
+
+		// loading user settings
+		CSCR_LoadDefaultCVars( "user.scr" );
+
+		if( r_decals->value > mp_decals.value )
+			Cvar_SetValue( "r_decals", mp_decals.value );
+	}
+	else Cvar_Reset( "r_decals" );
+
+	// set the background state
+	if( cls.demoplayback && ( cls.demonum != -1 ))
+	{
+		// re-init mouse
+		host.mouse_visible = false;
+		cl.background = true;
+	}
+	else cl.background = background;
+
+	if( cl.background )	// tell the game parts about background state
+		Cvar_FullSet( "cl_background", "1", FCVAR_READ_ONLY );
+	else Cvar_FullSet( "cl_background", "0", FCVAR_READ_ONLY );
+
+	if( !cls.changelevel )
+	{
+		// continue playing if we are changing level
+		S_StopBackgroundTrack ();
+	}
+
+	if( !cls.changedemo )
+		UI_SetActiveMenu( cl.background );
+	else if( !cls.demoplayback )
+		Key_SetKeyDest( key_menu );
+
+	// don't reset cursor in background mode
+	if( cl.background )
+		IN_MouseRestorePos();
+
+	// will be changed later
+	cl.viewentity = cl.playernum + 1;
+	gameui.globals->maxClients = cl.maxclients;
+	Q_strncpy( gameui.globals->maptitle, clgame.maptitle, sizeof( gameui.globals->maptitle ));
+
+	if( !cls.changelevel && !cls.changedemo )
+		CL_InitEdicts (); // re-arrange edicts
+
+	// get splash name
+	if( cls.demoplayback && ( cls.demonum != -1 ))
+		Cvar_Set( "cl_levelshot_name", va( "levelshots/%s_%s", cls.demoname, refState.wideScreen ? "16x9" : "4x3" ));
+	else Cvar_Set( "cl_levelshot_name", va( "levelshots/%s_%s", clgame.mapname, refState.wideScreen ? "16x9" : "4x3" ));
+	Cvar_SetValue( "scr_loading", 0.0f ); // reset progress bar
+
+	if(( cl_allow_levelshots->value && !cls.changelevel ) || cl.background )
+	{
+		if( !FS_FileExists( va( "%s.bmp", cl_levelshot_name->string ), true ))
+			Cvar_Set( "cl_levelshot_name", "*black" ); // render a black screen
+		cls.scrshot_request = scrshot_plaque; // request levelshot even if exist (check filetime)
+	}
+
+	for( i = 0; i < MAX_CLIENTS; i++ )
+		COM_ClearCustomizationList( &cl.players[i].customdata, true );
+	CL_CreateCustomizationList();
+
+	memset( &clgame.movevars, 0, sizeof( clgame.movevars ));
+	memset( &clgame.oldmovevars, 0, sizeof( clgame.oldmovevars ));
+	memset( &clgame.centerPrint, 0, sizeof( clgame.centerPrint ));
+	cl.video_prepped = false;
+	cl.audio_prepped = false;
+}
+
 /*
 ==================
 CL_ParseStaticEntity
@@ -2567,6 +2641,8 @@ void CL_LegacyParseStaticEntity( sizebuf_t *msg )
 	R_AddEfrags( ent );	// add link
 }
 
+
+
 void CL_LegacyParseSoundPacket( sizebuf_t *msg, qboolean is_ambient )
 {
 	vec3_t	pos;
@@ -2698,6 +2774,36 @@ void CL_LegacyPrecacheEvent( sizebuf_t *msg )
 	CL_SetEventIndex( cl.event_precache[eventIndex], eventIndex );
 }
 
+
+void CL_LegacyUpdateUserinfo( sizebuf_t *msg )
+{
+	int		slot, id = 0;
+	qboolean		active;
+	player_info_t	*player;
+
+	slot = MSG_ReadUBitLong( msg, MAX_CLIENT_BITS );
+
+	if( slot >= MAX_CLIENTS )
+		Host_Error( "CL_ParseServerMessage: svc_updateuserinfo >= MAX_CLIENTS\n" );
+
+	//id = MSG_ReadLong( msg );	// unique user ID
+	player = &cl.players[slot];
+	active = MSG_ReadOneBit( msg ) ? true : false;
+
+	if( active )
+	{
+		Q_strncpy( player->userinfo, MSG_ReadString( msg ), sizeof( player->userinfo ));
+		Q_strncpy( player->name, Info_ValueForKey( player->userinfo, "name" ), sizeof( player->name ));
+		Q_strncpy( player->model, Info_ValueForKey( player->userinfo, "model" ), sizeof( player->model ));
+		player->topcolor = Q_atoi( Info_ValueForKey( player->userinfo, "topcolor" ));
+		player->bottomcolor = Q_atoi( Info_ValueForKey( player->userinfo, "bottomcolor" ));
+		player->spectator = Q_atoi( Info_ValueForKey( player->userinfo, "*hltv" ));
+		//MSG_ReadBytes( msg, player->hashedcdkey, sizeof( player->hashedcdkey ));
+
+		if( slot == cl.playernum ) memcpy( &gameui.playerinfo, player, sizeof( player_info_t ));
+	}
+	else memset( player, 0, sizeof( *player ));
+}
 #if XASH_LOW_MEMORY == 0
 #define MAX_LEGACY_RESOURCES 2048
 #elif XASH_LOW_MEMORY == 2
@@ -2714,14 +2820,15 @@ CL_ParseResourceList
 void CL_LegacyParseResourceList( sizebuf_t *msg )
 {
 	int	i = 0;
+
 	static struct
 	{
 		int  rescount;
 		int  restype[MAX_LEGACY_RESOURCES];
 		char resnames[MAX_LEGACY_RESOURCES][MAX_QPATH];
 	} reslist;
-
 	memset( &reslist, 0, sizeof( reslist ));
+
 	reslist.rescount = MSG_ReadWord( msg ) - 1;
 
 	if( reslist.rescount > MAX_LEGACY_RESOURCES )
@@ -2738,21 +2845,14 @@ void CL_LegacyParseResourceList( sizebuf_t *msg )
 		return;
 	}
 
-	HTTP_ResetProcessState();
-
 	host.downloadcount = 0;
 
 	for( i = 0; i < reslist.rescount; i++ )
 	{
-		char soundpath[MAX_VA_STRING];
 		const char *path;
 
 		if( reslist.restype[i] == t_sound )
-		{
+			path = va( DEFAULT_SOUNDPATH "%s", reslist.resnames[i] );
-			Q_snprintf( soundpath, sizeof( soundpath ), DEFAULT_SOUNDPATH "%s", reslist.resnames[i] );
-
-			path = soundpath;
-		}
 		else path = reslist.resnames[i];
 
 		if( FS_FileExists( path, false ))
@@ -2871,7 +2971,6 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message )
 				else cls.state = ca_connecting;
 				cl.background = old_background;
 				cls.connect_time = MAX_HEARTBEAT;
-				cls.connect_retry = 0;
 			}
 			break;
 		case svc_setview:
@@ -2895,26 +2994,26 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message )
 		case svc_stufftext:
 			s = MSG_ReadString( msg );
 #ifdef HACKS_RELATED_HLMODS
-			// disable Cry Of Fear antisave protection
+			// dsiable Cry Of Fear antisave protection
 			if( !Q_strnicmp( s, "disconnect", 10 ) && cls.signon != SIGNONS )
 				break; // too early
 #endif
 
 			Con_Reportf( "Stufftext: %s", s );
-			Cbuf_AddFilteredText( s );
+			Cbuf_AddText( s );
 			break;
 		case svc_setangle:
 			CL_ParseSetAngle( msg );
 			break;
 		case svc_serverdata:
 			Cbuf_Execute(); // make sure any stuffed commands are done
-			CL_ParseServerData( msg, true );
+			CL_ParseLegacyServerData( msg );
 			break;
 		case svc_lightstyle:
 			CL_ParseLightStyle( msg );
 			break;
 		case svc_updateuserinfo:
-			CL_UpdateUserinfo( msg, true );
+			CL_LegacyUpdateUserinfo( msg );
 			break;
 		case svc_deltatable:
 			Delta_ParseTableField( msg );
@@ -2937,14 +3036,14 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message )
 			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_spawnstatic:
-			CL_LegacyParseStaticEntity( msg );
+			CL_ParseStaticEntity( msg );
 			break;
 		case svc_event_reliable:
 			CL_ParseReliableEvent( msg );
 			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_spawnbaseline:
-			CL_ParseBaseline( msg, true );
+			CL_LegacyParseBaseline( msg );
 			break;
 		case svc_temp_entity:
 			CL_ParseTempEntity( msg );
@@ -2964,6 +3063,7 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message )
 			break;
 		case svc_legacy_modelindex:
 			CL_LegacyPrecacheModel( msg );
+
 			break;
 		case svc_legacy_soundindex:
 			CL_LegacyPrecacheSound( msg );
@@ -2979,6 +3079,7 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message )
 			CL_ParseRestore( msg );
 			break;
 		case svc_legacy_eventindex:
+			//CL_ParseFinaleCutscene( msg, 3 );
 			CL_LegacyPrecacheEvent(msg);
 			break;
 		case svc_weaponanim:
@@ -3055,14 +3156,20 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message )
 		case svc_director:
 			CL_ParseDirector( msg );
 			break;
+		case svc_voiceinit:
+			CL_ParseVoiceInit( msg );
+			break;
+		case svc_voicedata:
+			CL_ParseVoiceData( msg );
+			break;
 		case svc_resourcelocation:
 			CL_ParseResLocation( msg );
 			break;
 		case svc_querycvarvalue:
-			CL_ParseCvarValue( msg, false );
+			CL_ParseCvarValue( msg );
 			break;
 		case svc_querycvarvalue2:
-			CL_ParseCvarValue( msg, true );
+			CL_ParseCvarValue2( msg );
 			break;
 		default:
 			CL_ParseUserMessage( msg, cmd );
@@ -3134,7 +3241,7 @@ void CL_LegacyPrecache_f( void )
 	// done with all resources, issue prespawn command.
 	// Include server count in case server disconnects and changes level during d/l
 	MSG_BeginClientCmd( &cls.netchan.message, clc_stringcmd );
-	MSG_WriteStringf( &cls.netchan.message, "begin %i", spawncount );
+	MSG_WriteString( &cls.netchan.message, va( "begin %i", spawncount ));
 	cls.signon = SIGNONS;
 }
 

engine/client/cl_pmove.c

@@ -26,6 +26,20 @@ GNU General Public License for more details.
 #define MIN_PREDICTION_EPSILON	0.5f	// complain if error is > this and we have cl_showerror set
 #define MAX_PREDICTION_ERROR		64.0f	// above this is assumed to be a teleport, don't smooth, etc.
 
+/*
+=============
+CL_ClearPhysEnts
+
+=============
+*/
+void CL_ClearPhysEnts( void )
+{
+	clgame.pmove->numtouch = 0;
+	clgame.pmove->numvisent = 0;
+	clgame.pmove->nummoveent = 0;
+	clgame.pmove->numphysent = 0;
+}
+
 /*
 =============
 CL_PushPMStates
@@ -194,7 +208,7 @@ check for instant movement in case
 we don't want interpolate this
 ==================
 */
-static qboolean CL_PlayerTeleported( local_state_t *from, local_state_t *to )
+qboolean CL_PlayerTeleported( local_state_t *from, local_state_t *to )
 {
 	int	len, maxlen;
 	vec3_t	delta;
@@ -699,7 +713,33 @@ static int GAME_EXPORT pfnTestPlayerPosition( float *pos, pmtrace_t *ptrace )
 
 static void GAME_EXPORT pfnStuckTouch( int hitent, pmtrace_t *tr )
 {
-	PM_StuckTouch( clgame.pmove, hitent, tr );
+	int	i;
+
+	for( i = 0; i < clgame.pmove->numtouch; i++ )
+	{
+		if( clgame.pmove->touchindex[i].ent == hitent )
+			return;
+	}
+
+	if( clgame.pmove->numtouch >= MAX_PHYSENTS )
+		return;
+
+	VectorCopy( clgame.pmove->velocity, tr->deltavelocity );
+	tr->ent = hitent;
+
+	clgame.pmove->touchindex[clgame.pmove->numtouch++] = *tr;
+}
+
+static int GAME_EXPORT pfnPointContents( float *p, int *truecontents )
+{
+	int	cont, truecont;
+
+	truecont = cont = PM_PointContents( clgame.pmove, p );
+	if( truecontents ) *truecontents = truecont;
+
+	if( cont <= CONTENTS_CURRENT_0 && cont >= CONTENTS_CURRENT_DOWN )
+		cont = CONTENTS_WATER;
+	return cont;
 }
 
 static int GAME_EXPORT pfnTruePointContents( float *p )
@@ -707,19 +747,99 @@ static int GAME_EXPORT pfnTruePointContents( float *p )
 	return PM_TruePointContents( clgame.pmove, p );
 }
 
+static int GAME_EXPORT pfnHullPointContents( struct hull_s *hull, int num, float *p )
+{
+	return PM_HullPointContents( hull, num, p );
+}
+
 static pmtrace_t GAME_EXPORT pfnPlayerTrace( float *start, float *end, int traceFlags, int ignore_pe )
 {
 	return PM_PlayerTraceExt( clgame.pmove, start, end, traceFlags, clgame.pmove->numphysent, clgame.pmove->physents, ignore_pe, NULL );
 }
 
-static void *pfnHullForBsp( physent_t *pe, float *offset )
+pmtrace_t *PM_TraceLine( float *start, float *end, int flags, int usehull, int ignore_pe )
+{
+	static pmtrace_t	tr;
+	int		old_usehull;
+
+	old_usehull = clgame.pmove->usehull;
+	clgame.pmove->usehull = usehull;
+
+	switch( flags )
+	{
+	case PM_TRACELINE_PHYSENTSONLY:
+		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numphysent, clgame.pmove->physents, ignore_pe, NULL );
+		break;
+	case PM_TRACELINE_ANYVISIBLE:
+		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numvisent, clgame.pmove->visents, ignore_pe, NULL );
+		break;
+	}
+
+	clgame.pmove->usehull = old_usehull;
+
+	return &tr;
+}
+
+static hull_t *pfnHullForBsp( physent_t *pe, float *offset )
 {
 	return PM_HullForBsp( pe, clgame.pmove, offset );
 }
 
 static float GAME_EXPORT pfnTraceModel( physent_t *pe, float *start, float *end, trace_t *trace )
 {
-	return PM_TraceModel( clgame.pmove, pe, start, end, trace );
+	int	old_usehull;
+	vec3_t	start_l, end_l;
+	vec3_t	offset, temp;
+	qboolean	rotated;
+	matrix4x4	matrix;
+	hull_t	*hull;
+
+	old_usehull = clgame.pmove->usehull;
+	clgame.pmove->usehull = 2;
+
+	hull = PM_HullForBsp( pe, clgame.pmove, offset );
+
+	clgame.pmove->usehull = old_usehull;
+
+	if( pe->solid == SOLID_BSP && !VectorIsNull( pe->angles ))
+		rotated = true;
+	else rotated = false;
+
+ 	if( rotated )
+ 	{
+ 		Matrix4x4_CreateFromEntity( matrix, pe->angles, offset, 1.0f );
+ 		Matrix4x4_VectorITransform( matrix, start, start_l );
+ 		Matrix4x4_VectorITransform( matrix, end, end_l );
+ 	}
+ 	else
+ 	{
+ 		VectorSubtract( start, offset, start_l );
+ 		VectorSubtract( end, offset, end_l );
+ 	}
+
+	PM_RecursiveHullCheck( hull, hull->firstclipnode, 0, 1, start_l, end_l, (pmtrace_t *)trace );
+	trace->ent = NULL;
+
+	if( rotated )
+	{
+		VectorCopy( trace->plane.normal, temp );
+		Matrix4x4_TransformPositivePlane( matrix, temp, trace->plane.dist, trace->plane.normal, &trace->plane.dist );
+	}
+
+	VectorLerp( start, trace->fraction, end, trace->endpos );
+
+	return trace->fraction;
+}
+
+static const char *pfnTraceTexture( int ground, float *vstart, float *vend )
+{
+	physent_t *pe;
+
+	if( ground < 0 || ground >= clgame.pmove->numphysent )
+		return NULL; // bad ground
+
+	pe = &clgame.pmove->physents[ground];
+	return PM_TraceTexture( pe, vstart, vend );
 }
 
 static void GAME_EXPORT pfnPlaySound( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch )
@@ -748,7 +868,25 @@ static int GAME_EXPORT pfnTestPlayerPositionEx( float *pos, pmtrace_t *ptrace, p
 
 static pmtrace_t *pfnTraceLineEx( float *start, float *end, int flags, int usehull, pfnIgnore pmFilter )
 {
-	return PM_TraceLineEx( clgame.pmove, start, end, flags, usehull, pmFilter );
+	static pmtrace_t	tr;
+	int		old_usehull;
+
+	old_usehull = clgame.pmove->usehull;
+	clgame.pmove->usehull = usehull;
+
+	switch( flags )
+	{
+	case PM_TRACELINE_PHYSENTSONLY:
+		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numphysent, clgame.pmove->physents, -1, pmFilter );
+		break;
+	case PM_TRACELINE_ANYVISIBLE:
+		tr = PM_PlayerTraceExt( clgame.pmove, start, end, 0, clgame.pmove->numvisent, clgame.pmove->visents, -1, pmFilter );
+		break;
+	}
+
+	clgame.pmove->usehull = old_usehull;
+
+	return &tr;
 }
 
 /*
@@ -788,23 +926,23 @@ void CL_InitClientMove( void )
 	clgame.pmove->Con_Printf = Con_Printf;
 	clgame.pmove->Sys_FloatTime = Sys_DoubleTime;
 	clgame.pmove->PM_StuckTouch = pfnStuckTouch;
-	clgame.pmove->PM_PointContents = (void*)PM_CL_PointContents;
+	clgame.pmove->PM_PointContents = pfnPointContents;
 	clgame.pmove->PM_TruePointContents = pfnTruePointContents;
-	clgame.pmove->PM_HullPointContents = (void*)PM_HullPointContents;
+	clgame.pmove->PM_HullPointContents = pfnHullPointContents;
 	clgame.pmove->PM_PlayerTrace = pfnPlayerTrace;
-	clgame.pmove->PM_TraceLine = PM_CL_TraceLine;
+	clgame.pmove->PM_TraceLine = PM_TraceLine;
 	clgame.pmove->RandomLong = COM_RandomLong;
 	clgame.pmove->RandomFloat = COM_RandomFloat;
 	clgame.pmove->PM_GetModelType = pfnGetModelType;
 	clgame.pmove->PM_GetModelBounds = pfnGetModelBounds;
-	clgame.pmove->PM_HullForBsp = pfnHullForBsp;
+	clgame.pmove->PM_HullForBsp = (void*)pfnHullForBsp;
 	clgame.pmove->PM_TraceModel = pfnTraceModel;
 	clgame.pmove->COM_FileSize = COM_FileSize;
 	clgame.pmove->COM_LoadFile = COM_LoadFile;
 	clgame.pmove->COM_FreeFile = COM_FreeFile;
 	clgame.pmove->memfgets = COM_MemFgets;
 	clgame.pmove->PM_PlaySound = pfnPlaySound;
-	clgame.pmove->PM_TraceTexture = PM_CL_TraceTexture;
+	clgame.pmove->PM_TraceTexture = pfnTraceTexture;
 	clgame.pmove->PM_PlaybackEventFull = pfnPlaybackEventFull;
 	clgame.pmove->PM_PlayerTraceEx = pfnPlayerTraceEx;
 	clgame.pmove->PM_TestPlayerPositionEx = pfnTestPlayerPositionEx;
@@ -815,10 +953,21 @@ void CL_InitClientMove( void )
 	clgame.dllFuncs.pfnPlayerMoveInit( clgame.pmove );
 }
 
-static void CL_SetupPMove( playermove_t *pmove, const local_state_t *from, const usercmd_t *ucmd, qboolean runfuncs, double time )
+static void PM_CheckMovingGround( clientdata_t *cd, entity_state_t *state, float frametime )
 {
-	const entity_state_t	*ps;
+	if(!( cd->flags & FL_BASEVELOCITY ))
-	const clientdata_t	*cd;
+	{
+		// apply momentum (add in half of the previous frame of velocity first)
+		VectorMA( cd->velocity, 1.0f + (frametime * 0.5f), state->basevelocity, cd->velocity );
+		VectorClear( state->basevelocity );
+	}
+	cd->flags &= ~FL_BASEVELOCITY;
+}
+
+void CL_SetupPMove( playermove_t *pmove, local_state_t *from, usercmd_t *ucmd, qboolean runfuncs, double time )
+{
+	entity_state_t	*ps;
+	clientdata_t	*cd;
 
 	ps = &from->playerstate;
 	cd = &from->client;
@@ -835,21 +984,22 @@ static void CL_SetupPMove( playermove_t *pmove, const local_state_t *from, const
 	VectorCopy( ps->basevelocity, pmove->basevelocity );
 	VectorCopy( cd->view_ofs, pmove->view_ofs );
 	VectorClear( pmove->movedir );
-	pmove->flDuckTime = (float)cd->flDuckTime;
+	pmove->flDuckTime = cd->flDuckTime;
 	pmove->bInDuck = cd->bInDuck;
 	pmove->usehull = ps->usehull;
 	pmove->flTimeStepSound = cd->flTimeStepSound;
 	pmove->iStepLeft = ps->iStepLeft;
 	pmove->flFallVelocity = ps->flFallVelocity;
-	pmove->flSwimTime = (float)cd->flSwimTime;
+	pmove->flSwimTime = cd->flSwimTime;
 	VectorCopy( cd->punchangle, pmove->punchangle );
+	pmove->flSwimTime = cd->flSwimTime;
 	pmove->flNextPrimaryAttack = 0.0f; // not used by PM_ code
 	pmove->effects = ps->effects;
 	pmove->flags = cd->flags;
 	pmove->gravity = ps->gravity;
 	pmove->friction = ps->friction;
 	pmove->oldbuttons = ps->oldbuttons;
-	pmove->waterjumptime = (float)cd->waterjumptime;
+	pmove->waterjumptime = cd->waterjumptime;
 	pmove->dead = (cl.local.health <= 0);
 	pmove->deadflag = cd->deadflag;
 	pmove->spectator = (cls.spectator != 0);
@@ -876,7 +1026,7 @@ static void CL_SetupPMove( playermove_t *pmove, const local_state_t *from, const
 	Q_strncpy( pmove->physinfo, cls.physinfo, MAX_INFO_STRING );
 }
 
-const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to )
+void CL_FinishPMove( playermove_t *pmove, local_state_t *to )
 {
 	entity_state_t	*ps;
 	clientdata_t	*cd;
@@ -887,7 +1037,7 @@ const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to )
 	cd->flags = pmove->flags;
 	cd->bInDuck = pmove->bInDuck;
 	cd->flTimeStepSound = pmove->flTimeStepSound;
-	cd->flDuckTime = (int)pmove->flDuckTime;
+	cd->flDuckTime = pmove->flDuckTime;
 	cd->flSwimTime = (int)pmove->flSwimTime;
 	cd->waterjumptime = (int)pmove->waterjumptime;
 	cd->watertype = pmove->watertype;
@@ -900,7 +1050,7 @@ const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to )
 	VectorCopy( pmove->angles, ps->angles );
 	VectorCopy( pmove->basevelocity, ps->basevelocity );
 	VectorCopy( pmove->punchangle, cd->punchangle );
-	ps->oldbuttons = (uint)pmove->cmd.buttons;
+	ps->oldbuttons = pmove->cmd.buttons;
 	ps->friction = pmove->friction;
 	ps->movetype = pmove->movetype;
 	ps->onground = pmove->onground;
@@ -1008,9 +1158,13 @@ void CL_PredictMovement( qboolean repredicting )
 {
 	runcmd_t		*to_cmd = NULL, *from_cmd;
 	local_state_t	*from = NULL, *to = NULL;
-	frame_t *frame = NULL;
+	uint		current_command;
+	uint		current_command_mod;
+	frame_t		*frame = NULL;
 	uint		i, stoppoint;
+	qboolean		runfuncs;
 	double		f = 1.0;
+	cl_entity_t	*ent;
 	double		time;
 
 	if( cls.state != ca_active || cls.spectator )
@@ -1021,7 +1175,7 @@ void CL_PredictMovement( qboolean repredicting )
 
 	CL_SetUpPlayerPrediction( false, false );
 
-	if( !cl.validsequence )
+	if( cls.state != ca_active || !cl.validsequence )
 		return;
 
 	if(( cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged ) >= CL_UPDATE_MASK )
@@ -1062,10 +1216,6 @@ void CL_PredictMovement( qboolean repredicting )
 
 	for( i = 1; i < CL_UPDATE_MASK && cls.netchan.incoming_acknowledged + i < cls.netchan.outgoing_sequence + stoppoint; i++ )
 	{
-		uint		current_command;
-		uint		current_command_mod;
-		qboolean		runfuncs;
-
 		current_command = cls.netchan.incoming_acknowledged + i;
 		current_command_mod = current_command & CL_UPDATE_MASK;
 
@@ -1142,7 +1292,7 @@ void CL_PredictMovement( qboolean repredicting )
 
 	if( FBitSet( to->client.flags, FL_ONGROUND ))
 	{
-		cl_entity_t	*ent = CL_GetEntityByIndex( cl.local.lastground );
+		ent = CL_GetEntityByIndex( cl.local.lastground );
 		cl.local.onground = cl.local.lastground;
 		cl.local.moving = false;
 
@@ -1164,13 +1314,13 @@ void CL_PredictMovement( qboolean repredicting )
 	else
 	{
 		cl.local.onground = -1;
-		cl.local.moving = false;
+		cl.local.moving = 0;
 	}
 
 	if( cls.correction_time > 0 && !cl_nosmooth->value && cl_smoothtime->value )
 	{
-		vec3_t delta;
+		vec3_t	delta;
-		float frac;
+		float	frac;
 
 		// only decay timer once per frame
 		if( !repredicting )

engine/client/cl_qparse.c

@@ -237,6 +237,10 @@ static void CL_ParseQuakeServerInfo( sizebuf_t *msg )
 	}
 	else Cvar_Reset( "r_decals" );
 
+	// re-init mouse
+	if( cl.background )
+		host.mouse_visible = false;
+
 	if( cl.background )	// tell the game parts about background state
 		Cvar_FullSet( "cl_background", "1", FCVAR_READ_ONLY );
 	else Cvar_FullSet( "cl_background", "0", FCVAR_READ_ONLY );
@@ -821,9 +825,6 @@ CL_QuakeStuffText
 void CL_QuakeStuffText( const char *text )
 {
 	Q_strncat( cmd_buf, text, sizeof( cmd_buf ));
-
-	// a1ba: didn't filtered, anyway quake protocol
-	// only supported for demos, not network games
 	Cbuf_AddText( text );
 }
 
@@ -860,7 +861,7 @@ void CL_QuakeExecStuff( void )
 
 		if( !*text ) break;
 
-		text = COM_ParseFileSafe( text, token, sizeof( token ), PFILE_IGNOREBRACKET, NULL, NULL );
+		text = _COM_ParseFileSafe( text, token, sizeof( token ), PFILE_IGNOREBRACKET, NULL );
 
 		if( !text ) break;
 

engine/client/cl_remap.c

@@ -157,7 +157,7 @@ void CL_UpdateStudioTexture( cl_entity_t *entity, mstudiotexture_t *ptexture, in
 
 	// build name of original texture
 	Q_strncpy( mdlname, entity->model->name, sizeof( mdlname ));
-	COM_FileBase( ptexture->name, name, sizeof( name ));
+	COM_FileBase( ptexture->name, name );
 	COM_StripExtension( mdlname );
 
 	Q_snprintf( texname, sizeof( texname ), "#%s/%s.mdl", mdlname, name );

engine/client/cl_render.c

@@ -117,7 +117,7 @@ static void R_EnvShot( const float *vieworg, const char *name, qboolean skyshot,
 	else cls.scrshot_action = scrshot_envshot;
 
 	// catch negative values
-	cls.envshot_viewsize = Q_max( 0, shotsize );
+	cls.envshot_viewsize = max( 0, shotsize );
 }
 
 /*
@@ -133,7 +133,7 @@ const char *CL_GenericHandle( int fileindex )
 	return cl.files_precache[fileindex];
 }
 
-intptr_t CL_RenderGetParm( const int parm, const int arg, const qboolean checkRef )
+int CL_RenderGetParm( const int parm, const int arg, const qboolean checkRef )
 {
 	switch( parm )
 	{
@@ -161,9 +161,9 @@ intptr_t CL_RenderGetParm( const int parm, const int arg, const qboolean checkRe
 	case PARM_WATER_ALPHA:
 		return FBitSet( world.flags, FWORLD_WATERALPHA );
 	case PARM_DELUXEDATA:
-		return (intptr_t)world.deluxedata;
+		return *(int *)&world.deluxedata;
 	case PARM_SHADOWDATA:
-		return (intptr_t)world.shadowdata;
+		return *(int *)&world.shadowdata;
 	default:
 		// indicates call from client.dll
 		if( checkRef )
@@ -204,7 +204,7 @@ intptr_t CL_RenderGetParm( const int parm, const int arg, const qboolean checkRe
 	return 0;
 }
 
-static intptr_t pfnRenderGetParm( int parm, int arg )
+static int pfnRenderGetParm( int parm, int arg )
 {
 	return CL_RenderGetParm( parm, arg, true );
 }

engine/client/cl_scrn.c

@@ -150,7 +150,8 @@ same as r_speeds but for network channel
 void SCR_NetSpeeds( void )
 {
 	static char	msg[MAX_SYSPATH];
-	int		x, y;
+	int		x, y, height;
+	char		*p, *start, *end;
 	float		time = cl.mtime[0];
 	static int	min_svfps = 100;
 	static int	max_svfps = 0;
@@ -159,7 +160,6 @@ void SCR_NetSpeeds( void )
 	static int	max_clfps = 0;
 	int		cur_clfps = 0;
 	rgba_t		color;
-	cl_font_t *font = Con_GetCurFont();
 
 	if( !host.allow_console )
 		return;
@@ -196,11 +196,25 @@ void SCR_NetSpeeds( void )
 		Q_memprint( cls.netchan.total_sended )
 	);
 
-	x = refState.width - 320 * font->scale;
+	x = refState.width - 320;
 	y = 384;
 
+	Con_DrawStringLen( NULL, NULL, &height );
 	MakeRGBA( color, 255, 255, 255, 255 );
-	CL_DrawString( x, y, msg, color, font, FONT_DRAW_RESETCOLORONLF );
+
+	p = start = msg;
+
+	do
+	{
+		end = Q_strchr( p, '\n' );
+		if( end ) msg[end-start] = '\0';
+
+		Con_DrawString( x, y, p, color );
+		y += height;
+
+		if( end ) p = end + 1;
+		else break;
+	} while( 1 );
 }
 
 /*
@@ -217,15 +231,31 @@ void SCR_RSpeeds( void )
 
 	if( ref.dllFuncs.R_SpeedsMessage( msg, sizeof( msg )))
 	{
-		int	x, y;
+		int	x, y, height;
+		char	*p, *start, *end;
 		rgba_t	color;
-		cl_font_t *font = Con_GetCurFont();
 
-		x = refState.width - 340 * font->scale;
+		x = refState.width - 340;
 		y = 64;
 
+		Con_DrawStringLen( NULL, NULL, &height );
 		MakeRGBA( color, 255, 255, 255, 255 );
-		CL_DrawString( x, y, msg, color, font, FONT_DRAW_RESETCOLORONLF );
+
+		p = start = msg;
+		do
+		{
+			end = Q_strchr( p, '\n' );
+			if( end ) msg[end-start] = '\0';
+
+			Con_DrawString( x, y, p, color );
+			y += height;
+
+			// handle '\n\n'
+			if( *p == '\n' )
+				y += height;
+			if( end ) p = end + 1;
+			else break;
+		} while( 1 );
 	}
 }
 
@@ -388,6 +418,7 @@ void SCR_BeginLoadingPlaque( qboolean is_background )
 	cls.draw_changelevel = !is_background;
 	SCR_UpdateScreen();
 	cls.disable_screen = host.realtime;
+	cls.disable_servercount = cl.servercount;
 	cl.background = is_background;		// set right state before svc_serverdata is came
 
 	if( !Host_IsDedicated() )
@@ -547,6 +578,77 @@ void SCR_UpdateScreen( void )
 	V_PostRender();
 }
 
+qboolean SCR_LoadFixedWidthFont( const char *fontname )
+{
+	int	i, fontWidth;
+
+	if( cls.creditsFont.valid )
+		return true; // already loaded
+
+	if( !FS_FileExists( fontname, false ))
+		return false;
+
+	cls.creditsFont.hFontTexture = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, TF_IMAGE|TF_KEEP_SOURCE );
+	R_GetTextureParms( &fontWidth, NULL, cls.creditsFont.hFontTexture );
+	cls.creditsFont.charHeight = clgame.scrInfo.iCharHeight = fontWidth / 16;
+	cls.creditsFont.type = FONT_FIXED;
+	cls.creditsFont.valid = true;
+
+	// build fixed rectangles
+	for( i = 0; i < 256; i++ )
+	{
+		cls.creditsFont.fontRc[i].left = (i * (fontWidth / 16)) % fontWidth;
+		cls.creditsFont.fontRc[i].right = cls.creditsFont.fontRc[i].left + fontWidth / 16;
+		cls.creditsFont.fontRc[i].top = (i / 16) * (fontWidth / 16);
+		cls.creditsFont.fontRc[i].bottom = cls.creditsFont.fontRc[i].top + fontWidth / 16;
+		cls.creditsFont.charWidths[i] = clgame.scrInfo.charWidths[i] = fontWidth / 16;
+	}
+
+	return true;
+}
+
+qboolean SCR_LoadVariableWidthFont( const char *fontname )
+{
+	int	i, fontWidth;
+	byte	*buffer;
+	fs_offset_t	length;
+	qfont_t	*src;
+
+	if( cls.creditsFont.valid )
+		return true; // already loaded
+
+	if( !FS_FileExists( fontname, false ))
+		return false;
+
+	cls.creditsFont.hFontTexture = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, TF_IMAGE );
+	R_GetTextureParms( &fontWidth, NULL, cls.creditsFont.hFontTexture );
+
+	// half-life font with variable chars witdh
+	buffer = FS_LoadFile( fontname, &length, false );
+
+	// setup creditsfont
+	if( buffer && length >= sizeof( qfont_t ))
+	{
+		src = (qfont_t *)buffer;
+		cls.creditsFont.charHeight = clgame.scrInfo.iCharHeight = src->rowheight;
+		cls.creditsFont.type = FONT_VARIABLE;
+
+		// build rectangles
+		for( i = 0; i < 256; i++ )
+		{
+			cls.creditsFont.fontRc[i].left = (word)src->fontinfo[i].startoffset % fontWidth;
+			cls.creditsFont.fontRc[i].right = cls.creditsFont.fontRc[i].left + src->fontinfo[i].charwidth;
+			cls.creditsFont.fontRc[i].top = (word)src->fontinfo[i].startoffset / fontWidth;
+			cls.creditsFont.fontRc[i].bottom = cls.creditsFont.fontRc[i].top + src->rowheight;
+			cls.creditsFont.charWidths[i] = clgame.scrInfo.charWidths[i] = src->fontinfo[i].charwidth;
+		}
+		cls.creditsFont.valid = true;
+	}
+	if( buffer ) Mem_Free( buffer );
+
+	return true;
+}
+
 /*
 ================
 SCR_LoadCreditsFont
@@ -556,41 +658,22 @@ INTERNAL RESOURCE
 */
 void SCR_LoadCreditsFont( void )
 {
-	cl_font_t *const font = &cls.creditsFont;
+	const char *path = "gfx/creditsfont.fnt";
-	qboolean success = false;
+	dword crc;
-	float scale = hud_fontscale->value;
-	dword crc = 0;
 
 	// replace default gfx.wad textures by current charset's font
 	if( !CRC32_File( &crc, "gfx.wad" ) || crc == 0x49eb9f16 )
 	{
-		string charsetFnt;
+		const char *path2 = va("creditsfont_%s.fnt", Cvar_VariableString( "con_charset" ) );
-
+		if( FS_FileExists( path2, false ) )
-		if( Q_snprintf( charsetFnt, sizeof( charsetFnt ),
+			path = path2;
-			"creditsfont_%s.fnt", Cvar_VariableString( "con_charset" )) > 0 )
-		{
-			if( FS_FileExists( charsetFnt, false ))
-				success = Con_LoadVariableWidthFont( charsetFnt, font, scale, kRenderTransAdd, TF_FONT );
-		}
 	}
 
-	if( !success )
+	if( !SCR_LoadVariableWidthFont( path ))
-		success = Con_LoadVariableWidthFont( "gfx/creditsfont.fnt", font, scale, kRenderTransAdd, TF_FONT );
-
-	if( !success )
-		success = Con_LoadFixedWidthFont( "gfx/conchars", font, scale, kRenderTransAdd, TF_FONT );
-
-	// copy font size for client.dll
-	if( success )
 	{
-		int i;
+		if( !SCR_LoadFixedWidthFont( "gfx/conchars" ))
-
+			Con_DPrintf( S_ERROR "failed to load HUD font\n" );
-		clgame.scrInfo.iCharHeight = cls.creditsFont.charHeight;
-
-		for( i = 0; i < ARRAYSIZE( cls.creditsFont.charWidths ); i++ )
-			clgame.scrInfo.charWidths[i] = cls.creditsFont.charWidths[i];
 	}
-	else Con_DPrintf( S_ERROR "failed to load HUD font\n" );
 }
 
 /*
@@ -712,13 +795,7 @@ void SCR_VidInit( void )
 		gameui.globals->scrHeight = refState.height;
 	}
 
-	// notify vgui about screen size change
+	VGui_Startup( NULL, refState.width, refState.height ); // initialized already, so pass NULL
-	if( clgame.hInstance )
-	{
-		// do not pass client pointer, we do not want to
-		// re-initialize vgui2
-		VGui_Startup( NULL, refState.width, refState.height );
-	}
 
 	CL_ClearSpriteTextures(); // now all hud sprites are invalid
 
@@ -749,7 +826,7 @@ void SCR_Init( void )
 	v_dark = Cvar_Get( "v_dark", "0", 0, "starts level from dark screen" );
 	scr_viewsize = Cvar_Get( "viewsize", "120", FCVAR_ARCHIVE, "screen size" );
 	net_speeds = Cvar_Get( "net_speeds", "0", FCVAR_ARCHIVE, "show network packets" );
-	cl_showfps = Cvar_Get( "cl_showfps", "0", FCVAR_ARCHIVE, "show client fps" );
+	cl_showfps = Cvar_Get( "cl_showfps", "1", FCVAR_ARCHIVE, "show client fps" );
 	cl_showpos = Cvar_Get( "cl_showpos", "0", FCVAR_ARCHIVE, "show local player position and velocity" );
 
 	// register our commands

engine/client/cl_securedstub.c

@@ -1,463 +0,0 @@
-/*
-cl_securedstub.c - secured client dll stub
-Copyright (C) 2022 FWGS
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#include "common.h"
-#include "client.h"
-
-typedef struct cldll_func_src_s
-{
-	int	(*pfnInitialize)( cl_enginefunc_t *pEnginefuncs, int iVersion );
-	void	(*pfnInit)( void );
-	int	(*pfnVidInit)( void );
-	int	(*pfnRedraw)( float flTime, int intermission );
-	int	(*pfnUpdateClientData)( client_data_t *cdata, float flTime );
-	void	(*pfnReset)( void );
-	void	(*pfnPlayerMove)( struct playermove_s *ppmove, int server );
-	void	(*pfnPlayerMoveInit)( struct playermove_s *ppmove );
-	char	(*pfnPlayerMoveTexture)( char *name );
-	void	(*IN_ActivateMouse)( void );
-	void	(*IN_DeactivateMouse)( void );
-	void	(*IN_MouseEvent)( int mstate );
-	void	(*IN_ClearStates)( void );
-	void	(*IN_Accumulate)( void );
-	void	(*CL_CreateMove)( float frametime, struct usercmd_s *cmd, int active );
-	int	(*CL_IsThirdPerson)( void );
-	void	(*CL_CameraOffset)( float *ofs );	// unused
-	void	*(*KB_Find)( const char *name );
-	void	(*CAM_Think)( void );		// camera stuff
-	void	(*pfnCalcRefdef)( ref_params_t *pparams );
-	int	(*pfnAddEntity)( int type, cl_entity_t *ent, const char *modelname );
-	void	(*pfnCreateEntities)( void );
-	void	(*pfnDrawNormalTriangles)( void );
-	void	(*pfnDrawTransparentTriangles)( void );
-	void	(*pfnStudioEvent)( const struct mstudioevent_s *event, const cl_entity_t *entity );
-	void	(*pfnPostRunCmd)( struct local_state_s *from, struct local_state_s *to, usercmd_t *cmd, int runfuncs, double time, unsigned int random_seed );
-	void	(*pfnShutdown)( void );
-	void	(*pfnTxferLocalOverrides)( entity_state_t *state, const clientdata_t *client );
-	void	(*pfnProcessPlayerState)( entity_state_t *dst, const entity_state_t *src );
-	void	(*pfnTxferPredictionData)( entity_state_t *ps, const entity_state_t *pps, clientdata_t *pcd, const clientdata_t *ppcd, weapon_data_t *wd, const weapon_data_t *pwd );
-	void	(*pfnDemo_ReadBuffer)( int size, byte *buffer );
-	int	(*pfnConnectionlessPacket)( const struct netadr_s *net_from, const char *args, char *buffer, int *size );
-	int	(*pfnGetHullBounds)( int hullnumber, float *mins, float *maxs );
-	void	(*pfnFrame)( double time );
-	int	(*pfnKey_Event)( int eventcode, int keynum, const char *pszCurrentBinding );
-	void	(*pfnTempEntUpdate)( double frametime, double client_time, double cl_gravity, struct tempent_s **ppTempEntFree, struct tempent_s **ppTempEntActive, int ( *Callback_AddVisibleEntity )( cl_entity_t *pEntity ), void ( *Callback_TempEntPlaySound )( struct tempent_s *pTemp, float damp ));
-	cl_entity_t *(*pfnGetUserEntity)( int index );
-	void	(*pfnVoiceStatus)( int entindex, qboolean bTalking );
-	void	(*pfnDirectorMessage)( int iSize, void *pbuf );
-	int	(*pfnGetStudioModelInterface)( int version, struct r_studio_interface_s **ppinterface, struct engine_studio_api_s *pstudio );
-	void	(*pfnChatInputPosition)( int *x, int *y );
-	int	(*pfnGetPlayerTeam)( int iPlayer );
-	void	*(*pfnClientFactory)( void );
-} cldll_func_src_t;
-
-typedef struct cldll_func_dst_s
-{
-	void	(*pfnInitialize)( cl_enginefunc_t **pEnginefuncs, int *iVersion );
-	void	(*pfnInit)( void );
-	void	(*pfnVidInit)( void );
-	void	(*pfnRedraw)( float *flTime, int *intermission );
-	void	(*pfnUpdateClientData)( client_data_t **cdata, float *flTime );
-	void	(*pfnReset)( void );
-	void	(*pfnPlayerMove)( struct playermove_s **ppmove, int *server );
-	void	(*pfnPlayerMoveInit)( struct playermove_s **ppmove );
-	void	(*pfnPlayerMoveTexture)( char **name );
-	void	(*IN_ActivateMouse)( void );
-	void	(*IN_DeactivateMouse)( void );
-	void	(*IN_MouseEvent)( int *mstate );
-	void	(*IN_ClearStates)( void );
-	void	(*IN_Accumulate)( void );
-	void	(*CL_CreateMove)( float *frametime, struct usercmd_s **cmd, int *active );
-	void	(*CL_IsThirdPerson)( void );
-	void	(*CL_CameraOffset)( float **ofs );
-	void	(*KB_Find)( const char **name );
-	void	(*CAM_Think)( void );
-	void	(*pfnCalcRefdef)( ref_params_t **pparams );
-	void	(*pfnAddEntity)( int *type, cl_entity_t **ent, const char **modelname );
-	void	(*pfnCreateEntities)( void );
-	void	(*pfnDrawNormalTriangles)( void );
-	void	(*pfnDrawTransparentTriangles)( void );
-	void	(*pfnStudioEvent)( const struct mstudioevent_s **event, const cl_entity_t **entity );
-	void	(*pfnPostRunCmd)( struct local_state_s **from, struct local_state_s **to, usercmd_t **cmd, int *runfuncs, double *time, unsigned int *random_seed );
-	void	(*pfnShutdown)( void );
-	void	(*pfnTxferLocalOverrides)( entity_state_t **state, const clientdata_t **client );
-	void	(*pfnProcessPlayerState)( entity_state_t **dst, const entity_state_t **src );
-	void	(*pfnTxferPredictionData)( entity_state_t **ps, const entity_state_t **pps, clientdata_t **pcd, const clientdata_t **ppcd, weapon_data_t **wd, const weapon_data_t **pwd );
-	void	(*pfnDemo_ReadBuffer)( int *size, byte **buffer );
-	void	(*pfnConnectionlessPacket)( const struct netadr_s **net_from, const char **args, char **buffer, int **size );
-	void	(*pfnGetHullBounds)( int *hullnumber, float **mins, float **maxs );
-	void	(*pfnFrame)( double *time );
-	void	(*pfnKey_Event)( int *eventcode, int *keynum, const char **pszCurrentBinding );
-	void	(*pfnTempEntUpdate)( double *frametime, double *client_time, double *cl_gravity, struct tempent_s ***ppTempEntFree, struct tempent_s ***ppTempEntActive, int ( **Callback_AddVisibleEntity )( cl_entity_t *pEntity ), void ( **Callback_TempEntPlaySound )( struct tempent_s *pTemp, float damp ));
-	void	(*pfnGetUserEntity)( int *index );
-	void	(*pfnVoiceStatus)( int *entindex, qboolean *bTalking );
-	void	(*pfnDirectorMessage)( int *iSize, void **pbuf );
-	void	(*pfnGetStudioModelInterface)( int *version, struct r_studio_interface_s ***ppinterface, struct engine_studio_api_s **pstudio );
-	void	(*pfnChatInputPosition)( int **x, int **y );
-	void	(*pfnGetPlayerTeam)( int *iPlayer );
-} cldll_func_dst_t;
-
-struct cl_enginefunc_dst_s;
-struct modshelpers_s;
-struct modchelpers_s;
-struct engdata_s;
-
-typedef struct modfuncs_s
-{
-	void	(*m_pfnLoadMod)( char *pchModule );
-	void	(*m_pfnCloseMod)( void );
-	int	(*m_pfnNCall)( int ijump, int cnArg, ... );
-	void	(*m_pfnGetClDstAddrs)( cldll_func_dst_t *pcldstAddrs );
-	void	(*m_pfnGetEngDstAddrs)( struct cl_enginefunc_dst_s *pengdstAddrs );
-	void	(*m_pfnModuleLoaded)( void );
-	void	(*m_pfnProcessOutgoingNet)( struct netchan_s *pchan, struct sizebuf_s *psizebuf );
-	qboolean	(*m_pfnProcessIncomingNet)( struct netchan_s *pchan, struct sizebuf_s *psizebuf );
-	void	(*m_pfnTextureLoad)( char *pszName, int dxWidth, int dyHeight, char *pbData );
-	void	(*m_pfnModelLoad)( struct model_s *pmodel, void *pvBuf );
-	void	(*m_pfnFrameBegin)( void );
-	void	(*m_pfnFrameRender1)( void );
-	void	(*m_pfnFrameRender2)( void );
-	void	(*m_pfnSetModSHelpers)( struct modshelpers_s *pmodshelpers );
-	void	(*m_pfnSetModCHelpers)( struct modchelpers_s *pmodchelpers );
-	void	(*m_pfnSetEngData)( struct engdata_s *pengdata );
-	int	m_nVersion;
-	void	(*m_pfnConnectClient)( int iPlayer );
-	void	(*m_pfnRecordIP)( unsigned int pnIP );
-	void	(*m_pfnPlayerStatus)( unsigned char *pbData, int cbData );
-	void	(*m_pfnSetEngineVersion)( int nVersion );
-	int	m_nVoid2;
-	int	m_nVoid3;
-	int	m_nVoid4;
-	int	m_nVoid5;
-	int	m_nVoid6;
-	int	m_nVoid7;
-	int	m_nVoid8;
-	int	m_nVoid9;
-} modfuncs_t;
-
-static void DstInitialize( cl_enginefunc_t **pEnginefuncs, int *iVersion )
-{
-    // stub
-}
-
-static void DstInit( void )
-{
-    // stub
-}
-
-static void DstVidInit( void )
-{
-    // stub
-}
-
-static void DstRedraw( float *flTime, int *intermission )
-{
-    // stub
-}
-
-static void DstUpdateClientData( client_data_t **cdata, float *flTime )
-{
-    // stub
-}
-
-static void DstReset( void )
-{
-    // stub
-}
-
-static void DstPlayerMove( struct playermove_s **ppmove, int *server )
-{
-    // stub
-}
-
-static void DstPlayerMoveInit( struct playermove_s **ppmove )
-{
-    // stub
-}
-
-static void DstPlayerMoveTexture( char **name )
-{
-    // stub
-}
-
-static void DstIN_ActivateMouse( void )
-{
-    // stub
-}
-
-static void DstIN_DeactivateMouse( void )
-{
-    // stub
-}
-
-static void DstIN_MouseEvent( int *mstate )
-{
-    // stub
-}
-
-static void DstIN_ClearStates( void )
-{
-    // stub
-}
-
-static void DstIN_Accumulate( void )
-{
-    // stub
-}
-
-static void DstCL_CreateMove( float *frametime, struct usercmd_s **cmd, int *active )
-{
-    // stub
-}
-
-static void DstCL_IsThirdPerson( void )
-{
-    // stub
-}
-
-static void DstCL_CameraOffset( float **ofs )
-{
-    // stub
-}
-
-static void DstKB_Find( const char **name )
-{
-    // stub
-}
-
-static void DstCAM_Think( void )
-{
-    // stub
-}
-
-static void DstCalcRefdef( ref_params_t **pparams )
-{
-    // stub
-}
-
-static void DstAddEntity( int *type, cl_entity_t **ent, const char **modelname )
-{
-    // stub
-}
-
-static void DstCreateEntities( void )
-{
-    // stub
-}
-
-static void DstDrawNormalTriangles( void )
-{
-    // stub
-}
-
-static void DstDrawTransparentTriangles( void )
-{
-    // stub
-}
-
-static void DstStudioEvent( const struct mstudioevent_s **event, const cl_entity_t **entity )
-{
-    // stub
-}
-
-static void DstPostRunCmd( struct local_state_s **from, struct local_state_s **to, usercmd_t **cmd, int *runfuncs, double *time, unsigned int *random_seed )
-{
-    // stub
-}
-
-static void DstShutdown( void )
-{
-    // stub
-}
-
-static void DstTxferLocalOverrides( entity_state_t **state, const clientdata_t **client )
-{
-    // stub
-}
-
-static void DstProcessPlayerState( entity_state_t **dst, const entity_state_t **src )
-{
-    // stub
-}
-
-static void DstTxferPredictionData( entity_state_t **ps, const entity_state_t **pps, clientdata_t **pcd, const clientdata_t **ppcd, weapon_data_t **wd, const weapon_data_t **pwd )
-{
-    // stub
-}
-
-static void DstDemo_ReadBuffer( int *size, byte **buffer )
-{
-    // stub
-}
-
-static void DstConnectionlessPacket( const struct netadr_s **net_from, const char **args, char **buffer, int **size )
-{
-    // stub
-}
-
-static void DstGetHullBounds( int *hullnumber, float **mins, float **maxs )
-{
-    // stub
-}
-
-static void DstFrame( double *time )
-{
-    // stub
-}
-
-static void DstKey_Event( int *eventcode, int *keynum, const char **pszCurrentBinding )
-{
-    // stub
-}
-
-static void DstTempEntUpdate( double *frametime, double *client_time, double *cl_gravity, struct tempent_s ***ppTempEntFree, struct tempent_s ***ppTempEntActive, int ( **Callback_AddVisibleEntity )( cl_entity_t *pEntity ), void ( **Callback_TempEntPlaySound )( struct tempent_s *pTemp, float damp ) )
-{
-    // stub
-}
-
-static void DstGetUserEntity( int *index )
-{
-    // stub
-}
-
-static void DstVoiceStatus( int *entindex, qboolean *bTalking )
-{
-    // stub
-}
-
-static void DstDirectorMessage( int *iSize, void **pbuf )
-{
-    // stub
-}
-
-static void DstGetStudioModelInterface( int *version, struct r_studio_interface_s ***ppinterface, struct engine_studio_api_s **pstudio )
-{
-    // stub
-}
-
-static void DstChatInputPosition( int **x, int **y )
-{
-    // stub
-}
-
-static void DstGetPlayerTeam( int *iPlayer )
-{
-    // stub
-}
-
-static cldll_func_dst_t cldllFuncDst =
-{
-	DstInitialize,
-	DstInit,
-	DstVidInit,
-	DstRedraw,
-	DstUpdateClientData,
-	DstReset,
-	DstPlayerMove,
-	DstPlayerMoveInit,
-	DstPlayerMoveTexture,
-	DstIN_ActivateMouse,
-	DstIN_DeactivateMouse,
-	DstIN_MouseEvent,
-	DstIN_ClearStates,
-	DstIN_Accumulate,
-	DstCL_CreateMove,
-	DstCL_IsThirdPerson,
-	DstCL_CameraOffset,
-	DstKB_Find,
-	DstCAM_Think,
-	DstCalcRefdef,
-	DstAddEntity,
-	DstCreateEntities,
-	DstDrawNormalTriangles,
-	DstDrawTransparentTriangles,
-	DstStudioEvent,
-	DstPostRunCmd,
-	DstShutdown,
-	DstTxferLocalOverrides,
-	DstProcessPlayerState,
-	DstTxferPredictionData,
-	DstDemo_ReadBuffer,
-	DstConnectionlessPacket,
-	DstGetHullBounds,
-	DstFrame,
-	DstKey_Event,
-	DstTempEntUpdate,
-	DstGetUserEntity,
-	DstVoiceStatus,
-	DstDirectorMessage,
-	DstGetStudioModelInterface,
-	DstChatInputPosition,
-	DstGetPlayerTeam,
-};
-
-void CL_GetSecuredClientAPI( CL_EXPORT_FUNCS F )
-{
-	modfuncs_t modFuncs = { 0 };
-
-	// secured client dlls need these
-	cldll_func_src_t cldllFuncSrc =
-	{
-		(void *)&modFuncs,
-		NULL,
-		(void *)&cldllFuncDst
-	};
-
-	// trying to fill interface now
-	F( &cldllFuncSrc );
-
-	// map exports to xash's cldll_func_t
-	clgame.dllFuncs.pfnInitialize = cldllFuncSrc.pfnInitialize;
-	clgame.dllFuncs.pfnInit = cldllFuncSrc.pfnInit;
-	clgame.dllFuncs.pfnVidInit = cldllFuncSrc.pfnVidInit;
-	clgame.dllFuncs.pfnRedraw = cldllFuncSrc.pfnRedraw;
-	clgame.dllFuncs.pfnUpdateClientData = cldllFuncSrc.pfnUpdateClientData;
-	clgame.dllFuncs.pfnReset = cldllFuncSrc.pfnReset;
-	clgame.dllFuncs.pfnPlayerMove = cldllFuncSrc.pfnPlayerMove;
-	clgame.dllFuncs.pfnPlayerMoveInit = cldllFuncSrc.pfnPlayerMoveInit;
-	clgame.dllFuncs.pfnPlayerMoveTexture = cldllFuncSrc.pfnPlayerMoveTexture;
-	clgame.dllFuncs.IN_ActivateMouse = cldllFuncSrc.IN_ActivateMouse;
-	clgame.dllFuncs.IN_DeactivateMouse = cldllFuncSrc.IN_DeactivateMouse;
-	clgame.dllFuncs.IN_MouseEvent = cldllFuncSrc.IN_MouseEvent;
-	clgame.dllFuncs.IN_ClearStates = cldllFuncSrc.IN_ClearStates;
-	clgame.dllFuncs.IN_Accumulate = cldllFuncSrc.IN_Accumulate;
-	clgame.dllFuncs.CL_CreateMove = cldllFuncSrc.CL_CreateMove;
-	clgame.dllFuncs.CL_IsThirdPerson = cldllFuncSrc.CL_IsThirdPerson;
-	clgame.dllFuncs.CL_CameraOffset = cldllFuncSrc.CL_CameraOffset;
-	clgame.dllFuncs.KB_Find = cldllFuncSrc.KB_Find;
-	clgame.dllFuncs.CAM_Think = cldllFuncSrc.CAM_Think;
-	clgame.dllFuncs.pfnCalcRefdef = cldllFuncSrc.pfnCalcRefdef;
-	clgame.dllFuncs.pfnAddEntity = cldllFuncSrc.pfnAddEntity;
-	clgame.dllFuncs.pfnCreateEntities = cldllFuncSrc.pfnCreateEntities;
-	clgame.dllFuncs.pfnDrawNormalTriangles = cldllFuncSrc.pfnDrawNormalTriangles;
-	clgame.dllFuncs.pfnDrawTransparentTriangles = cldllFuncSrc.pfnDrawTransparentTriangles;
-	clgame.dllFuncs.pfnStudioEvent = cldllFuncSrc.pfnStudioEvent;
-	clgame.dllFuncs.pfnPostRunCmd = cldllFuncSrc.pfnPostRunCmd;
-	clgame.dllFuncs.pfnShutdown = cldllFuncSrc.pfnShutdown;
-	clgame.dllFuncs.pfnTxferLocalOverrides = cldllFuncSrc.pfnTxferLocalOverrides;
-	clgame.dllFuncs.pfnProcessPlayerState = cldllFuncSrc.pfnProcessPlayerState;
-	clgame.dllFuncs.pfnTxferPredictionData = cldllFuncSrc.pfnTxferPredictionData;
-	clgame.dllFuncs.pfnDemo_ReadBuffer = cldllFuncSrc.pfnDemo_ReadBuffer;
-	clgame.dllFuncs.pfnConnectionlessPacket = cldllFuncSrc.pfnConnectionlessPacket;
-	clgame.dllFuncs.pfnGetHullBounds = cldllFuncSrc.pfnGetHullBounds;
-	clgame.dllFuncs.pfnFrame = cldllFuncSrc.pfnFrame;
-	clgame.dllFuncs.pfnKey_Event = cldllFuncSrc.pfnKey_Event;
-	clgame.dllFuncs.pfnTempEntUpdate = cldllFuncSrc.pfnTempEntUpdate;
-	clgame.dllFuncs.pfnGetUserEntity = cldllFuncSrc.pfnGetUserEntity;
-	clgame.dllFuncs.pfnVoiceStatus = cldllFuncSrc.pfnVoiceStatus;
-	clgame.dllFuncs.pfnDirectorMessage = cldllFuncSrc.pfnDirectorMessage;
-	clgame.dllFuncs.pfnGetStudioModelInterface = cldllFuncSrc.pfnGetStudioModelInterface;
-	clgame.dllFuncs.pfnChatInputPosition = cldllFuncSrc.pfnChatInputPosition;
-}

engine/client/cl_tent.c

@@ -361,8 +361,8 @@ void CL_TempEntPlaySound( TEMPENTITY *pTemp, float damp )
 		sound_t	handle;
 
 		if( isshellcasing )
-			fvol *= Q_min( 1.0f, ((float)zvel) / 350.0f );
+			fvol *= min ( 1.0f, ((float)zvel) / 350.0f );
-		else fvol *= Q_min( 1.0f, ((float)zvel) / 450.0f );
+		else fvol *= min ( 1.0f, ((float)zvel) / 450.0f );
 
 		if( !COM_RandomLong( 0, 3 ) && !isshellcasing )
 			pitch = COM_RandomLong( 95, 105 );
@@ -1037,7 +1037,7 @@ void GAME_EXPORT R_BreakModel( const vec3_t pos, const vec3_t size, const vec3_t
 			vecSpot[1] = pos[1] + COM_RandomFloat( -0.5f, 0.5f ) * size[1];
 			vecSpot[2] = pos[2] + COM_RandomFloat( -0.5f, 0.5f ) * size[2];
 
-			if( PM_CL_PointContents( vecSpot, NULL ) != CONTENTS_SOLID )
+			if( CL_PointContents( vecSpot ) != CONTENTS_SOLID )
 				break; // valid spot
 		}
 
@@ -1245,28 +1245,37 @@ apply params for exploding sprite
 */
 void GAME_EXPORT R_Sprite_Explode( TEMPENTITY *pTemp, float scale, int flags )
 {
-	qboolean noadditive, drawalpha, rotate;
+	if( !pTemp ) return;
 
-	if( !pTemp )
+	if( FBitSet( flags, TE_EXPLFLAG_NOADDITIVE ))
-		return;
+	{
+		// solid sprite
+		pTemp->entity.curstate.rendermode = kRenderNormal;
+		pTemp->entity.curstate.renderamt = 255;
+	}
+	else if( FBitSet( flags, TE_EXPLFLAG_DRAWALPHA ))
+	{
+		// alpha sprite (came from hl2)
+		pTemp->entity.curstate.rendermode = kRenderTransAlpha;
+		pTemp->entity.curstate.renderamt = 180;
+	}
+	else
+	{
+		// additive sprite
+		pTemp->entity.curstate.rendermode = kRenderTransAdd;
+		pTemp->entity.curstate.renderamt = 180;
+	}
 
-	noadditive = FBitSet( flags, TE_EXPLFLAG_NOADDITIVE );
+	if( FBitSet( flags, TE_EXPLFLAG_ROTATE ))
-	drawalpha  = FBitSet( flags, TE_EXPLFLAG_DRAWALPHA );
+	{
-	rotate     = FBitSet( flags, TE_EXPLFLAG_ROTATE );
+		// came from hl2
+		pTemp->entity.angles[2] = COM_RandomLong( 0, 360 );
+	}
 
+	pTemp->entity.curstate.renderfx = kRenderFxNone;
+	pTemp->entity.baseline.origin[2] = 8;
+	pTemp->entity.origin[2] += 10;
 	pTemp->entity.curstate.scale = scale;
-	pTemp->entity.baseline.origin[2] = 8.0f;
-	pTemp->entity.origin[2] = pTemp->entity.origin[2] + 10.0f;
-	if( rotate )
-		pTemp->entity.angles[2] = COM_RandomFloat( 0.0, 360.0f );
-
-	pTemp->entity.curstate.rendermode = noadditive ? kRenderNormal :
-		drawalpha ? kRenderTransAlpha : kRenderTransAdd;
-	pTemp->entity.curstate.renderamt  = noadditive ? 0xff : 0xb4;
-	pTemp->entity.curstate.renderfx = 0;
-	pTemp->entity.curstate.rendercolor.r = 0;
-	pTemp->entity.curstate.rendercolor.g = 0;
-	pTemp->entity.curstate.rendercolor.b = 0;
 }
 
 /*
@@ -1473,6 +1482,7 @@ void GAME_EXPORT R_FunnelSprite( const vec3_t org, int modelIndex, int reverse )
 			pTemp->entity.baseline.angles[2] = COM_RandomFloat( -100.0f, 100.0f );
 			pTemp->entity.curstate.framerate = COM_RandomFloat( 0.1f, 0.4f );
 			pTemp->flags = FTENT_ROTATE|FTENT_FADEOUT;
+			pTemp->entity.curstate.framerate = 10;
 
 			vel = dest[2] / 8.0f;
 			if( vel < 64.0f ) vel = 64.0f;
@@ -1505,18 +1515,17 @@ R_RicochetSound
 Make a random ricochet sound
 ==============
 */
-static void R_RicochetSound_( const vec3_t pos, int sound )
-{
-	sound_t	handle;
-
-	handle = S_RegisterSound( cl_ricochet_sounds[sound] );
-
-	S_StartSound( pos, 0, CHAN_AUTO, handle, VOL_NORM, 1.0, 100, 0 );
-}
-
 void GAME_EXPORT R_RicochetSound( const vec3_t pos )
 {
-	R_RicochetSound_( pos, COM_RandomLong( 0, 4 ));
+	int	iPitch = COM_RandomLong( 90, 105 );
+	float	fvol = COM_RandomFloat( 0.7f, 0.9f );
+	char	soundpath[32];
+	sound_t	handle;
+
+	Q_strncpy( soundpath, cl_ricochet_sounds[COM_RandomLong( 0, 4 )], sizeof( soundpath ) );
+	handle = S_RegisterSound( soundpath );
+
+	S_StartSound( pos, 0, CHAN_AUTO, handle, fvol, ATTN_NORM, iPitch, 0 );
 }
 
 /*
@@ -1647,7 +1656,7 @@ void GAME_EXPORT R_Explosion( vec3_t pos, int model, float scale, float framerat
 			dl->color.g = 250;
 			dl->color.b = 150;
 			dl->die = cl.time + 0.01f;
-			dl->decay = 800;
+			dl->decay = 80;
 
 			// red glow
 			dl = CL_AllocDlight( 0 );
@@ -1895,7 +1904,7 @@ handle temp-entity messages
 void CL_ParseTempEntity( sizebuf_t *msg )
 {
 	sizebuf_t		buf;
-	byte		pbuf[2048];
+	byte		pbuf[256];
 	int		iSize;
 	int		type, color, count, flags;
 	int		decalIndex, modelIndex, entityIndex;
@@ -1906,7 +1915,6 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 	TEMPENTITY	*pTemp;
 	cl_entity_t	*pEnt;
 	dlight_t		*dl;
-	sound_t	hSound;
 
 	if( cls.legacymode )
 		iSize = MSG_ReadByte( msg );
@@ -1914,10 +1922,6 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 
 	decalIndex = modelIndex = entityIndex = 0;
 
-	// this will probably be fatal anyway
-	if( iSize > sizeof( pbuf ))
-		Con_Printf( S_ERROR "%s: Temp buffer overflow!\n", __FUNCTION__ );
-
 	// parse user message into buffer
 	MSG_ReadBytes( msg, pbuf, iSize );
 
@@ -1965,9 +1969,6 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 		pos[1] = MSG_ReadCoord( &buf );
 		pos[2] = MSG_ReadCoord( &buf );
 		R_BlobExplosion( pos );
-
-		hSound = S_RegisterSound( cl_explode_sounds[0] );
-		S_StartSound( pos, -1, CHAN_AUTO, hSound, VOL_NORM, 1.0f, PITCH_NORM, 0 );
 		break;
 	case TE_SMOKE:
 		pos[0] = MSG_ReadCoord( &buf );
@@ -2013,46 +2014,15 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 		color = MSG_ReadByte( &buf );
 		count = MSG_ReadByte( &buf );
 		R_ParticleExplosion2( pos, color, count );
-
-		dl = CL_AllocDlight( 0 );
-		VectorCopy( pos, dl->origin );
-		dl->radius = 350;
-		dl->die = cl.time + 0.5;
-		dl->decay = 300;
-
-		hSound = S_RegisterSound( cl_explode_sounds[0] );
-		S_StartSound( pos, -1, CHAN_AUTO, hSound, VOL_NORM, 0.6f, PITCH_NORM, 0 );
 		break;
 	case TE_BSPDECAL:
-	case TE_DECAL:
-	case TE_WORLDDECAL:
-	case TE_WORLDDECALHIGH:
-	case TE_DECALHIGH:
 		pos[0] = MSG_ReadCoord( &buf );
 		pos[1] = MSG_ReadCoord( &buf );
 		pos[2] = MSG_ReadCoord( &buf );
-		if( type == TE_BSPDECAL )
+		decalIndex = MSG_ReadShort( &buf );
-		{
+		entityIndex = MSG_ReadShort( &buf );
-			decalIndex = MSG_ReadShort( &buf );
+		if( entityIndex ) modelIndex = MSG_ReadShort( &buf );
-			entityIndex = MSG_ReadShort( &buf );
+		CL_DecalShoot( CL_DecalIndex( decalIndex ), entityIndex, modelIndex, pos, FDECAL_PERMANENT );
-			if( entityIndex )
-				modelIndex = MSG_ReadShort( &buf );
-			else modelIndex = 0;
-		}
-		else
-		{
-			decalIndex = MSG_ReadByte( &buf );
-			if( type == TE_DECALHIGH || type == TE_WORLDDECALHIGH )
-				decalIndex += 256;
-
-			if( type == TE_DECALHIGH || type == TE_DECAL )
-				entityIndex = MSG_ReadShort( &buf );
-			else entityIndex = 0;
-
-			pEnt = CL_GetEntityByIndex( entityIndex );
-			modelIndex = pEnt->curstate.modelindex;
-		}
-		CL_DecalShoot( CL_DecalIndex( decalIndex ), entityIndex, modelIndex, pos, type == TE_BSPDECAL ? FDECAL_PERMANENT : 0 );
 		break;
 	case TE_IMPLOSION:
 		pos[0] = MSG_ReadCoord( &buf );
@@ -2072,12 +2042,10 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 		pos2[2] = MSG_ReadCoord( &buf );
 		modelIndex = MSG_ReadShort( &buf );
 		count = MSG_ReadByte( &buf );
-		life = (float)MSG_ReadByte( &buf ) * 0.1f;
+		life = (float)(MSG_ReadByte( &buf ) * 0.1f);
-		scale = (float)MSG_ReadByte( &buf );
+		scale = (float)(MSG_ReadByte( &buf ) * 0.1f);
-		if( !scale ) scale = 1.0f;
+		vel = (float)MSG_ReadByte( &buf );
-		else scale *= 0.1f;
+		random = (float)MSG_ReadByte( &buf );
-		vel = (float)MSG_ReadByte( &buf ) * 10;
-		random = (float)MSG_ReadByte( &buf ) * 10;
 		R_Sprite_Trail( type, pos, pos2, modelIndex, count, life, scale, random, 255, vel );
 		break;
 	case TE_SPRITE:
@@ -2085,23 +2053,36 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 		pos[1] = MSG_ReadCoord( &buf );
 		pos[2] = MSG_ReadCoord( &buf );
 		modelIndex = MSG_ReadShort( &buf );
-		scale = (float)MSG_ReadByte( &buf ) * 0.1f;
+		scale = (float)(MSG_ReadByte( &buf ) * 0.1f);
-		brightness = (float)MSG_ReadByte( &buf ) / 255.0f;
+		brightness = (float)MSG_ReadByte( &buf );
 
-		R_TempSprite( pos, vec3_origin, scale, modelIndex,
+		if(( pTemp = R_DefaultSprite( pos, modelIndex, 0 )) != NULL )
-			kRenderTransAdd, kRenderFxNone, brightness, 0.0, FTENT_SPRANIMATE );
+		{
+			pTemp->entity.curstate.scale = scale;
+			pTemp->entity.baseline.renderamt = brightness;
+			pTemp->entity.curstate.renderamt = brightness;
+			pTemp->entity.curstate.rendermode = kRenderTransAdd;
+		}
 		break;
 	case TE_GLOWSPRITE:
 		pos[0] = MSG_ReadCoord( &buf );
 		pos[1] = MSG_ReadCoord( &buf );
 		pos[2] = MSG_ReadCoord( &buf );
 		modelIndex = MSG_ReadShort( &buf );
-		life = (float)MSG_ReadByte( &buf ) * 0.1f;
+		life = (float)(MSG_ReadByte( &buf ) * 0.1f);
-		scale = (float)MSG_ReadByte( &buf ) * 0.1f;
+		scale = (float)(MSG_ReadByte( &buf ) * 0.1f);
-		brightness = (float)MSG_ReadByte( &buf ) / 255.0f;
+		brightness = (float)MSG_ReadByte( &buf );
 
-		R_TempSprite( pos, vec3_origin, scale, modelIndex,
+		if(( pTemp = R_DefaultSprite( pos, modelIndex, 0 )) != NULL )
-			kRenderGlow, kRenderFxNoDissipation, brightness, life, FTENT_FADEOUT );
+		{
+			pTemp->entity.curstate.scale = scale;
+			pTemp->entity.curstate.rendermode = kRenderGlow;
+			pTemp->entity.curstate.renderfx = kRenderFxNoDissipation;
+			pTemp->entity.baseline.renderamt = brightness;
+			pTemp->entity.curstate.renderamt = brightness;
+			pTemp->flags = FTENT_FADEOUT;
+			pTemp->die = cl.time + life;
+		}
 		break;
 	case TE_STREAK_SPLASH:
 		pos[0] = MSG_ReadCoord( &buf );
@@ -2191,6 +2172,23 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 		pos2[2] = MSG_ReadCoord( &buf );
 		R_ShowLine( pos, pos2 );
 		break;
+	case TE_DECAL:
+	case TE_DECALHIGH:
+	case TE_WORLDDECAL:
+	case TE_WORLDDECALHIGH:
+		pos[0] = MSG_ReadCoord( &buf );
+		pos[1] = MSG_ReadCoord( &buf );
+		pos[2] = MSG_ReadCoord( &buf );
+		decalIndex = MSG_ReadByte( &buf );
+		if( type == TE_DECAL || type == TE_DECALHIGH )
+			entityIndex = MSG_ReadShort( &buf );
+		else entityIndex = 0;
+		if( type == TE_DECALHIGH || type == TE_WORLDDECALHIGH )
+			decalIndex += 256;
+		pEnt = CL_GetEntityByIndex( entityIndex );
+		if( pEnt ) modelIndex = pEnt->curstate.modelindex;
+		CL_DecalShoot( CL_DecalIndex( decalIndex ), entityIndex, modelIndex, pos, 0 );
+		break;
 	case TE_FIZZ:
 		entityIndex = MSG_ReadShort( &buf );
 		modelIndex = MSG_ReadShort( &buf );
@@ -2246,11 +2244,10 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 		pos[2] = MSG_ReadCoord( &buf );
 		entityIndex = MSG_ReadShort( &buf );
 		decalIndex = MSG_ReadByte( &buf );
+		pEnt = CL_GetEntityByIndex( entityIndex );
 		CL_DecalShoot( CL_DecalIndex( decalIndex ), entityIndex, 0, pos, 0 );
 		R_BulletImpactParticles( pos );
-		flags = COM_RandomLong( 0, 0x7fff );
+		R_RicochetSound( pos );
-		if( flags < 0x3fff )
-			R_RicochetSound_( pos, flags % 5 );
 		break;
 	case TE_SPRAY:
 	case TE_SPRITE_SPRAY:
@@ -2396,7 +2393,7 @@ void CL_ParseTempEntity( sizebuf_t *msg )
 
 	// throw warning
 	if( MSG_CheckOverflow( &buf ))
-		Con_DPrintf( S_WARN "ParseTempEntity: overflow TE message %i\n", type );
+		Con_DPrintf( S_WARN "ParseTempEntity: overflow TE message\n" );
 }
 
 
@@ -2696,7 +2693,7 @@ apply various effects to entity origin or attachment
 void CL_AddEntityEffects( cl_entity_t *ent )
 {
 	// yellow flies effect 'monster stuck in the wall'
-	if( FBitSet( ent->curstate.effects, EF_BRIGHTFIELD ) && !RP_LOCALCLIENT( ent ))
+	if( FBitSet( ent->curstate.effects, EF_BRIGHTFIELD ))
 		R_EntityParticles( ent );
 
 	if( FBitSet( ent->curstate.effects, EF_DIMLIGHT ))
@@ -2917,17 +2914,9 @@ void CL_PlayerDecal( int playernum, int customIndex, int entityIndex, float *pos
 	{
 		if( FBitSet( pCust->resource.ucFlags, RES_CUSTOM ) && pCust->resource.type == t_decal && pCust->bTranslated )
 		{
-			if( !pCust->nUserData1 )
+			if( !pCust->nUserData1 && pCust->pInfo != NULL )
 			{
-				int sprayTextureIndex;
+				const char *decalname = va( "player%dlogo%d", playernum, customIndex );
-				char decalname[MAX_VA_STRING];
-
-				Q_snprintf( decalname, sizeof( decalname ), "player%dlogo%d", playernum, customIndex );
-				sprayTextureIndex = ref.dllFuncs.GL_FindTexture( decalname );
-				if( sprayTextureIndex != 0 )
-				{
-					ref.dllFuncs.GL_FreeTexture( sprayTextureIndex );
-				}
 				pCust->nUserData1 = GL_LoadTextureInternal( decalname, pCust->pInfo, TF_DECAL );
 			}
 			textureIndex = pCust->nUserData1;

engine/client/cl_video.c

@@ -209,7 +209,7 @@ qboolean SCR_PlayCinematic( const char *arg )
 
 	if( FS_FileExists( arg, false ) && !fullpath )
 	{
-		Con_Printf( S_ERROR "Couldn't load %s from packfile. Please extract it\n", arg );
+		Con_Printf( S_ERROR "Couldn't load %s from packfile. Please extract it\n", path );
 		return false;
 	}
 

engine/client/cl_view.c

@@ -35,39 +35,30 @@ void V_CalcViewRect( void )
 	int	sb_lines;
 	float	size;
 
-	if( FBitSet( host.features, ENGINE_QUAKE_COMPATIBLE ))
+	// intermission is always full screen
-	{
+	if( cl.intermission ) size = 120.0f;
-		// intermission is always full screen
+	else size = scr_viewsize->value;
-		if( cl.intermission ) size = 120.0f;
-		else size = scr_viewsize->value;
 
-		if( size >= 120.0f )
+	if( size >= 120.0f )
-			sb_lines = 0;		// no status bar at all
+		sb_lines = 0;		// no status bar at all
-		else if( size >= 110.0f )
+	else if( size >= 110.0f )
-			sb_lines = 24;		// no inventory
+		sb_lines = 24;		// no inventory
-		else sb_lines = 48;
+	else sb_lines = 48;
 
-		if( scr_viewsize->value >= 100.0f )
+	if( scr_viewsize->value >= 100.0f )
-		{
-			full = true;
-			size = 100.0f;
-		}
-		else size = scr_viewsize->value;
-
-		if( cl.intermission )
-		{
-			size = 100.0f;
-			sb_lines = 0;
-			full = true;
-		}
-		size /= 100.0f;
-	}
-	else
 	{
 		full = true;
-		sb_lines = 0;
+		size = 100.0f;
-		size = 1.0f;
 	}
+	else size = scr_viewsize->value;
+
+	if( cl.intermission )
+	{
+		size = 100.0f;
+		sb_lines = 0;
+		full = true;
+	}
+	size /= 100.0f;
 
 	clgame.viewport[2] = refState.width * size;
 	clgame.viewport[3] = refState.height * size;
@@ -229,53 +220,6 @@ void V_RefApplyOverview( ref_viewpass_t *rvp )
 	ref.dllFuncs.GL_OrthoBounds( mins, maxs );
 }
 
-/*
-====================
-V_CalcFov
-====================
-*/
-static float V_CalcFov( float *fov_x, float width, float height )
-{
-	float	x, half_fov_y;
-
-	if( *fov_x < 1.0f || *fov_x > 179.0f )
-		*fov_x = 90.0f; // default value
-
-	x = width / tan( DEG2RAD( *fov_x ) * 0.5f );
-	half_fov_y = atan( height / x );
-
-	return RAD2DEG( half_fov_y ) * 2;
-}
-
-/*
-====================
-V_AdjustFov
-====================
-*/
-static void V_AdjustFov( float *fov_x, float *fov_y, float width, float height, qboolean lock_x )
-{
-	float x, y;
-
-	if( width * 3 == 4 * height || width * 4 == height * 5 )
-	{
-		// 4:3 or 5:4 ratio
-		return;
-	}
-
-	if( lock_x )
-	{
-		*fov_y = 2 * atan((width * 3) / (height * 4) * tan( *fov_y * M_PI_F / 360.0f * 0.5f )) * 360 / M_PI_F;
-		return;
-	}
-
-	y = V_CalcFov( fov_x, 640, 480 );
-	x = *fov_x;
-
-	*fov_x = V_CalcFov( &y, height, width );
-	if( *fov_x < x ) *fov_x = x;
-	else *fov_y = y;
-}
-
 /*
 =============
 V_GetRefParams
@@ -333,6 +277,9 @@ qboolean V_PreRender( void )
 	if( !ref.initialized )
 		return false;
 
+	if( host.status == HOST_NOFOCUS )
+		return false;
+
 	if( host.status == HOST_SLEEP )
 		return false;
 

engine/client/client.h

@@ -33,7 +33,6 @@ GNU General Public License for more details.
 #include "net_api.h"
 #include "world.h"
 #include "ref_common.h"
-#include "voice.h"
 
 // client sprite types
 #define SPR_CLIENT		0	// client sprite for temp-entities or user-textures
@@ -108,6 +107,7 @@ extern int CL_UPDATE_BACKUP;
 #define MIN_UPDATERATE	10.0f
 #define MAX_UPDATERATE	102.0f
 
+#define MIN_EX_INTERP	0.005f
 #define MAX_EX_INTERP	0.1f
 
 #define CL_MIN_RESEND_TIME	1.5f		// mininum time gap (in seconds) before a subsequent connection request is sent.
@@ -138,7 +138,7 @@ typedef struct
 	int		light_level;
 	int		waterlevel;
 	int		usehull;
-	qboolean	moving;
+	int		moving;
 	int		pushmsec;
 	int		weapons;
 	float		maxspeed;
@@ -210,7 +210,7 @@ typedef struct
 						// a lerp point for other data
 	double		oldtime;			// previous cl.time, time-oldtime is used
 						// to decay light values and smooth step ups
-	double		timedelta;		// floating delta between two updates
+	float		timedelta;		// floating delta between two updates
 
 	char		serverinfo[MAX_SERVERINFO_STRING];
 	player_info_t	players[MAX_CLIENTS];	// collected info about all other players include himself
@@ -318,46 +318,32 @@ typedef struct
 	pfnEventHook	func;	// user-defined function
 } cl_user_event_t;
 
-#define FONT_FIXED      0
+#define FONT_FIXED		0
-#define FONT_VARIABLE   1
+#define FONT_VARIABLE	1
-
-#define FONT_DRAW_HUD      BIT( 0 ) // pass to drawing function to apply hud_scale
-#define FONT_DRAW_UTF8     BIT( 1 ) // call UtfProcessChar
-#define FONT_DRAW_FORCECOL BIT( 2 ) // ignore colorcodes
-#define FONT_DRAW_NORENDERMODE BIT( 3 ) // ignore font's default rendermode
-#define FONT_DRAW_NOLF     BIT( 4 ) // ignore \n
-#define FONT_DRAW_RESETCOLORONLF BIT( 5 ) // yet another flag to simulate consecutive Con_DrawString calls...
 
 typedef struct
 {
-	int      hFontTexture;    // handle to texture
+	int		hFontTexture;		// handle to texture
-	wrect_t  fontRc[256];     // tex coords
+	wrect_t		fontRc[256];		// rectangles
-	float    scale;           // scale factor
+	byte		charWidths[256];
-	byte     charWidths[256]; // scaled widths
+	int		charHeight;
-	int      charHeight;      // scaled height
+	int		type;
-	int      type;            // fixed width font or variable
+	qboolean		valid;			// all rectangles are valid
-	int      rendermode;      // default rendermode
-	qboolean	nearest;         // nearest filtering enabled
-	qboolean	valid;           // all rectangles are valid
 } cl_font_t;
 
-typedef struct scissor_state_s
-{
-	int x;
-	int y;
-	int width;
-	int height;
-	qboolean test;
-} scissor_state_t;
-
 typedef struct
 {
-	// scissor test
-	scissor_state_t scissor;
-
 	// temp handle
 	const model_t	*pSprite;			// pointer to current SpriteTexture
 
+	// scissor test
+	int		scissor_x;
+	int		scissor_y;
+	int		scissor_width;
+	int		scissor_height;
+	qboolean		scissor_test;
+	qboolean		adjust_size;		// allow to adjust scale for fonts
+
 	int		renderMode;		// override kRenderMode from TriAPI
 	TRICULLSTYLE	cullMode;			// override CULL FACE from TriAPI
 
@@ -384,11 +370,15 @@ typedef struct cl_predicted_player_s
 
 typedef struct
 {
-	// scissor test
-	scissor_state_t scissor;
-
 	int		gl_texturenum;	// this is a real texnum
 
+	// scissor test
+	int		scissor_x;
+	int		scissor_y;
+	int		scissor_width;
+	int		scissor_height;
+	qboolean		scissor_test;
+
 	// holds text color
 	rgba_t		textColor;
 } gameui_draw_t;
@@ -475,7 +465,7 @@ typedef struct
 
 	string		cdtracks[MAX_CDTRACKS];	// 32 cd-tracks read from cdaudio.txt
 
-	model_t		sprites[MAX_CLIENT_SPRITES];	// hud&client spritetexturesz
+	model_t		sprites[MAX_CLIENT_SPRITES];	// client spritetextures
 	int		viewport[4];		// viewport sizes
 
 	client_draw_t	ds;			// draw2d stuff (hud, weaponmenu etc)
@@ -537,6 +527,9 @@ typedef struct
 	float		disable_screen;		// showing loading plaque between levels
 						// or changing rendering dlls
 						// if time gets > 30 seconds ahead, break it
+	int		disable_servercount;	// when we receive a frame and cl.servercount
+						// > cls.disable_servercount, clear disable_screen
+
 	qboolean		draw_changelevel;		// draw changelevel image 'Loading...'
 
 	keydest_t		key_dest;
@@ -632,6 +625,8 @@ typedef struct
 	// legacy mode support
 	qboolean legacymode;				// one-way 48 protocol compatibility
 	netadr_t legacyserver;
+	netadr_t legacyservers[MAX_LEGACY_SERVERS];
+	int	legacyservercount;
 	int extensions;
 
 	netadr_t serveradr;
@@ -681,10 +676,10 @@ extern convar_t	*cl_levelshot_name;
 extern convar_t	*cl_draw_beams;
 extern convar_t	*cl_clockreset;
 extern convar_t	*cl_fixtimerate;
-extern convar_t	*hud_fontscale;
 extern convar_t	*hud_scale;
 extern convar_t	*gl_showtextures;
 extern convar_t	*cl_bmodelinterp;
+extern convar_t	*cl_righthand;
 extern convar_t	*cl_lw;		// local weapons
 extern convar_t	*cl_charset;
 extern convar_t	*cl_trace_messages;
@@ -713,7 +708,7 @@ dlight_t *CL_GetEntityLight( int number );
 //
 // cl_cmds.c
 //
-void CL_Quit_f( void );
+void CL_Quit_f( void ) NORETURN;
 void CL_ScreenShot_f( void );
 void CL_SnapShot_f( void );
 void CL_PlayCDTrack_f( void );
@@ -764,7 +759,6 @@ int CL_IsDevOverviewMode( void );
 void CL_PingServers_f( void );
 void CL_SignonReply( void );
 void CL_ClearState( void );
-size_t CL_BuildMasterServerScanRequest( char *buf, size_t size, qboolean nat );
 
 //
 // cl_demo.c
@@ -806,20 +800,6 @@ void CL_ResetEvent( event_info_t *ei );
 word CL_EventIndex( const char *name );
 void CL_FireEvents( void );
 
-//
-// cl_font.c
-//
-qboolean CL_FixedFont( cl_font_t *font );
-qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float scale, int rendermode, uint texFlags );
-qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font, float scale, int rendermode, uint texFlags );
-void CL_FreeFont( cl_font_t *font );
-int CL_DrawCharacter( float x, float y, int number, rgba_t color, cl_font_t *font, int flags );
-int CL_DrawString( float x, float y, const char *s, rgba_t color, cl_font_t *font, int flags );
-void CL_DrawCharacterLen( cl_font_t *font, int number, int *width, int *height );
-void CL_DrawStringLen( cl_font_t *font, const char *s, int *width, int *height, int flags );
-int CL_DrawStringf( cl_font_t *font, float x, float y, rgba_t color, int flags, const char *fmt, ... ) _format( 6 );
-
-
 //
 // cl_game.c
 //
@@ -835,6 +815,7 @@ void CL_FreeEdicts( void );
 void CL_ClearWorld( void );
 void CL_DrawCenterPrint( void );
 void CL_ClearSpriteTextures( void );
+void CL_FreeEntity( cl_entity_t *pEdict );
 void CL_CenterPrint( const char *text, float y );
 void CL_TextMessageParse( byte *pMemFile, int fileSize );
 client_textmessage_t *CL_TextMessageGet( const char *pName );
@@ -848,15 +829,11 @@ model_t *CL_LoadClientSprite( const char *filename );
 model_t *CL_LoadModel( const char *modelname, int *index );
 HSPRITE EXPORT pfnSPR_Load( const char *szPicName );
 HSPRITE pfnSPR_LoadExt( const char *szPicName, uint texFlags );
-void SPR_AdjustSize( float *x, float *y, float *w, float *h );
+void PicAdjustSize( float *x, float *y, float *w, float *h );
-void SPR_AdjustTexCoords( float width, float height, float *s1, float *t1, float *s2, float *t2 );
 int CL_GetScreenInfo( SCREENINFO *pscrinfo );
 void CL_FillRGBA( int x, int y, int width, int height, int r, int g, int b, int a );
 void CL_PlayerTrace( float *start, float *end, int traceFlags, int ignore_pe, pmtrace_t *tr );
 void CL_PlayerTraceExt( float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ), pmtrace_t *tr );
-pmtrace_t *PM_CL_TraceLine( float *start, float *end, int flags, int usehull, int ignore_pe );
-const char *PM_CL_TraceTexture( int ground, float *vstart, float *vend );
-int PM_CL_PointContents( const float *p, int *truecontents );
 void CL_SetTraceHull( int hull );
 void CL_GetMousePosition( int *mx, int *my ); // TODO: move to input
 cl_entity_t* CL_GetViewModel( void );
@@ -864,9 +841,6 @@ void pfnGetScreenFade( struct screenfade_s *fade );
 physent_t *pfnGetPhysent( int idx );
 struct msurface_s *pfnTraceSurface( int ground, float *vstart, float *vend );
 movevars_t *pfnGetMoveVars( void );
-void CL_EnableScissor( scissor_state_t *scissor, int x, int y, int width, int height );
-void CL_DisableScissor( scissor_state_t *scissor );
-qboolean CL_Scissor( const scissor_state_t *scissor, float *x, float *y, float *width, float *height, float *u0, float *v0, float *u1, float *v1 );
 
 _inline cl_entity_t *CL_EDICT_NUM( int n )
 {
@@ -891,6 +865,7 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg, qboolean normal_message );
 void CL_LegacyPrecache_f( void );
 
 void CL_ParseTempEntity( sizebuf_t *msg );
+void CL_StartResourceDownloading( const char *pszMessage, qboolean bCustom );
 qboolean CL_DispatchUserMessage( const char *pszName, int iSize, void *pbuf );
 qboolean CL_RequestMissingResources( void );
 void CL_RegisterResources ( sizebuf_t *msg );
@@ -941,8 +916,10 @@ void CL_PredictMovement( qboolean repredicting );
 void CL_CheckPredictionError( void );
 qboolean CL_IsPredicted( void );
 int CL_TruePointContents( const vec3_t p );
+int CL_PointContents( const vec3_t p );
 int CL_WaterEntity( const float *rgflPos );
 cl_entity_t *CL_GetWaterEntity( const float *rgflPos );
+void CL_SetupPMove( playermove_t *pmove, local_state_t *from, usercmd_t *ucmd, qboolean runfuncs, double time );
 int CL_TestLine( const vec3_t start, const vec3_t end, int flags );
 pmtrace_t *CL_VisTraceLine( vec3_t start, vec3_t end, int flags );
 pmtrace_t CL_TraceLine( vec3_t start, vec3_t end, int flags );
@@ -951,6 +928,7 @@ void CL_PopTraceBounds( void );
 void CL_MoveSpectatorCamera( void );
 void CL_SetLastUpdate( void );
 void CL_RedoPrediction( void );
+void CL_ClearPhysEnts( void );
 void CL_PushPMStates( void );
 void CL_PopPMStates( void );
 void CL_SetUpPlayerPrediction( int dopred, int bIncludeLocalClient );
@@ -991,7 +969,7 @@ void CL_ClearAllRemaps( void );
 // cl_render.c
 //
 qboolean R_InitRenderAPI( void );
-intptr_t CL_RenderGetParm( const int parm, const int arg, const qboolean checkRef );
+int CL_RenderGetParm( const int parm, const int arg, const qboolean checkRef );
 lightstyle_t *CL_GetLightStyle( int number );
 int R_FatPVS( const vec3_t org, float radius, byte *visbuffer, qboolean merge, qboolean fullvis );
 const ref_overview_t *GL_GetOverviewParms( void );
@@ -1001,6 +979,7 @@ const ref_overview_t *GL_GetOverviewParms( void );
 //
 void R_StoreEfrags( efrag_t **ppefrag, int framecount );
 void R_AddEfrags( cl_entity_t *ent );
+void R_RemoveEfrags( cl_entity_t *ent );
 //
 // cl_tent.c
 //
@@ -1054,13 +1033,13 @@ int Con_UtfProcessChar( int in );
 int Con_UtfProcessCharForce( int in );
 int Con_UtfMoveLeft( char *str, int pos );
 int Con_UtfMoveRight( char *str, int pos, int length );
+void Con_DrawStringLen( const char *pText, int *length, int *height );
+int Con_DrawString( int x, int y, const char *string, rgba_t setColor );
+int Con_DrawCharacter( int x, int y, int number, rgba_t color );
+void Con_DrawCharacterLen( int number, int *width, int *height );
 void Con_DefaultColor( int r, int g, int b );
 void Con_InvalidateFonts( void );
-cl_font_t *Con_GetCurFont( void );
+void Con_SetFont( int fontNum );
-cl_font_t *Con_GetFont( int num );
-void Con_DrawCharacterLen( int number, int *width, int *height );
-int Con_DrawString( int x, int y, const char *string, rgba_t setColor ); // legacy, use cl_font.c
-void GAME_EXPORT Con_DrawStringLen( const char *pText, int *length, int *height ); // legacy, use cl_font.c
 void Con_CharEvent( int key );
 void Con_RestoreFont( void );
 void Key_Console( int key );
@@ -1070,6 +1049,7 @@ void Con_Bottom( void );
 void Con_Top( void );
 void Con_PageDown( int lines );
 void Con_PageUp( int lines );
+void Con_LoadHistory( void );
 
 //
 // s_main.c
@@ -1133,11 +1113,6 @@ void pfnPIC_DrawAdditive( int x, int y, int width, int height, const wrect_t *pr
 qboolean Mobile_Init( void );
 void Mobile_Shutdown( void );
 
-//
-// cl_securedstub.c
-//
-void CL_GetSecuredClientAPI( CL_EXPORT_FUNCS F );
-
 //
 // cl_video.c
 //
@@ -1155,6 +1130,7 @@ void CL_PlayVideo_f( void );
 // keys.c
 //
 int Key_IsDown( int keynum );
+const char *Key_IsBind( int keynum );
 void Key_Event( int key, int down );
 void Key_Init( void );
 void Key_WriteBindings( file_t *f );

engine/client/in_joy.c

@@ -44,7 +44,6 @@ static struct joy_axis_s
 	short prevval;
 } joyaxis[MAX_AXES] = { 0 };
 static byte currentbinding; // add posibility to remap keys, to place it in joykeys[]
-static qboolean joy_initialized;
 convar_t *joy_enable;
 static convar_t *joy_pitch;
 static convar_t *joy_yaw;
@@ -245,7 +244,7 @@ void Joy_AxisMotionEvent( byte axis, short value )
 		return;
 	}
 
-	Joy_KnownAxisMotionEvent( joyaxesmap[axis], value );
+	return Joy_KnownAxisMotionEvent( joyaxesmap[axis], value );
 }
 
 void Joy_KnownAxisMotionEvent( engineAxis_t engineAxis, short value )
@@ -381,44 +380,40 @@ Main init procedure
 */
 void Joy_Init( void )
 {
-	joy_pitch   = Cvar_Get( "joy_pitch",   "100.0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "joystick pitch sensitivity" );
+	joy_pitch   = Cvar_Get( "joy_pitch",   "100.0", FCVAR_ARCHIVE, "joystick pitch sensitivity" );
-	joy_yaw     = Cvar_Get( "joy_yaw",     "100.0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "joystick yaw sensitivity" );
+	joy_yaw     = Cvar_Get( "joy_yaw",     "100.0", FCVAR_ARCHIVE, "joystick yaw sensitivity" );
-	joy_side    = Cvar_Get( "joy_side",    "1.0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "joystick side sensitivity. Values from -1.0 to 1.0" );
+	joy_side    = Cvar_Get( "joy_side",    "1.0", FCVAR_ARCHIVE, "joystick side sensitivity. Values from -1.0 to 1.0" );
-	joy_forward = Cvar_Get( "joy_forward", "1.0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "joystick forward sensitivity. Values from -1.0 to 1.0" );
+	joy_forward = Cvar_Get( "joy_forward", "1.0", FCVAR_ARCHIVE, "joystick forward sensitivity. Values from -1.0 to 1.0" );
 
-	joy_lt_threshold = Cvar_Get( "joy_lt_threshold", "16384", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "left trigger threshold. Value from 0 to 32767");
+	joy_lt_threshold = Cvar_Get( "joy_lt_threshold", "16384", FCVAR_ARCHIVE, "left trigger threshold. Value from 0 to 32767");
-	joy_rt_threshold = Cvar_Get( "joy_rt_threshold", "16384", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "right trigger threshold. Value from 0 to 32767" );
+	joy_rt_threshold = Cvar_Get( "joy_rt_threshold", "16384", FCVAR_ARCHIVE, "right trigger threshold. Value from 0 to 32767" );
 
 	// emit a key event at 75% axis move
-	joy_side_key_threshold = Cvar_Get( "joy_side_key_threshold", "24576", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "side axis key event emit threshold. Value from 0 to 32767" );
+	joy_side_key_threshold = Cvar_Get( "joy_side_key_threshold", "24576", FCVAR_ARCHIVE, "side axis key event emit threshold. Value from 0 to 32767" );
-	joy_forward_key_threshold = Cvar_Get( "joy_forward_key_threshold", "24576", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "forward axis key event emit threshold. Value from 0 to 32767");
+	joy_forward_key_threshold = Cvar_Get( "joy_forward_key_threshold", "24576", FCVAR_ARCHIVE, "forward axis key event emit threshold. Value from 0 to 32767");
 
 	// by default, we rely on deadzone detection come from system, but some glitchy devices report false deadzones
-	joy_side_deadzone = Cvar_Get( "joy_side_deadzone", DEFAULT_JOY_DEADZONE, FCVAR_ARCHIVE | FCVAR_FILTERABLE, "side axis deadzone. Value from 0 to 32767" );
+	joy_side_deadzone = Cvar_Get( "joy_side_deadzone", "0", FCVAR_ARCHIVE, "side axis deadzone. Value from 0 to 32767" );
-	joy_forward_deadzone = Cvar_Get( "joy_forward_deadzone", DEFAULT_JOY_DEADZONE, FCVAR_ARCHIVE | FCVAR_FILTERABLE, "forward axis deadzone. Value from 0 to 32767");
+	joy_forward_deadzone = Cvar_Get( "joy_forward_deadzone", "0", FCVAR_ARCHIVE, "forward axis deadzone. Value from 0 to 32767");
-	joy_pitch_deadzone = Cvar_Get( "joy_pitch_deadzone", DEFAULT_JOY_DEADZONE, FCVAR_ARCHIVE | FCVAR_FILTERABLE, "pitch axis deadzone. Value from 0 to 32767");
+	joy_pitch_deadzone = Cvar_Get( "joy_pitch_deadzone", "0", FCVAR_ARCHIVE, "pitch axis deadzone. Value from 0 to 32767");
-	joy_yaw_deadzone = Cvar_Get( "joy_yaw_deadzone", DEFAULT_JOY_DEADZONE, FCVAR_ARCHIVE | FCVAR_FILTERABLE, "yaw axis deadzone. Value from 0 to 32767" );
+	joy_yaw_deadzone = Cvar_Get( "joy_yaw_deadzone", "0", FCVAR_ARCHIVE, "yaw axis deadzone. Value from 0 to 32767" );
 
-	joy_axis_binding = Cvar_Get( "joy_axis_binding", "sfpyrl", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "axis hardware id to engine inner axis binding, "
+	joy_axis_binding = Cvar_Get( "joy_axis_binding", "sfpyrl", FCVAR_ARCHIVE, "axis hardware id to engine inner axis binding, "
 		"s - side, f - forward, y - yaw, p - pitch, r - left trigger, l - right trigger" );
 	joy_found   = Cvar_Get( "joy_found", "0", FCVAR_READ_ONLY, "is joystick is connected" );
 	// we doesn't loaded config.cfg yet, so this cvar is not archive.
 	// change by +set joy_index in cmdline
 	joy_index   = Cvar_Get( "joy_index", "0", FCVAR_READ_ONLY, "current active joystick" );
 
-	joy_enable = Cvar_Get( "joy_enable", "1", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "enable joystick" );
+	joy_enable = Cvar_Get( "joy_enable", "1", FCVAR_ARCHIVE, "enable joystick" );
 
-	// renamed from -nojoy to -noenginejoy to not conflict with
+	if( Sys_CheckParm( "-nojoy" ))
-	// client.dll's joystick support
-	if( Sys_CheckParm( "-noenginejoy" ))
 	{
 		Cvar_FullSet( "joy_enable", "0", FCVAR_READ_ONLY );
 		return;
 	}
 
 	Cvar_FullSet( "joy_found", va( "%d", Platform_JoyInit( joy_index->value )), FCVAR_READ_ONLY );
-
-	joy_initialized = true;
 }
 
 /*
@@ -430,8 +425,5 @@ Shutdown joystick code
 */
 void Joy_Shutdown( void )
 {
-	if( joy_initialized )
+	Cvar_FullSet( "joy_found", 0, FCVAR_READ_ONLY );
-	{
-		Cvar_FullSet( "joy_found", 0, FCVAR_READ_ONLY );
-	}
 }

engine/client/input.c

@@ -18,7 +18,7 @@ GNU General Public License for more details.
 #include "client.h"
 #include "vgui_draw.h"
 
-#if XASH_SDL
+#ifdef XASH_SDL
 #include <SDL.h>
 #endif
 
@@ -30,16 +30,17 @@ qboolean	in_mouseinitialized;
 qboolean	in_mouse_suspended;
 POINT		in_lastvalidpos;
 qboolean	in_mouse_savedpos;
-static int in_mstate = 0;
 static struct inputstate_s
 {
 	float lastpitch, lastyaw;
 } inputstate;
 
 extern convar_t *vid_fullscreen;
+convar_t *m_enginemouse;
 convar_t *m_pitch;
 convar_t *m_yaw;
 
+convar_t *m_enginesens;
 convar_t *m_ignore;
 convar_t *cl_forwardspeed;
 convar_t *cl_sidespeed;
@@ -61,7 +62,7 @@ uint IN_CollectInputDevices( void )
 	if( !m_ignore->value ) // no way to check is mouse connected, so use cvar only
 		ret |= INPUT_DEVICE_MOUSE;
 
-	if( touch_enable.value )
+	if( CVAR_TO_BOOL(touch_enable) )
 		ret |= INPUT_DEVICE_TOUCH;
 
 	if( Joy_IsActive() ) // connected or enabled
@@ -92,13 +93,13 @@ void IN_LockInputDevices( qboolean lock )
 	{
 		SetBits( m_ignore->flags, FCVAR_READ_ONLY );
 		SetBits( joy_enable->flags, FCVAR_READ_ONLY );
-		SetBits( touch_enable.flags, FCVAR_READ_ONLY );
+		SetBits( touch_enable->flags, FCVAR_READ_ONLY );
 	}
 	else
 	{
 		ClearBits( m_ignore->flags, FCVAR_READ_ONLY );
 		ClearBits( joy_enable->flags, FCVAR_READ_ONLY );
-		ClearBits( touch_enable.flags, FCVAR_READ_ONLY );
+		ClearBits( touch_enable->flags, FCVAR_READ_ONLY );
 	}
 }
 
@@ -110,12 +111,14 @@ IN_StartupMouse
 */
 void IN_StartupMouse( void )
 {
-	m_ignore = Cvar_Get( "m_ignore", DEFAULT_M_IGNORE, FCVAR_ARCHIVE | FCVAR_FILTERABLE, "ignore mouse events" );
+	m_ignore = Cvar_Get( "m_ignore", DEFAULT_M_IGNORE, FCVAR_ARCHIVE , "ignore mouse events" );
 
-	m_pitch = Cvar_Get( "m_pitch", "0.022", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "mouse pitch value" );
+	m_enginemouse = Cvar_Get( "m_enginemouse", "0", FCVAR_ARCHIVE, "read mouse events in engine instead of client" );
-	m_yaw = Cvar_Get( "m_yaw", "0.022", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "mouse yaw value" );
+	m_enginesens = Cvar_Get( "m_enginesens", "0.3", FCVAR_ARCHIVE, "mouse sensitivity, when m_enginemouse enabled" );
-	look_filter = Cvar_Get( "look_filter", "0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "filter look events making it smoother" );
+	m_pitch = Cvar_Get( "m_pitch", "0.022", FCVAR_ARCHIVE, "mouse pitch value" );
-	m_rawinput = Cvar_Get( "m_rawinput", "1", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "enable mouse raw input" );
+	m_yaw = Cvar_Get( "m_yaw", "0.022", FCVAR_ARCHIVE, "mouse yaw value" );
+	look_filter = Cvar_Get( "look_filter", "0", FCVAR_ARCHIVE, "filter look events making it smoother" );
+	m_rawinput = Cvar_Get( "m_rawinput", "1", FCVAR_ARCHIVE, "enable mouse raw input" );
 
 	// You can use -nomouse argument to prevent using mouse from client
 	// -noenginemouse will disable all mouse input
@@ -124,9 +127,21 @@ void IN_StartupMouse( void )
 	in_mouseinitialized = true;
 }
 
+static void IN_ActivateCursor( void )
+{
+	if( cls.key_dest == key_menu )
+	{
+#ifdef XASH_SDL
+		SDL_SetCursor( in_mousecursor );
+#endif
+	}
+}
+
 void GAME_EXPORT IN_SetCursor( void *hCursor )
 {
-	// stub
+	in_mousecursor = hCursor;
+
+	IN_ActivateCursor();
 }
 
 /*
@@ -171,103 +186,67 @@ Called when key_dest is changed
 */
 void IN_ToggleClientMouse( int newstate, int oldstate )
 {
-	if( newstate == oldstate )
+	if( newstate == oldstate ) return;
-		return;
 
-	// since SetCursorType controls cursor visibility
+	if( oldstate == key_game )
-	// execute it first, and then check mouse grab state
-	if( newstate == key_menu || newstate == key_console )
 	{
-		Platform_SetCursorType( dc_arrow );
+		if( cls.initialized )
+			clgame.dllFuncs.IN_DeactivateMouse();
+	}
+	else if( newstate == key_game )
+	{
+		// reset mouse pos, so cancel effect in game
+#if SDL_VERSION_ATLEAST( 2, 0, 0 )
+		if( CVAR_TO_BOOL( touch_enable ) )
+		{
+			SDL_SetRelativeMouseMode( SDL_FALSE );
+			SDL_SetWindowGrab( host.hWnd, SDL_FALSE );
+		}
+		else
+#endif
+		{
+			Platform_SetMousePos( host.window_center_x, host.window_center_y );
+#if XASH_SDL
+			SDL_SetWindowGrab( host.hWnd, SDL_TRUE );
+#if SDL_VERSION_ATLEAST( 2, 0, 0 )
+			if ( clgame.dllFuncs.pfnLookEvent || ( clgame.client_dll_uses_sdl && CVAR_TO_BOOL( m_rawinput ) ) )
+			{
+				SDL_SetRelativeMouseMode( SDL_TRUE );
+			}
+#endif
+#endif // XASH_SDL
+		}
+		if( cls.initialized )
+			clgame.dllFuncs.IN_ActivateMouse();
+	}
 
+	if( ( newstate == key_menu  || newstate == key_console || newstate == key_message ) && ( !CL_IsBackgroundMap() || CL_IsBackgroundDemo( )))
+	{
+#ifdef XASH_SDL
+		SDL_SetWindowGrab(host.hWnd, SDL_FALSE);
+#if SDL_VERSION_ATLEAST( 2, 0, 0 )
+		if ( clgame.dllFuncs.pfnLookEvent || ( clgame.client_dll_uses_sdl && CVAR_TO_BOOL( m_rawinput ) ) )
+		{
+			SDL_SetRelativeMouseMode( SDL_FALSE );
+		}
+#endif
+#endif // XASH_SDL
 #if XASH_ANDROID
 		Android_ShowMouse( true );
 #endif
-#if XASH_USE_EVDEV
+#ifdef XASH_USE_EVDEV
 		Evdev_SetGrab( false );
 #endif
 	}
 	else
 	{
-		Platform_SetCursorType( dc_none );
-
 #if XASH_ANDROID
 		Android_ShowMouse( false );
 #endif
-#if XASH_USE_EVDEV
+#ifdef XASH_USE_EVDEV
 		Evdev_SetGrab( true );
 #endif
 	}
-
-	if( oldstate == key_game )
-	{
-		IN_DeactivateMouse();
-	}
-	else if( newstate == key_game )
-	{
-		IN_ActivateMouse();
-	}
-}
-
-void IN_CheckMouseState( qboolean active )
-{
-	static qboolean s_bRawInput, s_bMouseGrab;
-
-#if XASH_WIN32
-	qboolean useRawInput = ( CVAR_TO_BOOL( m_rawinput ) && clgame.client_dll_uses_sdl ) || clgame.dllFuncs.pfnLookEvent != NULL;
-#else
-	qboolean useRawInput = true; // always use SDL code
-#endif
-
-	if( active && useRawInput && !host.mouse_visible && cls.state == ca_active )
-	{
-		if( !s_bRawInput )
-		{
-#if XASH_SDL == 2
-			SDL_GetRelativeMouseState( NULL, NULL );
-			SDL_SetRelativeMouseMode( SDL_TRUE );
-#endif
-
-			// Con_Printf( "Enable relative mode\n" );
-			s_bRawInput = true;
-		}
-	}
-	else
-	{
-		if( s_bRawInput )
-		{
-#if XASH_SDL == 2
-			SDL_GetRelativeMouseState( NULL, NULL );
-			SDL_SetRelativeMouseMode( SDL_FALSE );
-#endif
-			// Con_Printf( "Disable relative mode\n" );
-			s_bRawInput = false;
-		}
-	}
-
-	if( active && !host.mouse_visible && cls.state == ca_active )
-	{
-		if( !s_bMouseGrab )
-		{
-#if XASH_SDL
-			SDL_SetWindowGrab( host.hWnd, SDL_TRUE );
-#endif
-			// Con_Printf( "Enable grab\n" );
-			s_bMouseGrab = true;
-		}
-	}
-	else
-	{
-		if( s_bMouseGrab )
-		{
-#if XASH_SDL
-			SDL_SetWindowGrab( host.hWnd, SDL_FALSE );
-#endif
-
-			// Con_Printf( "Disable grab\n" );
-			s_bMouseGrab = false;
-		}
-	}
 }
 
 /*
@@ -277,15 +256,58 @@ IN_ActivateMouse
 Called when the window gains focus or changes in some way
 ===========
 */
-void IN_ActivateMouse( void )
+void IN_ActivateMouse( qboolean force )
 {
+	int		width, height;
+	static int	oldstate;
+
 	if( !in_mouseinitialized )
 		return;
 
-	IN_CheckMouseState( true );
+	if( CL_Active() && host.mouse_visible && !force )
-	if( clgame.dllFuncs.IN_ActivateMouse )
+		return;	// VGUI controls
-		clgame.dllFuncs.IN_ActivateMouse();
+
+	if( cls.key_dest == key_menu && !Cvar_VariableInteger( "fullscreen" ))
+	{
+		// check for mouse leave-entering
+		if( !in_mouse_suspended && !UI_MouseInRect( ))
+			in_mouse_suspended = true;
+
+		if( oldstate != in_mouse_suspended )
+		{
+			if( in_mouse_suspended )
+			{
+#ifdef XASH_SDL
+				/// TODO: Platform_ShowCursor
+				if( !touch_emulate )
+					SDL_ShowCursor( SDL_FALSE );
+#endif
+				UI_ShowCursor( false );
+			}
+		}
+
+		oldstate = in_mouse_suspended;
+
+		if( in_mouse_suspended )
+		{
+			in_mouse_suspended = false;
+			in_mouseactive = false; // re-initialize mouse
+			UI_ShowCursor( true );
+		}
+	}
+
+	if( in_mouseactive ) return;
 	in_mouseactive = true;
+
+	if( UI_IsVisible( )) return;
+
+	if( cls.key_dest == key_game )
+	{
+		clgame.dllFuncs.IN_ActivateMouse();
+#ifdef XASH_SDL
+		SDL_GetRelativeMouseState( 0, 0 ); // Reset mouse position
+#endif
+	}
 }
 
 /*
@@ -297,17 +319,20 @@ Called when the window loses focus
 */
 void IN_DeactivateMouse( void )
 {
-	if( !in_mouseinitialized )
+	if( !in_mouseinitialized || !in_mouseactive )
 		return;
 
-	IN_CheckMouseState( false );
+	if( cls.key_dest == key_game )
-	if( clgame.dllFuncs.IN_DeactivateMouse )
+	{
 		clgame.dllFuncs.IN_DeactivateMouse();
+	}
+
 	in_mouseactive = false;
+#ifdef XASH_SDL
+	SDL_SetWindowGrab( host.hWnd, SDL_FALSE );
+#endif // XASH_SDL
 }
 
-
-
 /*
 ================
 IN_MouseMove
@@ -315,25 +340,27 @@ IN_MouseMove
 */
 void IN_MouseMove( void )
 {
-	int x, y;
+	POINT	current_pos;
 
-	if( !in_mouseinitialized )
+	if( !in_mouseinitialized || !in_mouseactive || !UI_IsVisible( ))
 		return;
 
-	if( touch_emulate.value )
-	{
-		// touch emulation overrides all input
-		Touch_KeyEvent( 0, 0 );
-		return;
-	}
-
 	// find mouse movement
-	Platform_GetMousePos( &x, &y );
+	Platform_GetMousePos( &current_pos.x, &current_pos.y );
 
-	VGui_MouseMove( x, y );
+	VGui_MouseMove( current_pos.x, current_pos.y );
+
+	// HACKHACK: show cursor in UI, as mainui doesn't call
+	// platform-dependent SetCursor anymore
+#ifdef XASH_SDL
+	if( UI_IsVisible() )
+		SDL_ShowCursor( SDL_TRUE );
+#endif
 
 	// if the menu is visible, move the menu cursor
-	UI_MouseMove( x, y );
+	UI_MouseMove( current_pos.x, current_pos.y );
+
+	IN_ActivateCursor();
 }
 
 /*
@@ -341,55 +368,76 @@ void IN_MouseMove( void )
 IN_MouseEvent
 ===========
 */
-void IN_MouseEvent( int key, int down )
+void IN_MouseEvent( void )
 {
-	if( !in_mouseinitialized )
+	int	i;
+
+	// touch emu: handle motion
+	if( CVAR_TO_BOOL( touch_emulate ))
+	{
+		if( Key_IsDown( K_SHIFT ) )
+			Touch_KeyEvent( K_MOUSE2, 2 );
+		else
+			Touch_KeyEvent( K_MOUSE1, 2 );
+	}
+
+	if( !in_mouseinitialized || !in_mouseactive )
 		return;
 
-	if( down )
-		SetBits( in_mstate, BIT( key ));
-	else ClearBits( in_mstate, BIT( key ));
 
-	// touch emulation overrides all input
+	if( m_ignore->value )
-	if( touch_emulate.value )
+		return;
-	{
-		Touch_KeyEvent( K_MOUSE1 + key, down );
-	}
-	else if( cls.key_dest == key_game )
-	{
-		// perform button actions
-		VGui_MouseEvent( K_MOUSE1 + key, down );
 
-		// don't do Key_Event here
+	if( cls.key_dest == key_game )
-		// client may override IN_MouseEvent
+	{
-		// but by default it calls back to Key_Event anyway
+#if defined( XASH_SDL )
-		if( in_mouseactive )
+		static qboolean ignore; // igonre mouse warp event
-			clgame.dllFuncs.IN_MouseEvent( in_mstate );
+		int x, y;
+		Platform_GetMousePos(&x, &y);
+		if( host.mouse_visible )
+			SDL_ShowCursor( SDL_TRUE );
+		else if( !CVAR_TO_BOOL( touch_emulate ) )
+			SDL_ShowCursor( SDL_FALSE );
+
+		if( x < host.window_center_x / 2 ||
+			y < host.window_center_y / 2 ||
+			x > host.window_center_x + host.window_center_x / 2 ||
+			y > host.window_center_y + host.window_center_y / 2 )
+		{
+			Platform_SetMousePos( host.window_center_x, host.window_center_y );
+			ignore = 1; // next mouse event will be mouse warp
+			return;
+		}
+
+		if ( !ignore )
+		{
+			if( !m_enginemouse->value )
+			{
+				// a1ba: mouse keys are now separated
+				// so pass 0 here
+				clgame.dllFuncs.IN_MouseEvent( 0 );
+			}
+		}
+		else
+		{
+			SDL_GetRelativeMouseState( 0, 0 ); // reset relative state
+			ignore = 0;
+		}
+#endif
+		return;
 	}
 	else
 	{
-		// perform button actions
+#if XASH_SDL && !XASH_WIN32
-		Key_Event( K_MOUSE1 + key, down );
+#if SDL_VERSION_ATLEAST( 2, 0, 0 )
+		SDL_SetRelativeMouseMode( SDL_FALSE );
+#endif // SDL_VERSION_ATLEAST( 2, 0, 0 )
+		SDL_ShowCursor( SDL_TRUE );
+#endif // XASH_SDL && !XASH_WIN32
+		IN_MouseMove();
 	}
 }
 
-/*
-==============
-IN_MWheelEvent
-
-direction is negative for wheel down, otherwise wheel up
-==============
-*/
-void IN_MWheelEvent( int y )
-{
-	int b = y > 0 ? K_MWHEELUP : K_MWHEELDOWN;
-
-	VGui_MWheelEvent( y );
-
-	Key_Event( b, true );
-	Key_Event( b, false );
-}
-
 /*
 ===========
 IN_Shutdown
@@ -399,7 +447,7 @@ void IN_Shutdown( void )
 {
 	IN_DeactivateMouse( );
 
-#if XASH_USE_EVDEV
+#ifdef XASH_USE_EVDEV
 	Evdev_Shutdown();
 #endif
 
@@ -414,9 +462,9 @@ IN_Init
 */
 void IN_Init( void )
 {
-	cl_forwardspeed	= Cvar_Get( "cl_forwardspeed", "400", FCVAR_ARCHIVE | FCVAR_CLIENTDLL | FCVAR_FILTERABLE, "Default forward move speed" );
+	cl_forwardspeed	= Cvar_Get( "cl_forwardspeed", "400", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Default forward move speed" );
-	cl_backspeed	= Cvar_Get( "cl_backspeed", "400", FCVAR_ARCHIVE | FCVAR_CLIENTDLL | FCVAR_FILTERABLE, "Default back move speed"  );
+	cl_backspeed	= Cvar_Get( "cl_backspeed", "400", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Default back move speed"  );
-	cl_sidespeed	= Cvar_Get( "cl_sidespeed", "400", FCVAR_ARCHIVE | FCVAR_CLIENTDLL | FCVAR_FILTERABLE, "Default side move speed"  );
+	cl_sidespeed	= Cvar_Get( "cl_sidespeed", "400", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Default side move speed"  );
 
 	if( !Host_IsDedicated() )
 	{
@@ -426,7 +474,7 @@ void IN_Init( void )
 
 		Touch_Init();
 
-#if XASH_USE_EVDEV
+#ifdef XASH_USE_EVDEV
 		Evdev_Init();
 #endif
 	}
@@ -523,16 +571,20 @@ static void IN_JoyAppendMove( usercmd_t *cmd, float forwardmove, float sidemove
 	}
 }
 
-static void IN_CollectInput( float *forward, float *side, float *pitch, float *yaw, qboolean includeMouse )
+void IN_CollectInput( float *forward, float *side, float *pitch, float *yaw, qboolean includeMouse, qboolean includeSdlMouse )
 {
-	if( includeMouse )
+	if( includeMouse
+#if XASH_SDL
+		&& includeSdlMouse
+#endif
+		)
 	{
 		float x, y;
 		Platform_MouseMove( &x, &y );
 		*pitch += y * m_pitch->value;
 		*yaw   -= x * m_yaw->value;
 
-#if XASH_USE_EVDEV
+#ifdef XASH_USE_EVDEV
 		IN_EvdevMove( yaw, pitch );
 #endif
 	}
@@ -574,7 +626,7 @@ void IN_EngineAppendMove( float frametime, void *cmd1, qboolean active )
 	{
 		float sensitivity = 1;//( (float)cl.local.scr_fov / (float)90.0f );
 
-		IN_CollectInput( &forward, &side, &pitch, &yaw, false );
+		IN_CollectInput( &forward, &side, &pitch, &yaw, in_mouseinitialized && !CVAR_TO_BOOL( m_ignore ), m_enginemouse->value );
 
 		IN_JoyAppendMove( cmd, forward, side );
 
@@ -583,36 +635,11 @@ void IN_EngineAppendMove( float frametime, void *cmd1, qboolean active )
 			cmd->viewangles[YAW]   += yaw * sensitivity;
 			cmd->viewangles[PITCH] += pitch * sensitivity;
 			cmd->viewangles[PITCH] = bound( -90, cmd->viewangles[PITCH], 90 );
-			VectorCopy( cmd->viewangles, cl.viewangles );
+			VectorCopy(cmd->viewangles, cl.viewangles);
 		}
 	}
 }
 
-void IN_Commands( void )
-{
-#if XASH_USE_EVDEV
-	IN_EvdevFrame();
-#endif
-
-	if( clgame.dllFuncs.pfnLookEvent )
-	{
-		float forward = 0, side = 0, pitch = 0, yaw = 0;
-
-		IN_CollectInput( &forward, &side, &pitch, &yaw, in_mouseinitialized && !CVAR_TO_BOOL( m_ignore ) );
-
-		if( cls.key_dest == key_game )
-		{
-			clgame.dllFuncs.pfnLookEvent( yaw, pitch );
-			clgame.dllFuncs.pfnMoveEvent( forward, side );
-		}
-	}
-
-	if( !in_mouseinitialized )
-		return;
-
-	IN_CheckMouseState( in_mouseactive );
-}
-
 /*
 ==================
 Host_InputFrame
@@ -622,9 +649,45 @@ Called every frame, even if not generating commands
 */
 void Host_InputFrame( void )
 {
+	qboolean	shutdownMouse = false;
+	float forward = 0, side = 0, pitch = 0, yaw = 0;
+
 	Sys_SendKeyEvents ();
 
-	IN_Commands();
+#ifdef XASH_USE_EVDEV
+	IN_EvdevFrame();
+#endif
 
+	if( clgame.dllFuncs.pfnLookEvent )
+	{
+		IN_CollectInput( &forward, &side, &pitch, &yaw, in_mouseinitialized && !CVAR_TO_BOOL( m_ignore ), true );
+
+		if( cls.key_dest == key_game )
+		{
+			clgame.dllFuncs.pfnLookEvent( yaw, pitch );
+			clgame.dllFuncs.pfnMoveEvent( forward, side );
+		}
+	}
+
+	if( !in_mouseinitialized )
+		return;
+
+	if( host.status != HOST_FRAME )
+	{
+		IN_DeactivateMouse();
+		return;
+	}
+
+	// release mouse during pause or console typeing
+	if( cl.paused && cls.key_dest == key_game )
+		shutdownMouse = true;
+
+	if( shutdownMouse && !Cvar_VariableInteger( "fullscreen" ))
+	{
+		IN_DeactivateMouse();
+		return;
+	}
+
+	IN_ActivateMouse( false );
 	IN_MouseMove();
 }

engine/client/input.h

@@ -33,9 +33,8 @@ extern qboolean	in_mouseinitialized;
 void IN_Init( void );
 void Host_InputFrame( void );
 void IN_Shutdown( void );
-void IN_MouseEvent( int key, int down );
+void IN_MouseEvent( void );
-void IN_MWheelEvent( int direction );
+void IN_ActivateMouse( qboolean force );
-void IN_ActivateMouse( void );
 void IN_DeactivateMouse( void );
 void IN_MouseSavePos( void );
 void IN_MouseRestorePos( void );
@@ -58,13 +57,16 @@ typedef enum
 	event_motion
 } touchEventType;
 
-extern convar_t touch_enable;
+extern convar_t *touch_enable;
-extern convar_t touch_emulate;
+extern convar_t *touch_emulate;
 
 void Touch_Draw( void );
-void Touch_SetClientOnly( byte state );
+void Touch_SetClientOnly( qboolean state );
-void Touch_RemoveButton( const char *name, qboolean privileged );
+void Touch_RemoveButton( const char *name );
-void Touch_HideButtons( const char *name, unsigned char hide, qboolean privileged );
+void Touch_HideButtons( const char *name, unsigned char hide );
+//void IN_TouchSetCommand( const char *name, const char *command );
+//void IN_TouchSetTexture( const char *name, const char *texture );
+//void IN_TouchSetColor( const char *name, byte *color );
 void Touch_AddClientButton( const char *name, const char *texture, const char *command, float x1, float y1, float x2, float y2, byte *color, int round, float aspect, int flags );
 void Touch_AddDefaultButton( const char *name, const char *texturefile, const char *command, float x1, float y1, float x2, float y2, byte *color, int round, float aspect, int flags );
 void Touch_WriteConfig( void );
@@ -74,7 +76,6 @@ void Touch_GetMove( float * forward, float *side, float *yaw, float *pitch );
 void Touch_ResetDefaultButtons( void );
 int IN_TouchEvent( touchEventType type, int fingerID, float x, float y, float dx, float dy );
 void Touch_KeyEvent( int key, int down );
-qboolean Touch_WantVisibleCursor( void );
 
 //
 // in_joy.c

engine/client/keys.c

@@ -104,9 +104,9 @@ keyname_t keynames[] =
 {"B_BUTTON", K_B_BUTTON, "+use"},
 {"X_BUTTON", K_X_BUTTON, "+reload"},
 {"Y_BUTTON", K_Y_BUTTON, "impulse 100"}, // Flashlight
-{"BACK",   K_BACK_BUTTON, "pause"}, // Menu
+{"BACK",   K_BACK_BUTTON, "cancelselect"}, // Menu
 {"MODE",   K_MODE_BUTTON, ""},
-{"START",  K_START_BUTTON, "escape"},
+{"START",  K_START_BUTTON, "pause"},
 {"STICK1", K_LSTICK, "+speed"},
 {"STICK2", K_RSTICK, "+duck"},
 {"L1_BUTTON",  K_L1_BUTTON, "+duck"},
@@ -123,13 +123,13 @@ keyname_t keynames[] =
 {"JOY4" , K_JOY4 , ""},
 {"C_BUTTON", K_C_BUTTON, ""},
 {"Z_BUTTON", K_Z_BUTTON, ""},
-{"MISC_BUTTON", K_MISC_BUTTON, ""},
+{"AUX20", K_AUX20, ""}, // generic
-{"PADDLE1", K_PADDLE1_BUTTON, ""},
+{"AUX21", K_AUX21, ""},
-{"PADDLE2", K_PADDLE2_BUTTON, ""},
+{"AUX22", K_AUX22, ""},
-{"PADDLE3", K_PADDLE3_BUTTON, ""},
+{"AUX23", K_AUX23, ""},
-{"PADDLE4", K_PADDLE4_BUTTON, ""},
+{"AUX24", K_AUX24, ""},
-{"TOUCHPAD", K_TOUCHPAD, ""},
+{"AUX25", K_AUX25, ""},
-{"AUX26", K_AUX26, ""}, // generic
+{"AUX26", K_AUX26, ""},
 {"AUX27", K_AUX27, ""},
 {"AUX28", K_AUX28, ""},
 {"AUX29", K_AUX29, ""},
@@ -159,6 +159,18 @@ int GAME_EXPORT Key_IsDown( int keynum )
 	return keys[keynum].down;
 }
 
+/*
+===================
+Key_GetBind
+===================
+*/
+const char *Key_IsBind( int keynum )
+{
+	if( keynum == -1 || !keys[keynum].binding )
+		return NULL;
+	return keys[keynum].binding;
+}
+
 /*
 ===================
 Key_StringToKeynum
@@ -362,7 +374,7 @@ void Key_Unbindall_f( void )
 {
 	int	i;
 
-	for( i = 0; i < ARRAYSIZE( keys ); i++ )
+	for( i = 0; i < 256; i++ )
 	{
 		if( keys[i].binding )
 			Key_SetBinding( i, "" );
@@ -370,7 +382,6 @@ void Key_Unbindall_f( void )
 
 	// set some defaults
 	Key_SetBinding( K_ESCAPE, "escape" );
-	Key_SetBinding( K_START_BUTTON, "escape" );
 }
 
 /*
@@ -384,7 +395,7 @@ void Key_Reset_f( void )
 	int	i;
 
 	// clear all keys first
-	for( i = 0; i < ARRAYSIZE( keys ); i++ )
+	for( i = 0; i < 256; i++ )
 	{
 		if( keys[i].binding )
 			Key_SetBinding( i, "" );
@@ -434,8 +445,8 @@ void Key_Bind_f( void )
 
 	for( i = 2; i < c; i++ )
 	{
-		Q_strncat( cmd, Cmd_Argv( i ), sizeof( cmd ));
+		Q_strcat( cmd, Cmd_Argv( i ));
-		if( i != ( c - 1 )) Q_strncat( cmd, " ", sizeof( cmd ));
+		if( i != ( c - 1 )) Q_strcat( cmd, " " );
 	}
 
 	Key_SetBinding( b, cmd );
@@ -451,7 +462,6 @@ Writes lines containing "bind key value"
 void Key_WriteBindings( file_t *f )
 {
 	int	i;
-	string newCommand;
 
 	if( !f ) return;
 
@@ -462,8 +472,7 @@ void Key_WriteBindings( file_t *f )
 		if( !COM_CheckString( keys[i].binding ))
 			continue;
 
-		Cmd_Escape( newCommand, keys[i].binding, sizeof( newCommand ));
+		FS_Printf( f, "bind %s \"%s\"\n", Key_KeynumToString( i ), keys[i].binding );
-		FS_Printf( f, "bind %s \"%s\"\n", Key_KeynumToString( i ), newCommand );
 	}
 }
 
@@ -503,18 +512,18 @@ void Key_Init( void )
 	keyname_t	*kn;
 
 	// register our functions
-	Cmd_AddRestrictedCommand( "bind", Key_Bind_f, "binds a command to the specified key in bindmap" );
+	Cmd_AddCommand( "bind", Key_Bind_f, "binds a command to the specified key in bindmap" );
-	Cmd_AddRestrictedCommand( "unbind", Key_Unbind_f, "removes a command on the specified key in bindmap" );
+	Cmd_AddCommand( "unbind", Key_Unbind_f, "removes a command on the specified key in bindmap" );
-	Cmd_AddRestrictedCommand( "unbindall", Key_Unbindall_f, "removes all commands from all keys in bindmap" );
+	Cmd_AddCommand( "unbindall", Key_Unbindall_f, "removes all commands from all keys in bindmap" );
-	Cmd_AddRestrictedCommand( "resetkeys", Key_Reset_f, "reset all keys to their default values" );
+	Cmd_AddCommand( "resetkeys", Key_Reset_f, "reset all keys to their default values" );
 	Cmd_AddCommand( "bindlist", Key_Bindlist_f, "display current key bindings" );
 	Cmd_AddCommand( "makehelp", Key_EnumCmds_f, "write help.txt that contains all console cvars and cmds" );
 
 	// setup default binding. "unbindall" from config.cfg will be reset it
 	for( kn = keynames; kn->name; kn++ ) Key_SetBinding( kn->keynum, kn->binding );
 
-	osk_enable = Cvar_Get( "osk_enable", "0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "enable built-in on-screen keyboard" );
+	osk_enable = Cvar_Get( "osk_enable", "0", FCVAR_ARCHIVE, "enable built-in on-screen keyboard" );
-	key_rotate = Cvar_Get( "key_rotate", "0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "rotate arrow keys (0-3)" );
+	key_rotate = Cvar_Get( "key_rotate", "0", FCVAR_ARCHIVE, "rotate arrow keys (0-3)" );
 
 }
 
@@ -541,8 +550,8 @@ void Key_AddKeyCommands( int key, const char *kb, qboolean down )
 			if( button[0] == '+' )
 			{
 				// button commands add keynum as a parm
-				if( down ) Q_snprintf( cmd, sizeof( cmd ), "%s %i\n", button, key );
+				if( down ) Q_sprintf( cmd, "%s %i\n", button, key );
-				else Q_snprintf( cmd, sizeof( cmd ), "-%s %i\n", button + 1, key );
+				else Q_sprintf( cmd, "-%s %i\n", button + 1, key );
 				Cbuf_AddText( cmd );
 			}
 			else if( down )
@@ -701,6 +710,7 @@ void GAME_EXPORT Key_Event( int key, int down )
 	}
 
 	VGui_KeyEvent( key, down );
+	Touch_KeyEvent( key, down );
 
 	// console key is hardcoded, so the user can never unbind it
 	if( key == '`' || key == '~' )
@@ -802,9 +812,9 @@ void Key_EnableTextInput( qboolean enable, qboolean force )
 		OSK_EnableTextInput( enable, force );
 		return;
 	}
-	if( enable && ( !host.textmode || force ))
+	if( enable && ( !host.textmode || force ) )
 		Platform_EnableTextInput( true );
-	else if( !enable && ( host.textmode || force ))
+	else if( !enable )
 		Platform_EnableTextInput( false );
 
 	host.textmode = enable;
@@ -830,9 +840,7 @@ void GAME_EXPORT Key_SetKeyDest( int key_dest )
 		cls.key_dest = key_menu;
 		break;
 	case key_console:
-#if !XASH_NSWITCH && !XASH_PSVITA // if we don't disable this, pops up the keyboard during load
 		Key_EnableTextInput( true, false );
-#endif
 		cls.key_dest = key_console;
 		break;
 	case key_message:
@@ -1034,7 +1042,7 @@ static qboolean OSK_KeyEvent( int key, int down )
 			else
 				osk.curlayout++;
 
-			osk.shift = true;
+			osk.shift = osk.curbutton.val == OSK_SHIFT;
 			osk.curbutton.val = osk_keylayout[osk.curlayout][osk.curbutton.y][osk.curbutton.x];
 			break;
 		case OSK_BACKSPACE:
@@ -1139,7 +1147,7 @@ Draw button with symbol on it
 */
 static void OSK_DrawSymbolButton( int symb, float x, float y, float width, float height )
 {
-	cl_font_t *font = Con_GetCurFont();
+	char str[] = {symb & 255, 0};
 	byte color[] = { 255, 255, 255, 255 };
 	int x1 = x * refState.width,
 		y1 = y * refState.height,
@@ -1147,15 +1155,14 @@ static void OSK_DrawSymbolButton( int symb, float x, float y, float width, float
 		h = height * refState.height;
 
 	if( symb == osk.curbutton.val )
+	{
 		ref.dllFuncs.FillRGBABlend( x1, y1, w, h, 255, 160, 0, 100 );
+	}
 
 	if( !symb || symb == ' ' || (symb >= OSK_TAB && symb < OSK_SPECKEY_LAST ) )
 		return;
 
-	CL_DrawCharacter(
+	Con_DrawCharacter( x1 + 1, y1, symb, color );
-		x1 + width * 0.4 * refState.width,
-		y1 + height * 0.4 * refState.height,
-		symb, color, font, 0 );
 }
 
 /*
@@ -1169,11 +1176,7 @@ static void OSK_DrawSpecialButton( const char *name, float x, float y, float wid
 {
 	byte color[] = { 0, 255, 0, 255 };
 
-	Con_DrawString(
+	Con_DrawString( x * refState.width, y * refState.height, name, color );
-		x * refState.width + width * 0.4 * refState.width,
-		y * refState.height + height * 0.4 * refState.height,
-		name,
-		color );
 }
 
 

engine/client/ref_common.c

@@ -13,7 +13,7 @@ convar_t *gl_showtextures;
 convar_t *r_decals;
 convar_t *r_adjust_fov;
 convar_t *r_showtree;
-convar_t *gl_msaa_samples;
+convar_t *gl_wgl_msaa_samples;
 convar_t *gl_clear;
 convar_t *r_refdll;
 
@@ -55,11 +55,12 @@ void GL_RenderFrame( const ref_viewpass_t *rvp )
 
 	VectorCopy( rvp->vieworigin, refState.vieworg );
 	VectorCopy( rvp->viewangles, refState.viewangles );
+	AngleVectors( refState.viewangles, refState.vforward, refState.vright, refState.vup );
 
 	ref.dllFuncs.GL_RenderFrame( rvp );
 }
 
-static intptr_t pfnEngineGetParm( int parm, int arg )
+static int pfnEngineGetParm( int parm, int arg )
 {
 	return CL_RenderGetParm( parm, arg, false ); // prevent recursion
 }
@@ -74,6 +75,16 @@ static void pfnStudioEvent( const mstudioevent_t *event, const cl_entity_t *e )
 	clgame.dllFuncs.pfnStudioEvent( event, e );
 }
 
+static efrag_t* pfnGetEfragsFreeList( void )
+{
+	return clgame.free_efrags;
+}
+
+static void pfnSetEfragsFreeList( efrag_t *list )
+{
+	clgame.free_efrags = list;
+}
+
 static model_t *pfnGetDefaultSprite( enum ref_defaultsprite_e spr )
 {
 	switch( spr )
@@ -140,7 +151,7 @@ static player_info_t *pfnPlayerInfo( int index )
 	if( index == -1 ) // special index for menu
 		return &gameui.playerinfo;
 
-	if( index < 0 || index >= cl.maxclients )
+	if( index < 0 || index > cl.maxclients )
 		return NULL;
 
 	return &cl.players[index];
@@ -214,7 +225,7 @@ static qboolean R_DoResetGamma( void )
 static qboolean R_Init_Video_( const int type )
 {
 	host.apply_opengl_config = true;
-	Cbuf_AddTextf( "exec %s.cfg", ref.dllFuncs.R_GetConfigName());
+	Cbuf_AddText( va( "exec %s.cfg", ref.dllFuncs.R_GetConfigName()));
 	Cbuf_Execute();
 	host.apply_opengl_config = false;
 
@@ -268,6 +279,9 @@ static ref_api_t gEngfuncs =
 	Mod_PointInLeaf,
 	Mod_CreatePolygonsForHull,
 
+	R_StudioSlerpBones,
+	R_StudioCalcBoneQuaternion,
+	R_StudioCalcBonePosition,
 	R_StudioGetAnim,
 	pfnStudioEvent,
 
@@ -320,6 +334,10 @@ static ref_api_t gEngfuncs =
 	COM_FreeLibrary,
 	COM_GetProcAddress,
 
+	FS_LoadFile,
+	FS_FileExists,
+	FS_AllowDirectPaths,
+
 	R_Init_Video_,
 	R_Free_Video,
 
@@ -345,7 +363,7 @@ static ref_api_t gEngfuncs =
 
 	pfnGetPhysent,
 	pfnTraceSurface,
-	PM_CL_TraceLine,
+	PM_TraceLine,
 	CL_VisTraceLine,
 	CL_TraceLine,
 	pfnGetMoveVars,
@@ -365,9 +383,7 @@ static ref_api_t gEngfuncs =
 
 	pfnDrawNormalTriangles,
 	pfnDrawTransparentTriangles,
-	&clgame.drawFuncs,
+	&clgame.drawFuncs
-
-	&g_fsapi,
 };
 
 static void R_UnloadProgs( void )
@@ -512,7 +528,7 @@ static void R_GetRendererName( char *dest, size_t size, const char *opt )
 	else
 	{
 		// full path
-		Q_strncpy( dest, opt, size );
+		Q_strcpy( dest, opt );
 	}
 }
 
@@ -555,62 +571,66 @@ static void SetWidthAndHeightFromCommandLine( void )
 static void SetFullscreenModeFromCommandLine( void )
 {
 #if !XASH_MOBILE_PLATFORM
-	if( Sys_CheckParm( "-fullscreen" ))
+	if ( Sys_CheckParm("-fullscreen") )
 	{
 		Cvar_Set( "fullscreen", "1" );
 	}
-	else if( Sys_CheckParm( "-windowed" ))
+	else if ( Sys_CheckParm( "-windowed" ) )
 	{
 		Cvar_Set( "fullscreen", "0" );
 	}
 #endif
 }
 
-static void R_CollectRendererNames( void )
+void R_CollectRendererNames( void )
 {
-	// ordering is important!
+	const char *renderers[] = DEFAULT_RENDERERS;
-	static const char *shortNames[] =
+	int i, cur;
-	{
-#if XASH_REF_GL_ENABLED
-		"gl",
-#endif
-#if XASH_REF_NANOGL_ENABLED
-		"gles1",
-#endif
-#if XASH_REF_GLWES_ENABLED
-		"gles2",
-#endif
-#if XASH_REF_GL4ES_ENABLED
-		"gl4es",
-#endif
-#if XASH_REF_SOFT_ENABLED
-		"soft",
-#endif
-	};
 
-	// ordering is important here too!
+	cur = 0;
-	static const char *readableNames[ARRAYSIZE( shortNames )] =
+	for( i = 0; i < DEFAULT_RENDERERS_LEN; i++ )
 	{
-#if XASH_REF_GL_ENABLED
+		string temp;
-		"OpenGL",
+		void *dll, *pfn;
-#endif
-#if XASH_REF_NANOGL_ENABLED
-		"GLES1 (NanoGL)",
-#endif
-#if XASH_REF_GLWES_ENABLED
-		"GLES2 (gl-wes-v2)",
-#endif
-#if XASH_REF_GL4ES_ENABLED
-		"GL4ES",
-#endif
-#if XASH_REF_SOFT_ENABLED
-		"Software",
-#endif
-	};
 
-	ref.numRenderers = ARRAYSIZE( shortNames );
+		R_GetRendererName( temp, sizeof( temp ), renderers[i] );
-	ref.shortNames = shortNames;
+
-	ref.readableNames = readableNames;
+		dll = COM_LoadLibrary( temp, false, true );
+		if( !dll )
+		{
+			Con_Reportf( "R_CollectRendererNames: can't load library %s: %s\n", temp, COM_GetLibraryError() );
+			continue;
+		}
+
+		pfn = COM_GetProcAddress( dll, GET_REF_API );
+		if( !pfn )
+		{
+			Con_Reportf( "R_CollectRendererNames: can't find API entry point in %s\n", temp );
+			COM_FreeLibrary( dll );
+			continue;
+		}
+
+		Q_strncpy( ref.shortNames[cur], renderers[i], sizeof( ref.shortNames[cur] ));
+
+		pfn = COM_GetProcAddress( dll, GET_REF_HUMANREADABLE_NAME );
+		if( !pfn ) // just in case
+		{
+			Con_Reportf( "R_CollectRendererNames: can't find GetHumanReadableName export in %s\n", temp );
+			Q_strncpy( ref.readableNames[cur], renderers[i], sizeof( ref.readableNames[cur] ));
+		}
+		else
+		{
+			REF_HUMANREADABLE_NAME GetHumanReadableName = (REF_HUMANREADABLE_NAME)pfn;
+
+			GetHumanReadableName( ref.readableNames[cur], sizeof( ref.readableNames[cur] ));
+		}
+
+		Con_Printf( "Found renderer %s: %s\n", ref.shortNames[cur], ref.readableNames[cur] );
+
+		cur++;
+		COM_FreeLibrary( dll );
+	}
+	ref.numRenderers = cur;
 }
 
 qboolean R_Init( void )
@@ -622,27 +642,10 @@ qboolean R_Init( void )
 	gl_showtextures = Cvar_Get( "r_showtextures", "0", FCVAR_CHEAT, "show all uploaded textures" );
 	r_adjust_fov = Cvar_Get( "r_adjust_fov", "1", FCVAR_ARCHIVE, "making FOV adjustment for wide-screens" );
 	r_decals = Cvar_Get( "r_decals", "4096", FCVAR_ARCHIVE, "sets the maximum number of decals" );
-	gl_msaa_samples = Cvar_Get( "gl_msaa_samples", "0", FCVAR_GLCONFIG, "samples number for multisample anti-aliasing" );
+	gl_wgl_msaa_samples = Cvar_Get( "gl_wgl_msaa_samples", "0", FCVAR_GLCONFIG, "samples number for multisample anti-aliasing" );
 	gl_clear = Cvar_Get( "gl_clear", "0", FCVAR_ARCHIVE, "clearing screen after each frame" );
 	r_showtree = Cvar_Get( "r_showtree", "0", FCVAR_ARCHIVE, "build the graph of visible BSP tree" );
-	r_refdll = Cvar_Get( "r_refdll", "", FCVAR_RENDERINFO, "choose renderer implementation, if supported" );
+	r_refdll = Cvar_Get( "r_refdll", "", FCVAR_RENDERINFO|FCVAR_VIDRESTART, "choose renderer implementation, if supported" );
-
-	// cvars that are expected to exist
-	Cvar_Get( "r_speeds", "0", FCVAR_ARCHIVE, "shows renderer speeds" );
-	Cvar_Get( "r_fullbright", "0", FCVAR_CHEAT, "disable lightmaps, get fullbright for entities" );
-	Cvar_Get( "r_norefresh", "0", 0, "disable 3D rendering (use with caution)" );
-	Cvar_Get( "r_dynamic", "1", FCVAR_ARCHIVE, "allow dynamic lighting (dlights, lightstyles)" );
-	Cvar_Get( "r_lightmap", "0", FCVAR_CHEAT, "lightmap debugging tool" );
-	Cvar_Get( "tracerred", "0.8", 0, "tracer red component weight ( 0 - 1.0 )" );
-	Cvar_Get( "tracergreen", "0.8", 0, "tracer green component weight ( 0 - 1.0 )" );
-	Cvar_Get( "tracerblue", "0.4", 0, "tracer blue component weight ( 0 - 1.0 )" );
-	Cvar_Get( "traceralpha", "0.5", 0, "tracer alpha amount ( 0 - 1.0 )" );
-
-	Cvar_Get( "r_sprite_lerping", "1", FCVAR_ARCHIVE, "enables sprite animation lerping" );
-	Cvar_Get( "r_sprite_lighting", "1", FCVAR_ARCHIVE, "enables sprite lighting (blood etc)" );
-
-	Cvar_Get( "r_drawviewmodel", "1", 0, "draw firstperson weapon model" );
-	Cvar_Get( "r_glowshellfreq", "2.2", 0, "glowing shell frequency update" );
 
 	// cvars that are expected to exist by client.dll
 	// refdll should just get pointer to them
@@ -664,28 +667,30 @@ qboolean R_Init( void )
 	// 1. Command line `-ref` argument.
 	// 2. `ref_dll` cvar.
 	// 3. Detected renderers in `DEFAULT_RENDERERS` order.
-	requested[0] = 0;
+	requested[0] = '\0';
+	if( !Sys_GetParmFromCmdLine( "-ref", requested ) && COM_CheckString( r_refdll->string ) )
+		// r_refdll is set to empty by default, so we can change hardcoded defaults just in case
+		Q_strncpy( requested, r_refdll->string, sizeof( requested ) );
 
-	if( !success && Sys_GetParmFromCmdLine( "-ref", requested ))
+	if ( requested[0] )
 		success = R_LoadRenderer( requested );
 
-	if( !success && COM_CheckString( r_refdll->string ))
-	{
-		Q_strncpy( requested, r_refdll->string, sizeof( requested ));
-		success = R_LoadRenderer( requested );
-	}
-
 	if( !success )
 	{
 		int i;
 
-		for( i = 0; i < ref.numRenderers && !success; i++ )
+		// cycle through renderers that we collected in CollectRendererNames
+		for( i = 0; i < ref.numRenderers; i++ )
 		{
 			// skip renderer that was requested but failed to load
-			if( !Q_strcmp( requested, ref.shortNames[i] ))
+			if( !Q_strcmp( requested, ref.shortNames[i] ) )
 				continue;
 
 			success = R_LoadRenderer( ref.shortNames[i] );
+
+			// yay, found working one
+			if( success )
+				break;
 		}
 	}
 

engine/client/ref_common.h

@@ -27,10 +27,9 @@ struct ref_state_s
 	HINSTANCE hInstance;
 	ref_interface_t dllFuncs;
 
-	// depends on build configuration
 	int numRenderers;
-	const char **shortNames;
+	string shortNames[DEFAULT_RENDERERS_LEN];
-	const char **readableNames;
+	string readableNames[DEFAULT_RENDERERS_LEN];
 };
 
 extern struct ref_state_s ref;

engine/client/s_dsp.c

@@ -33,6 +33,7 @@ GNU General Public License for more details.
 
 #define MAXDLY		(STEREODLY + 1)
 #define MAXLP		10
+#define MAXPRESETS		29
 
 typedef struct sx_preset_s
 {
@@ -78,7 +79,7 @@ typedef struct dly_s
 	int	*lpdelayline;
 } dly_t;
 
-const sx_preset_t rgsxpre[] =
+const sx_preset_t rgsxpre[MAXPRESETS] =
 {
 //          -------reverb--------  -------delay--------
 // lp  mod  size   refl   rvblp  delay  feedback  dlylp  left
@@ -115,7 +116,7 @@ const sx_preset_t rgsxpre[] =
 
 // 0x0045dca8 enginegl.exe
 // SHA256: 42383d32cd712e59ee2c1bd78b7ba48814e680e7026c4223e730111f34a60d66
-const sx_preset_t rgsxpre_hlalpha052[] =
+const sx_preset_t rgsxpre_hlalpha052[MAXPRESETS] =
 {
 //          -------reverb--------  -------delay--------
 // lp  mod  size   refl   rvblp  delay  feedback  dlylp  left
@@ -481,7 +482,7 @@ void DLY_CheckNewDelayVal( void )
 		}
 		else
 		{
-			delay = Q_min( delay, MAX_MONO_DELAY );
+			delay = min( delay, MAX_MONO_DELAY );
 			dly->delaysamples = (int)(delay * idsp_dma_speed) << sxhires;
 
 			// init dly
@@ -881,7 +882,7 @@ void CheckNewDspPresets( void )
 	else idsp_room = room_type->value;
 
 	// don't pass invalid presets
-	idsp_room = bound( 0, idsp_room, MAX_ROOM_TYPES );
+	idsp_room = bound( 0, idsp_room, MAXPRESETS - 1 );
 
 	if( FBitSet( hisound->flags, FCVAR_CHANGED ))
 	{
@@ -892,6 +893,9 @@ void CheckNewDspPresets( void )
 	if( idsp_room == room_typeprev && idsp_room == 0 )
 		return;
 
+	if( idsp_room > MAX_ROOM_TYPES )
+		return;
+
 	if( idsp_room != room_typeprev )
 	{
 		const sx_preset_t *cur;

engine/client/s_load.c

@@ -14,7 +14,6 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "client.h"
 #include "sound.h"
 
 // during registration it is possible to have more sounds
@@ -29,6 +28,7 @@ static sfx_t	s_knownSfx[MAX_SFX];
 static sfx_t	*s_sfxHashList[MAX_SFX_HASH];
 static string	s_sentenceImmediateName;	// keep dummy sentence name
 qboolean		s_registering = false;
+int		s_registration_sequence = 0;
 
 /*
 =================
@@ -54,7 +54,7 @@ void S_SoundList_f( void )
 
 			if( sc->loopStart >= 0 ) Con_Printf( "L" );
 			else Con_Printf( " " );
-			if( sfx->name[0] == '*' || !Q_strncmp( sfx->name, DEFAULT_SOUNDPATH, sizeof( DEFAULT_SOUNDPATH ) - 1 ))
+			if( sfx->name[0] == '*' )
 				Con_Printf( " (%2db) %s : %s\n", sc->width * 8, Q_memprint( sc->size ), sfx->name );
 			else Con_Printf( " (%2db) %s : " DEFAULT_SOUNDPATH "%s\n", sc->width * 8, Q_memprint( sc->size ), sfx->name );
 			totalSfx++;
@@ -199,7 +199,7 @@ sfx_t *S_FindName( const char *pname, int *pfInCache )
 				*pfInCache = ( sfx->cache != NULL ) ? true : false;
 			}
 			// prolonge registration
-			sfx->servercount = cl.servercount;
+			sfx->servercount = s_registration_sequence;
 			return sfx;
 		}
 	}
@@ -219,7 +219,7 @@ sfx_t *S_FindName( const char *pname, int *pfInCache )
 	memset( sfx, 0, sizeof( *sfx ));
 	if( pfInCache ) *pfInCache = false;
 	Q_strncpy( sfx->name, name, MAX_STRING );
-	sfx->servercount = cl.servercount;
+	sfx->servercount = s_registration_sequence;
 	sfx->hashValue = COM_HashKey( sfx->name, MAX_SFX_HASH );
 
 	// link it in
@@ -273,6 +273,7 @@ void S_BeginRegistration( void )
 {
 	int	i;
 
+	s_registration_sequence++;
 	snd_ambient = false;
 
 	// check for automatic ambient sounds
@@ -308,7 +309,7 @@ void S_EndRegistration( void )
 		if( !sfx->name[0] || !Q_stricmp( sfx->name, "*default" ))
 			continue; // don't release default sound
 
-		if( sfx->servercount != cl.servercount )
+		if( sfx->servercount != s_registration_sequence )
 			S_FreeSound( sfx ); // don't need this sound
 	}
 
@@ -348,7 +349,7 @@ sound_t S_RegisterSound( const char *name )
 	sfx = S_FindName( name, NULL );
 	if( !sfx ) return -1;
 
-	sfx->servercount = cl.servercount;
+	sfx->servercount = s_registration_sequence;
 	if( !s_registering ) S_LoadSound( sfx );
 
 	return sfx - s_knownSfx;

engine/client/s_main.c

@@ -35,18 +35,18 @@ int		total_channels;
 int		soundtime;	// sample PAIRS
 int   		paintedtime; 	// sample PAIRS
 
-static CVAR_DEFINE( s_volume, "volume", "0.7", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "sound volume" );
+static CVAR_DEFINE( s_volume, "volume", "0.7", FCVAR_ARCHIVE, "sound volume" );
-CVAR_DEFINE( s_musicvolume, "MP3Volume", "1.0", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "background music volume" );
+CVAR_DEFINE( s_musicvolume, "MP3Volume", "1.0", FCVAR_ARCHIVE, "background music volume" );
-static CVAR_DEFINE( s_mixahead, "_snd_mixahead", "0.12", FCVAR_FILTERABLE, "how much sound to mix ahead of time" );
+static CVAR_DEFINE( s_mixahead, "_snd_mixahead", "0.12", 0, "how much sound to mix ahead of time" );
-static CVAR_DEFINE_AUTO( s_show, "0", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "show playing sounds" );
+static CVAR_DEFINE_AUTO( s_show, "0", FCVAR_ARCHIVE, "show playing sounds" );
-CVAR_DEFINE_AUTO( s_lerping, "0", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "apply interpolation to sound output" );
+CVAR_DEFINE_AUTO( s_lerping, "0", FCVAR_ARCHIVE, "apply interpolation to sound output" );
-static CVAR_DEFINE( s_ambient_level, "ambient_level", "0.3", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "volume of environment noises (water and wind)" );
+static CVAR_DEFINE( s_ambient_level, "ambient_level", "0.3", FCVAR_ARCHIVE, "volume of environment noises (water and wind)" );
-static CVAR_DEFINE( s_ambient_fade, "ambient_fade", "1000", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "rate of volume fading when client is moving" );
+static CVAR_DEFINE( s_ambient_fade, "ambient_fade", "1000", FCVAR_ARCHIVE, "rate of volume fading when client is moving" );
-static CVAR_DEFINE_AUTO( s_combine_sounds, "0", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "combine channels with same sounds" );
+static CVAR_DEFINE_AUTO( s_combine_sounds, "0", FCVAR_ARCHIVE, "combine channels with same sounds" );
-CVAR_DEFINE_AUTO( snd_mute_losefocus, "1", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "silence the audio when game window loses focus" );
+CVAR_DEFINE_AUTO( snd_mute_losefocus, "1", FCVAR_ARCHIVE, "silence the audio when game window loses focus" );
 CVAR_DEFINE_AUTO( s_test, "0", 0, "engine developer cvar for quick testing new features" );
-CVAR_DEFINE_AUTO( s_samplecount, "0", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "sample count (0 for default value)" );
+CVAR_DEFINE_AUTO( s_samplecount, "0", FCVAR_ARCHIVE, "sample count (0 for default value)" );
-CVAR_DEFINE_AUTO( s_warn_late_precache, "0", FCVAR_ARCHIVE|FCVAR_FILTERABLE, "warn about late precached sounds on client-side" );
+CVAR_DEFINE_AUTO( s_warn_late_precache, "0", FCVAR_ARCHIVE, "warn about late precached sounds on client-side" );
 
 /*
 =============================================================================
@@ -159,7 +159,7 @@ void S_UpdateSoundFade( void )
 	}
 
 	// spline it.
-	f = -( cos( M_PI * f ) - 1 ) / 2;
+	f = SimpleSpline( f );
 	f = bound( 0.0f, f, 1.0f );
 
 	soundfade.percent = soundfade.initial_percent * f;
@@ -197,65 +197,6 @@ qboolean SND_FStreamIsPlaying( sfx_t *sfx )
 	return false;
 }
 
-/*
-=================
-SND_GetChannelTimeLeft
-
-TODO: this function needs to be removed after whole sound subsystem rewrite
-=================
-*/
-static int SND_GetChannelTimeLeft( const channel_t *ch )
-{
-	int remaining;
-
-	if( ch->pMixer.finished || !ch->sfx || !ch->sfx->cache )
-		return 0;
-
-	if( ch->isSentence ) // sentences are special, count all remaining words
-	{
-		int i;
-
-		if( !ch->currentWord )
-			return 0;
-
-		// current word
-		remaining = ch->currentWord->forcedEndSample - ch->currentWord->sample;
-
-		// here we count all remaining words, stopping if no sfx or sound file is available
-		// see VOX_LoadWord
-		for( i = ch->wordIndex + 1; i < ARRAYSIZE( ch->words ); i++ )
-		{
-			wavdata_t *sc;
-			int end;
-
-			// don't continue with broken sentences
-			if( !ch->words[i].sfx )
-				break;
-
-			if( !( sc = S_LoadSound( ch->words[i].sfx )))
-				break;
-
-			end = ch->words[i].end;
-
-			if( end )
-				remaining += sc->samples * 0.01f * end;
-			else remaining += sc->samples;
-		}
-	}
-	else
-	{
-		int curpos;
-		int samples;
-
-		// handle position looping
-		samples = ch->sfx->cache->samples;
-		curpos = S_ConvertLoopedPosition( ch->sfx->cache, ch->pMixer.sample, ch->use_loop );
-		remaining = bound( 0, samples - curpos, samples );
-	}
-
-	return remaining;
-}
-
 /*
 =================
 SND_PickDynamicChannel
@@ -305,7 +246,11 @@ channel_t *SND_PickDynamicChannel( int entnum, int channel, sfx_t *sfx, qboolean
 			continue;
 
 		// try to pick the sound with the least amount of data left to play
-		timeleft = SND_GetChannelTimeLeft( ch );
+		timeleft = 0;
+		if( ch->sfx )
+		{
+			timeleft = 1; // ch->end - paintedtime
+		}
 
 		if( timeleft < life_left )
 		{
@@ -843,8 +788,6 @@ void S_AmbientSound( const vec3_t pos, int ent, sound_t handle, float fvol, floa
 		return;
 	}
 
-	pitch *= (sys_timescale.value + 1) / 2;
-
 	// never update positions if source entity is 0
 	ch->staticsound = ( ent == 0 ) ? true : false;
 	ch->use_loop = (flags & SND_STOP_LOOPING) ? false : true;
@@ -1182,7 +1125,7 @@ static uint S_RawSamplesStereo( portable_samplepair_t *rawsamples, uint rawend,
 S_RawEntSamples
 ===================
 */
-void S_RawEntSamples( int entnum, uint samples, uint rate, word width, word channels, const byte *data, int snd_vol )
+static void S_RawEntSamples( int entnum, uint samples, uint rate, word width, word channels, const byte *data, int snd_vol )
 {
 	rawchan_t	*ch;
 
@@ -1208,6 +1151,7 @@ void S_RawSamples( uint samples, uint rate, word width, word channels, const byt
 	int	snd_vol = 128;
 
 	if( entnum < 0 ) snd_vol = 256; // bg track or movie track
+	if( snd_vol < 0 ) snd_vol = 0; // fixup negative values
 
 	S_RawEntSamples( entnum, samples, rate, width, channels, data, snd_vol );
 }
@@ -1292,6 +1236,36 @@ void S_StreamAviSamples( void *Avi, int entnum, float fvol, float attn, float sy
 	}
 }
 
+/*
+===================
+S_GetRawSamplesLength
+===================
+*/
+uint S_GetRawSamplesLength( int entnum )
+{
+	rawchan_t	*ch;
+
+	if( !( ch = S_FindRawChannel( entnum, false )))
+		return 0;
+
+	return ch->s_rawend <= paintedtime ? 0 : (float)(ch->s_rawend - paintedtime) * DMA_MSEC_PER_SAMPLE;
+}
+
+/*
+===================
+S_ClearRawChannel
+===================
+*/
+void S_ClearRawChannel( int entnum )
+{
+	rawchan_t	*ch;
+
+	if( !( ch = S_FindRawChannel( entnum, false )))
+		return;
+
+	ch->s_rawend = 0;
+}
+
 /*
 ===================
 S_FreeIdleRawChannels
@@ -1312,9 +1286,6 @@ static void S_FreeIdleRawChannels( void )
 		if( ch->s_rawend >= paintedtime )
 			continue;
 
-		if ( ch->entnum > 0 )
-			SND_ForceCloseMouth( ch->entnum );
-
 		if(( paintedtime - ch->s_rawend ) / SOUND_DMA_SPEED >= S_RAW_SOUND_IDLE_SEC )
 		{
 			raw_channels[i] = NULL;
@@ -1812,12 +1783,8 @@ void S_Music_f( void )
 
 		for( i = 0; i < 2; i++ )
 		{
-			char intro_path[MAX_VA_STRING];
+			const char *intro_path = va( "media/%s.%s", intro, ext[i] );
-			char main_path[MAX_VA_STRING];
+			const char *main_path = va( "media/%s.%s", main, ext[i] );
-			char track_path[MAX_VA_STRING];
-
-			Q_snprintf( intro_path, sizeof( intro_path ), "media/%s.%s", intro, ext[i] );
-			Q_snprintf( main_path, sizeof( main_path ), "media/%s.%s", main, ext[i] );
 
 			if( FS_FileExists( intro_path, false ) && FS_FileExists( main_path, false ))
 			{
@@ -1825,10 +1792,7 @@ void S_Music_f( void )
 				S_StartBackgroundTrack( intro, main, 0, false );
 				break;
 			}
-
+			else if( FS_FileExists( va( "media/%s.%s", track, ext[i] ), false ))
-			Q_snprintf( track_path, sizeof( track_path ), "media/%s.%s", track, ext[i] );
-
-			if( FS_FileExists( track_path, false ))
 			{
 				// single non-looped theme
 				S_StartBackgroundTrack( track, NULL, 0, false );
@@ -1883,7 +1847,7 @@ S_SoundInfo_f
 */
 void S_SoundInfo_f( void )
 {
-	Con_Printf( "Audio backend: %s\n", dma.backendName );
+	Con_Printf( "Audio: DirectSound\n" );
 	Con_Printf( "%5d channel(s)\n", 2 );
 	Con_Printf( "%5d samples\n", dma.samples );
 	Con_Printf( "%5d bits/sample\n", 16 );
@@ -1893,33 +1857,6 @@ void S_SoundInfo_f( void )
 	S_PrintBackgroundTrackState ();
 }
 
-/*
-=================
-S_VoiceRecordStart_f
-=================
-*/
-void S_VoiceRecordStart_f( void )
-{
-	if( cls.state != ca_active || cls.legacymode )
-		return;
-	
-	Voice_RecordStart();
-}
-
-/*
-=================
-S_VoiceRecordStop_f
-=================
-*/
-void S_VoiceRecordStop_f( void )
-{
-	if( cls.state != ca_active || !Voice_IsRecording() )
-		return;
-	
-	CL_AddVoiceToDatagram();
-	Voice_RecordStop();
-}
-
 /*
 ================
 S_Init
@@ -1954,12 +1891,11 @@ qboolean S_Init( void )
 	Cmd_AddCommand( "soundlist", S_SoundList_f, "display loaded sounds" );
 	Cmd_AddCommand( "s_info", S_SoundInfo_f, "print sound system information" );
 	Cmd_AddCommand( "s_fade", S_SoundFade_f, "fade all sounds then stop all" );
-	Cmd_AddCommand( "+voicerecord", S_VoiceRecordStart_f, "start voice recording" );
+	Cmd_AddCommand( "+voicerecord", Cmd_Null_f, "start voice recording (non-implemented)" );
-	Cmd_AddCommand( "-voicerecord", S_VoiceRecordStop_f, "stop voice recording" );
+	Cmd_AddCommand( "-voicerecord", Cmd_Null_f, "stop voice recording (non-implemented)" );
 	Cmd_AddCommand( "spk", S_SayReliable_f, "reliable play a specified sententce" );
 	Cmd_AddCommand( "speak", S_Say_f, "playing a specified sententce" );
 
-	dma.backendName = "None";
 	if( !SNDDMA_Init( ) )
 	{
 		Con_Printf( "Audio: sound system can't be initialized\n" );

engine/client/s_mix.c

@@ -117,6 +117,13 @@ _inline void MIX_ActivatePaintbuffer( int ipaintbuffer )
 	paintbuffers[ipaintbuffer].factive = true;
 }
 
+// don't mix into this paintbuffer
+_inline void MIX_DeactivatePaintbuffer( int ipaintbuffer )
+{
+	Assert( ipaintbuffer < CPAINTBUFFERS );
+	paintbuffers[ipaintbuffer].factive = false;
+}
+
 _inline void MIX_SetCurrentPaintbuffer( int ipaintbuffer )
 {
 	Assert( ipaintbuffer < CPAINTBUFFERS );
@@ -162,6 +169,12 @@ _inline void MIX_ResetPaintbufferFilterCounters( void )
 		paintbuffers[i].ifilter = FILTERTYPE_NONE;
 }
 
+_inline void MIX_ResetPaintbufferFilterCounter( int ipaintbuffer )
+{
+	Assert( ipaintbuffer < CPAINTBUFFERS );
+	paintbuffers[ipaintbuffer].ifilter = 0;
+}
+
 // return pointer to front paintbuffer pbuf, given index
 _inline portable_samplepair_t *MIX_GetPFrontFromIPaint( int ipaintbuffer )
 {
@@ -606,9 +619,7 @@ void MIX_MixChannelsToPaintbuffer( int endtime, int rate, int outputRate )
 			ch->pitch = VOX_ModifyPitch( ch, ch->basePitch * 0.01f );
 		else ch->pitch = ch->basePitch * 0.01f;
 
-		ch->pitch *= ( sys_timescale.value + 1 ) / 2;
+		if( CL_GetEntityByIndex( ch->entnum ) && ( ch->entchannel == CHAN_VOICE ))
-
-		if( CL_GetEntityByIndex( ch->entnum ) && ( ch->entchannel == CHAN_VOICE || ch->entchannel == CHAN_STREAM ))
 		{
 			if( pSource->width == 1 )
 				SND_MoveMouth8( ch, pSource, sampleCount );
@@ -798,7 +809,7 @@ void S_MixBufferUpsample2x( int count, portable_samplepair_t *pbuffer, portable_
 // zero out all paintbuffers
 void MIX_ClearAllPaintBuffers( int SampleCount, qboolean clearFilters )
 {
-	int	count = Q_min( SampleCount, PAINTBUFFER_SIZE );
+	int	count = min( SampleCount, PAINTBUFFER_SIZE );
 	int	i;
 
 	// zero out all paintbuffer data (ignore sampleCount)
@@ -884,13 +895,43 @@ void S_MixUpsample( int sampleCount, int filtertype )
 	ppaint->ifilter++;
 }
 
+void MIX_MixStreamBuffer( int end )
+{
+	portable_samplepair_t	*pbuf;
+	rawchan_t			*ch;
+
+	pbuf = MIX_GetPFrontFromIPaint( ISTREAMBUFFER );
+	ch = S_FindRawChannel( S_RAW_SOUND_BACKGROUNDTRACK, false );
+
+	// clear the paint buffer
+	if( s_listener.paused || !ch || ch->s_rawend < paintedtime )
+	{
+		memset( pbuf, 0, (end - paintedtime) * sizeof( portable_samplepair_t ));
+	}
+	else
+	{
+		int	i, stop;
+
+		// copy from the streaming sound source
+		stop = (end < ch->s_rawend) ? end : ch->s_rawend;
+
+		for( i = paintedtime; i < stop; i++ )
+		{
+			pbuf[i-paintedtime].left = ( ch->rawsamples[i & ( ch->max_samples - 1 )].left * ch->leftvol ) >> 8;
+			pbuf[i-paintedtime].right = ( ch->rawsamples[i & ( ch->max_samples - 1 )].right * ch->rightvol ) >> 8;
+		}
+
+		for( ; i < end; i++ )
+			pbuf[i-paintedtime].left = pbuf[i-paintedtime].right = 0;
+	}
+}
+
 void MIX_MixRawSamplesBuffer( int end )
 {
-	portable_samplepair_t	*pbuf, *roombuf, *streambuf;
+	portable_samplepair_t	*pbuf;
 	uint			i, j, stop;
 
-	roombuf = MIX_GetPFrontFromIPaint( IROOMBUFFER );
+	pbuf = MIX_GetCurrentPaintbufferPtr()->pbuf;
-	streambuf = MIX_GetPFrontFromIPaint( ISTREAMBUFFER );
 
 	if( s_listener.paused ) return;
 
@@ -898,19 +939,16 @@ void MIX_MixRawSamplesBuffer( int end )
 	for( i = 0; i < MAX_RAW_CHANNELS; i++ )
 	{
 		// copy from the streaming sound source
-		rawchan_t *ch = raw_channels[i];
+		rawchan_t	*ch = raw_channels[i];
-		qboolean stream;
 
-		if( !ch )
+		// background track should be mixing into another buffer
+		if( !ch || ch->entnum == S_RAW_SOUND_BACKGROUNDTRACK )
 			continue;
 
 		// not audible
 		if( !ch->leftvol && !ch->rightvol )
 			continue;
 
-		stream = ch->entnum == S_RAW_SOUND_BACKGROUNDTRACK || CL_IsPlayerIndex( ch->entnum );
-		pbuf = stream ? streambuf : roombuf;
-
 		stop = (end < ch->s_rawend) ? end : ch->s_rawend;
 
 		for( j = paintedtime; j < stop; j++ )
@@ -918,9 +956,6 @@ void MIX_MixRawSamplesBuffer( int end )
 			pbuf[j-paintedtime].left += ( ch->rawsamples[j & ( ch->max_samples - 1 )].left * ch->leftvol ) >> 8;
 			pbuf[j-paintedtime].right += ( ch->rawsamples[j & ( ch->max_samples - 1 )].right * ch->rightvol ) >> 8;
 		}
-
-		if( ch->entnum > 0 )
-			SND_MoveMouthRaw( ch, &ch->rawsamples[paintedtime & ( ch->max_samples - 1 )], stop - paintedtime );
 	}
 }
 
@@ -930,6 +965,9 @@ void MIX_MixRawSamplesBuffer( int end )
 // caller also remixes all into final IPAINTBUFFER output.
 void MIX_UpsampleAllPaintbuffers( int end, int count )
 {
+	// process stream buffer
+	MIX_MixStreamBuffer( end );
+
 	// 11khz sounds are mixed into 3 buffers based on distance from listener, and facing direction
 	// These buffers are facing, facingaway, room
 	// These 3 mixed buffers are then each upsampled to 22khz.
@@ -971,6 +1009,7 @@ void MIX_UpsampleAllPaintbuffers( int end, int count )
 #endif
 
 	// mix raw samples from the video streams
+	MIX_SetCurrentPaintbuffer( IROOMBUFFER );
 	MIX_MixRawSamplesBuffer( end );
 
 	MIX_DeactivateAllPaintbuffers();

engine/client/s_mouth.c

@@ -24,7 +24,17 @@ void SND_InitMouth( int entnum, int entchannel )
 {
 	if(( entchannel == CHAN_VOICE || entchannel == CHAN_STREAM ) && entnum > 0 )
 	{
-		SND_ForceInitMouth( entnum );
+		cl_entity_t	*clientEntity;
+
+		// init mouth movement vars
+		clientEntity = CL_GetEntityByIndex( entnum );
+
+		if( clientEntity )
+		{
+			clientEntity->mouth.mouthopen = 0;
+			clientEntity->mouth.sndcount = 0;
+			clientEntity->mouth.sndavg = 0;
+		}
 	}
 }
 
@@ -32,7 +42,15 @@ void SND_CloseMouth( channel_t *ch )
 {
 	if( ch->entchannel == CHAN_VOICE || ch->entchannel == CHAN_STREAM )
 	{
-		SND_ForceCloseMouth( ch->entnum );
+		cl_entity_t	*clientEntity;
+
+		clientEntity = CL_GetEntityByIndex( ch->entnum );
+
+		if( clientEntity )
+		{
+			// shut mouth
+			clientEntity->mouth.mouthopen = 0;
+		}
 	}
 }
 
@@ -132,68 +150,3 @@ void SND_MoveMouth16( channel_t *ch, wavdata_t *pSource, int count )
 		pMouth->sndcount = 0;
 	}
 }
-
-void SND_ForceInitMouth( int entnum )
-{
-	cl_entity_t *clientEntity;
-
-	clientEntity = CL_GetEntityByIndex( entnum );
-
-	if( clientEntity )
-	{
-		clientEntity->mouth.mouthopen = 0;
-		clientEntity->mouth.sndavg = 0;
-		clientEntity->mouth.sndcount = 0;
-	}
-}
-
-void SND_ForceCloseMouth( int entnum )
-{
-	cl_entity_t *clientEntity;
-
-	clientEntity = CL_GetEntityByIndex( entnum );
-
-	if( clientEntity )
-		clientEntity->mouth.mouthopen = 0;
-}
-
-void SND_MoveMouthRaw( rawchan_t *ch, portable_samplepair_t *pData, int count )
-{
-	cl_entity_t	*clientEntity;
-	mouth_t		*pMouth = NULL;
-	int		savg, data;
-	int		scount = 0;
-	uint 		i;
-
-	clientEntity = CL_GetEntityByIndex( ch->entnum );
-	if( !clientEntity ) return;
-
-	pMouth = &clientEntity->mouth;
-
-	if( pData == NULL )
-		return;
-
-	i = 0;
-	scount = pMouth->sndcount;
-	savg = 0;
-
-	while ( i < count && scount < CAVGSAMPLES )
-	{
-		data = pData[i].left; // mono sound anyway
-		data = ( bound( -32767, data, 0x7ffe ) >> 8 );
-		savg += abs( data );
-
-		i += 80 + ( (byte)data & 0x1F );
-		scount++;
-	}
-
-	pMouth->sndavg += savg;
-	pMouth->sndcount = (byte)scount;
-
-	if ( pMouth->sndcount >= CAVGSAMPLES )
-	{
-		pMouth->mouthopen = pMouth->sndavg / CAVGSAMPLES;
-		pMouth->sndavg = 0;
-		pMouth->sndcount = 0;
-	}
-}

engine/client/s_stream.c

@@ -95,7 +95,7 @@ void S_StartBackgroundTrack( const char *introTrack, const char *mainTrack, int
 	else Q_strncpy( s_bgTrack.loopName, mainTrack, sizeof( s_bgTrack.loopName ));
 
 	// open stream
-	s_bgTrack.stream = FS_OpenStream( introTrack );
+	s_bgTrack.stream = FS_OpenStream( va( "media/%s", introTrack ));
 	Q_strncpy( s_bgTrack.current, introTrack, sizeof( s_bgTrack.current ));
 	memset( &musicfade, 0, sizeof( musicfade )); // clear any soundfade
 	s_bgTrack.source = cls.key_dest;
@@ -242,7 +242,7 @@ void S_StreamBackgroundTrack( void )
 			if( s_bgTrack.loopName[0] )
 			{
 				FS_FreeStream( s_bgTrack.stream );
-				s_bgTrack.stream = FS_OpenStream( s_bgTrack.loopName );
+				s_bgTrack.stream = FS_OpenStream( va( "media/%s", s_bgTrack.loopName ));
 				Q_strncpy( s_bgTrack.current, s_bgTrack.loopName, sizeof( s_bgTrack.current ));
 
 				if( !s_bgTrack.stream ) return;

engine/client/sound.h

@@ -113,11 +113,10 @@ typedef struct snd_format_s
 typedef struct
 {
 	snd_format_t	format;
-	int				samples;		// mono samples in buffer
+	int		samples;		// mono samples in buffer
-	int				samplepos;	// in mono samples
+	int		samplepos;	// in mono samples
-	byte			*buffer;
+	byte		*buffer;
 	qboolean		initialized;	// sound engine is active
-	const char		*backendName;
 } dma_t;
 
 #include "vox.h"
@@ -203,7 +202,7 @@ typedef struct
 
 #define MAX_DYNAMIC_CHANNELS	(60 + NUM_AMBIENTS)
 #define MAX_CHANNELS	(256 + MAX_DYNAMIC_CHANNELS)	// Scourge Of Armagon has too many static sounds on hip2m4.bsp
-#define MAX_RAW_CHANNELS	48
+#define MAX_RAW_CHANNELS	16
 #define MAX_RAW_SAMPLES	8192
 
 extern sound_t	ambient_sfx[NUM_AMBIENTS];
@@ -272,10 +271,11 @@ int S_GetCurrentStaticSounds( soundlist_t *pout, int size );
 int S_GetCurrentDynamicSounds( soundlist_t *pout, int size );
 sfx_t *S_GetSfxByHandle( sound_t handle );
 rawchan_t *S_FindRawChannel( int entnum, qboolean create );
-void S_RawEntSamples( int entnum, uint samples, uint rate, word width, word channels, const byte *data, int snd_vol );
 void S_RawSamples( uint samples, uint rate, word width, word channels, const byte *data, int entnum );
 void S_StopSound( int entnum, int channel, const char *soundname );
 void S_UpdateFrame( struct ref_viewpass_s *rvp );
+uint S_GetRawSamplesLength( int entnum );
+void S_ClearRawChannel( int entnum );
 void S_StopAllSounds( qboolean ambient );
 void S_FreeSounds( void );
 
@@ -283,12 +283,9 @@ void S_FreeSounds( void );
 // s_mouth.c
 //
 void SND_InitMouth( int entnum, int entchannel );
-void SND_ForceInitMouth( int entnum );
 void SND_MoveMouth8( channel_t *ch, wavdata_t *pSource, int count );
 void SND_MoveMouth16( channel_t *ch, wavdata_t *pSource, int count );
-void SND_MoveMouthRaw( rawchan_t *ch, portable_samplepair_t *pData, int count );
 void SND_CloseMouth( channel_t *ch );
-void SND_ForceCloseMouth( int entnum );
 
 //
 // s_stream.c
@@ -304,7 +301,6 @@ void S_FadeMusicVolume( float fadePercent );
 //
 int S_ZeroCrossingAfter( wavdata_t *pWaveData, int sample );
 int S_ZeroCrossingBefore( wavdata_t *pWaveData, int sample );
-int S_ConvertLoopedPosition( wavdata_t *pSource, int samplePosition, qboolean use_loop );
 int S_GetOutputData( wavdata_t *pSource, void **pData, int samplePosition, int sampleCount, qboolean use_loop );
 void S_SetSampleStart( channel_t *pChan, wavdata_t *pSource, int newPosition );
 void S_SetSampleEnd( channel_t *pChan, wavdata_t *pSource, int newEndPosition );

engine/client/titles.c

@@ -218,7 +218,6 @@ void CL_TextMessageParse( byte *pMemFile, int fileSize )
 	client_textmessage_t	textMessages[MAX_MESSAGES];
 	int			i, nameHeapSize, textHeapSize, messageSize, nameOffset;
 	int			messageCount, lastNamePos;
-	size_t		textHeapSizeRemaining;
 
 	lastNamePos = 0;
 	lineNumber = 0;
@@ -253,7 +252,7 @@ void CL_TextMessageParse( byte *pMemFile, int fileSize )
 				Con_Reportf( "TextMessage: unexpected '}' found, line %d\n", lineNumber );
 				return;
 			}
-			Q_strncpy( currentName, trim, sizeof( currentName ));
+			Q_strcpy( currentName, trim );
 			break;
 		case MSGFILE_TEXT:
 			if( IsEndOfText( trim ))
@@ -267,7 +266,7 @@ void CL_TextMessageParse( byte *pMemFile, int fileSize )
 					return;
 				}
 
-				Q_strncpy( nameHeap + lastNamePos, currentName, sizeof( nameHeap ) - lastNamePos );
+				Q_strcpy( nameHeap + lastNamePos, currentName );
 
 				// terminate text in-place in the memory file
 				// (it's temporary memory that will be deleted)
@@ -330,20 +329,15 @@ void CL_TextMessageParse( byte *pMemFile, int fileSize )
 
 
 	// copy text & fixup pointers
-	textHeapSizeRemaining = textHeapSize;
 	pCurrentText = pNameHeap + nameHeapSize;
 
 	for( i = 0; i < messageCount; i++ )
 	{
-		size_t currentTextSize = Q_strlen( clgame.titles[i].pMessage ) + 1;
-
 		clgame.titles[i].pName = pNameHeap;			// adjust name pointer (parallel buffer)
-		Q_strncpy( pCurrentText, clgame.titles[i].pMessage, textHeapSizeRemaining );	// copy text over
+		Q_strcpy( pCurrentText, clgame.titles[i].pMessage );	// copy text over
 		clgame.titles[i].pMessage = pCurrentText;
-
 		pNameHeap += Q_strlen( pNameHeap ) + 1;
-		pCurrentText += currentTextSize;
+		pCurrentText += Q_strlen( pCurrentText ) + 1;
-		textHeapSizeRemaining -= currentTextSize;
 	}
 
 	if(( pCurrentText - (char *)clgame.titles ) != ( textHeapSize + nameHeapSize + messageSize ))

engine/client/vgui/vgui_draw.c

@@ -21,79 +21,146 @@ GNU General Public License for more details.
 #include "keydefs.h"
 #include "ref_common.h"
 #include "input.h"
+#ifdef XASH_SDL
+#include <SDL.h>
+static SDL_Cursor* s_pDefaultCursor[20];
+#endif
 #include "platform/platform.h"
 
-CVAR_DEFINE_AUTO( vgui_utf8, "0", FCVAR_ARCHIVE, "enable utf-8 support for vgui text" );
+static enum VGUI_KeyCode s_pVirtualKeyTrans[256];
+static enum VGUI_DefaultCursor s_currentCursor;
+static HINSTANCE s_pVGuiSupport; // vgui_support library
+static convar_t	*vgui_utf8 = NULL;
 
-static void GAME_EXPORT *VGUI_EngineMalloc( size_t size );
+// Helper functions for vgui backend
-static void GAME_EXPORT VGUI_GetMousePos( int *, int * );
-static void GAME_EXPORT VGUI_CursorSelect( VGUI_DefaultCursor );
-static byte GAME_EXPORT VGUI_GetColor( int, int );
-static int GAME_EXPORT VGUI_UtfProcessChar( int in );
-static qboolean GAME_EXPORT VGUI_IsInGame( void );
 
-static struct
+/*void VGUI_HideCursor( void )
 {
-	qboolean initialized;
+	host.mouse_visible = false;
-	vgui_support_interface_t dllFuncs;
+	SDL_HideCursor();
-	VGUI_DefaultCursor cursor;
+}
 
-	HINSTANCE hInstance;
+void VGUI_ShowCursor( void )
-
-	enum VGUI_KeyCode virtualKeyTrans[256];
-} vgui =
 {
-	false,
+	host.mouse_visible = true;
-	{ 0 }, // not initialized yet
+	SDL_ShowCursor();
-	-1
+}*/
-};
 
-static void GAME_EXPORT *VGUI_EngineMalloc( size_t size )
+void GAME_EXPORT *VGUI_EngineMalloc(size_t size)
 {
 	return Z_Malloc( size );
 }
 
-static qboolean GAME_EXPORT VGUI_IsInGame( void )
+qboolean GAME_EXPORT VGUI_IsInGame( void )
 {
 	return cls.state == ca_active && cls.key_dest == key_game;
 }
 
-static void GAME_EXPORT VGUI_GetMousePos( int *_x, int *_y )
+void GAME_EXPORT VGUI_GetMousePos( int *_x, int *_y )
 {
 	float xscale = (float)refState.width / (float)clgame.scrInfo.iWidth;
 	float yscale = (float)refState.height / (float)clgame.scrInfo.iHeight;
 	int x, y;
 
 	Platform_GetMousePos( &x, &y );
-	*_x = x / xscale;
+	*_x = x / xscale, *_y = y / yscale;
-	*_y = y / yscale;
 }
 
-static void GAME_EXPORT VGUI_CursorSelect( VGUI_DefaultCursor cursor )
+void VGUI_InitCursors( void )
 {
-	if( vgui.cursor != cursor )
+	// load up all default cursors
-		Platform_SetCursorType( cursor );
+#if SDL_VERSION_ATLEAST( 2, 0, 0 )
+	s_pDefaultCursor[dc_none] = NULL;
+	s_pDefaultCursor[dc_arrow] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
+	s_pDefaultCursor[dc_ibeam] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
+	s_pDefaultCursor[dc_hourglass]= SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_WAIT);
+	s_pDefaultCursor[dc_crosshair]= SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_CROSSHAIR);
+	s_pDefaultCursor[dc_up] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
+	s_pDefaultCursor[dc_sizenwse] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE);
+	s_pDefaultCursor[dc_sizenesw] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW);
+	s_pDefaultCursor[dc_sizewe] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE);
+	s_pDefaultCursor[dc_sizens] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS);
+	s_pDefaultCursor[dc_sizeall] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL);
+	s_pDefaultCursor[dc_no] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_NO);
+	s_pDefaultCursor[dc_hand] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
+	//host.mouse_visible = true;
+	SDL_SetCursor( s_pDefaultCursor[dc_arrow] );
+#endif
 }
 
-static byte GAME_EXPORT VGUI_GetColor( int i, int j )
+void GAME_EXPORT VGUI_CursorSelect(enum VGUI_DefaultCursor cursor )
+{
+	qboolean visible;
+	if( cls.key_dest != key_game || cl.paused )
+		return;
+
+	switch( cursor )
+	{
+		case dc_user:
+		case dc_none:
+			visible = false;
+			break;
+		default:
+		visible = true;
+		break;
+	}
+
+#if SDL_VERSION_ATLEAST( 2, 0, 0 )
+	/// TODO: platform cursors
+
+	if( CVAR_TO_BOOL( touch_emulate ) )
+		return;
+	if( host.mouse_visible )
+	{
+		SDL_SetRelativeMouseMode( SDL_FALSE );
+		SDL_SetCursor( s_pDefaultCursor[cursor] );
+		SDL_ShowCursor( true );
+	}
+	else
+	{
+		SDL_ShowCursor( false );
+		if( host.mouse_visible )
+			SDL_GetRelativeMouseState( NULL, NULL );
+		Key_EnableTextInput( false, true );
+	}
+	//SDL_SetRelativeMouseMode(false);
+#endif
+	if( s_currentCursor == cursor )
+		return;
+
+	s_currentCursor = cursor;
+	host.mouse_visible = visible;
+}
+
+byte GAME_EXPORT VGUI_GetColor( int i, int j)
 {
 	return g_color_table[i][j];
 }
 
-static int GAME_EXPORT VGUI_UtfProcessChar( int in )
+// Define and initialize vgui API
+
+void GAME_EXPORT VGUI_SetVisible( qboolean state )
 {
-	if( vgui_utf8.value )
+	host.mouse_visible=state;
+#ifdef XASH_SDL
+	SDL_ShowCursor( state );
+	if( !state )
+		SDL_GetRelativeMouseState( NULL, NULL );
+#endif
+	Key_EnableTextInput( false, true );
+}
+
+int GAME_EXPORT VGUI_UtfProcessChar( int in )
+{
+	if( CVAR_TO_BOOL( vgui_utf8 ) )
 		return Con_UtfProcessCharForce( in );
-	return in;
+	else
+		return in;
 }
 
-qboolean VGui_IsActive( void )
+vguiapi_t vgui =
-{
-	return vgui.initialized;
-}
-
-static vgui_support_api_t gEngfuncs =
 {
+	false, // Not initialized yet
 	NULL, // VGUI_DrawInit,
 	NULL, // VGUI_DrawShutdown,
 	NULL, // VGUI_SetupDrawingText,
@@ -108,21 +175,29 @@ static vgui_support_api_t gEngfuncs =
 	NULL, // VGUI_GetTextureSizes,
 	NULL, // VGUI_GenerateTexture,
 	VGUI_EngineMalloc,
+/*	VGUI_ShowCursor,
+	VGUI_HideCursor,*/
 	VGUI_CursorSelect,
 	VGUI_GetColor,
 	VGUI_IsInGame,
-	Key_EnableTextInput,
+	VGUI_SetVisible,
 	VGUI_GetMousePos,
 	VGUI_UtfProcessChar,
-	Platform_GetClipboardText,
+	NULL,
-	Platform_SetClipboardText,
+	NULL,
-	Platform_GetKeyModifiers,
+	NULL,
-	COM_LoadLibrary,
+	NULL,
-	COM_FreeLibrary,
+	NULL,
-	COM_GetProcAddress,
+	NULL,
+	NULL,
 };
 
-static void VGui_FillAPIFromRef( vgui_support_api_t *to, const ref_interface_t *from )
+qboolean VGui_IsActive( void )
+{
+	return vgui.initialized;
+}
+
+void VGui_FillAPIFromRef( vguiapi_t *to, const ref_interface_t *from )
 {
 	to->DrawInit = from->VGUI_DrawInit;
 	to->DrawShutdown = from->VGUI_DrawShutdown;
@@ -139,184 +214,130 @@ static void VGui_FillAPIFromRef( vgui_support_api_t *to, const ref_interface_t *
 	to->GenerateTexture = from->VGUI_GenerateTexture;
 }
 
-void VGui_RegisterCvars( void )
-{
-	Cvar_RegisterVariable( &vgui_utf8 );
-}
-
-static HINSTANCE VGui_LoadSupportLibrary( void )
-{
-	string vguiloader;
-	string vguilib;
-	HINSTANCE hInstance;
-
-	// HACKHACK: try to load path from custom path
-	// to support having different versions of VGUI
-	if( Sys_GetParmFromCmdLine( "-vguilib", vguilib ) && !COM_LoadLibrary( vguilib, false, false ))
-	{
-		Con_Reportf( S_WARN "VGUI preloading failed. Default library will be used! Reason: %s", COM_GetLibraryError());
-	}
-
-	if( !Sys_GetParmFromCmdLine( "-vguiloader", vguiloader ))
-	{
-		Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, sizeof( vguiloader ));
-	}
-
-	hInstance = COM_LoadLibrary( vguiloader, false, false );
-
-	if( !hInstance )
-	{
-		if( FS_FileExists( vguiloader, false ))
-			Con_Reportf( S_ERROR "Failed to load vgui_support library: %s\n", COM_GetLibraryError() );
-		else Con_Reportf( "vgui_support: not found\n" );
-	}
-
-	return hInstance;
-}
-
-static qboolean VGui_ProbeNewAPI( HINSTANCE hInstance,
-	vgui_support_interface_t *iface, const vgui_support_api_t *api )
-{
-	const int version = VGUI_SUPPORT_API_VERSION;
-	static vgui_support_api_t localapi;
-	VGUISUPPORTAPI F;
-
-	F = COM_GetProcAddress( hInstance, GET_VGUI_SUPPORT_API );
-
-	if( !F )
-		return false;
-
-	// keep local temporary copy, do not let vgui_support to mess up here
-	memcpy( &localapi, api, sizeof( localapi ));
-
-	if( F( version, iface, &localapi ) != version )
-		return false;
-
-	Con_Reportf( "vgui_support: initialized new API\n" );
-
-	return true;
-}
-
-static qboolean VGui_ProbeOldAPI( HINSTANCE hInstance,
-	vgui_support_interface_t *iface, const vgui_support_api_t *api,
-	qboolean client )
-{
-	static legacy_vguiapi_t localapi;
-	LEGACY_VGUISUPPORTAPI F;
-
-	F = COM_GetProcAddress( hInstance, client ? LEGACY_CLIENT_GET_VGUI_SUPPORT_API : LEGACY_GET_VGUI_SUPPORT_API );
-
-	if( !F )
-		return false;
-
-	memset( &localapi, 0, sizeof( localapi ));
-	localapi.DrawInit = api->DrawInit;
-	localapi.DrawShutdown = api->DrawShutdown;
-	localapi.SetupDrawingText = api->SetupDrawingText;
-	localapi.SetupDrawingRect = api->SetupDrawingRect;
-	localapi.SetupDrawingImage = api->SetupDrawingImage;
-	localapi.BindTexture = api->BindTexture;
-	localapi.EnableTexture = api->EnableTexture;
-	localapi.CreateTexture = api->CreateTexture;
-	localapi.UploadTexture = api->UploadTexture;
-	localapi.UploadTextureBlock = api->UploadTextureBlock;
-	localapi.DrawQuad = api->DrawQuad;
-	localapi.GetTextureSizes = api->GetTextureSizes;
-	localapi.GenerateTexture = api->GenerateTexture;
-	localapi.EngineMalloc = api->EngineMalloc;
-	localapi.CursorSelect = api->CursorSelect;
-	localapi.GetColor = api->GetColor;
-	localapi.IsInGame = api->IsInGame;
-	localapi.EnableTextInput = api->EnableTextInput;
-	localapi.GetCursorPos = api->GetCursorPos;
-	localapi.ProcessUtfChar = api->ProcessUtfChar;
-	localapi.GetClipboardText = api->GetClipboardText;
-	localapi.SetClipboardText = api->SetClipboardText;
-	localapi.GetKeyModifiers = api->GetKeyModifiers;
-
-	F( &localapi );
-
-	localapi.initialized = true;
-
-	iface->Startup = localapi.Startup;
-	iface->Shutdown = localapi.Shutdown;
-	iface->GetPanel = localapi.GetPanel;
-	iface->Paint = localapi.Paint;
-	iface->Mouse = localapi.Mouse;
-	iface->Key = localapi.Key;
-	iface->MouseMove = localapi.MouseMove;
-	iface->TextInput = localapi.TextInput;
-
-	Con_Reportf( "vgui_support: initialized legacy API in %s module\n", client ? "client" : "support" );
-
-	return true;
-}
-
-qboolean VGui_LoadProgs( HINSTANCE hInstance )
-{
-	LEGACY_VGUISUPPORTAPI F;
-	qboolean client = hInstance != NULL;
-
-	// not loading interface from client.dll, load vgui_support.dll instead
-	if( !client )
-	{
-		hInstance = vgui.hInstance = VGui_LoadSupportLibrary();
-
-		if( !hInstance )
-			return false;
-	}
-
-	// prepare api funcs
-	VGui_FillAPIFromRef( &gEngfuncs, &ref.dllFuncs );
-
-	// try new API first
-	if( !VGui_ProbeNewAPI( vgui.hInstance, &vgui.dllFuncs, &gEngfuncs ))
-	{
-		// try legacy API next
-		if( !VGui_ProbeOldAPI( vgui.hInstance, &vgui.dllFuncs, &gEngfuncs, client ))
-		{
-			Con_Reportf( S_ERROR "Failed to find VGUI support API entry point in %s module\n", client ? "client" : "support" );
-			return false;
-		}
-	}
-
-	vgui.initialized = true;
-	return true;
-}
-
 /*
 ================
 VGui_Startup
 
+Load vgui_support library and call VGui_Startup
 ================
 */
-void VGui_Startup( HINSTANCE clientInstance, int width, int height )
+void VGui_Startup( const char *clientlib, int width, int height )
 {
-	// vgui not initialized from both support and client modules, skip
+	static qboolean failed = false;
-	if( !vgui.initialized )
+
+	void (*F) ( vguiapi_t * );
+	char vguiloader[256];
+	char vguilib[256];
+
+	vguiloader[0] = vguilib[0] = '\0';
+
+	if( failed )
 		return;
 
-	height = Q_max( 480, height );
+	if( !vgui.initialized )
-
-	if( width <= 640 ) width = 640;
-	else if( width <= 800 ) width = 800;
-	else if( width <= 1024 ) width = 1024;
-	else if( width <= 1152 ) width = 1152;
-	else if( width <= 1280 ) width = 1280;
-	else if( width <= 1600 ) width = 1600;
-
-	if( !clientInstance )
 	{
-		if( vgui.dllFuncs.Startup )
+		vgui_utf8 = Cvar_Get( "vgui_utf8", "0", FCVAR_ARCHIVE, "enable utf-8 support for vgui text" );
-			vgui.dllFuncs.Startup( width, height );
+
+		VGui_FillAPIFromRef( &vgui, &ref.dllFuncs );
+
+#ifdef XASH_INTERNAL_GAMELIBS
+		s_pVGuiSupport = COM_LoadLibrary( clientlib, false, false );
+
+		if( s_pVGuiSupport )
+		{
+			F = COM_GetProcAddress( s_pVGuiSupport, "InitVGUISupportAPI" );
+			if( F )
+			{
+				F( &vgui );
+				vgui.initialized = true;
+				VGUI_InitCursors();
+				Con_Reportf( "vgui_support: found interal client support\n" );
+			}
+		}
+#endif // XASH_INTERNAL_GAMELIBS
+
+		// HACKHACK: load vgui with correct path first if specified.
+		// it will be reused while resolving vgui support and client deps
+		if( Sys_GetParmFromCmdLine( "-vguilib", vguilib ) )
+		{
+			if( Q_strstr( vguilib, ".dll") )
+				Q_strncpy( vguiloader, "vgui_support.dll", 256 );
+			else
+				Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, 256 );
+
+			if( !COM_LoadLibrary( vguilib, false, false ) )
+				Con_Reportf( S_WARN "VGUI preloading failed. Default library will be used! Reason: %s\n", COM_GetLibraryError());
+		}
+
+		if( Q_strstr( clientlib, ".dll" ) )
+			Q_strncpy( vguiloader, "vgui_support.dll", 256 );
+
+		if( !vguiloader[0] && !Sys_GetParmFromCmdLine( "-vguiloader", vguiloader ) )
+			Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, 256 );
+
+		s_pVGuiSupport = COM_LoadLibrary( vguiloader, false, false );
+
+		if( !s_pVGuiSupport )
+		{
+			s_pVGuiSupport = COM_LoadLibrary( va( "../%s", vguiloader ), false, false );
+		}
+
+		if( !s_pVGuiSupport )
+		{
+			if( FS_FileExists( vguiloader, false ) )
+				Con_Reportf( S_ERROR  "Failed to load vgui_support library: %s\n", COM_GetLibraryError() );
+			else
+				Con_Reportf( "vgui_support: not found\n" );
+		}
+		else
+		{
+			F = COM_GetProcAddress( s_pVGuiSupport, "InitAPI" );
+			if( F )
+			{
+				F( &vgui );
+				vgui.initialized = true;
+				VGUI_InitCursors();
+			}
+			else
+				Con_Reportf( S_ERROR  "Failed to find vgui_support library entry point!\n" );
+		}
+
 	}
-	else
+
+	if( height < 480 )
+		height = 480;
+
+	if( width <= 640 )
+		width = 640;
+	else if( width <= 800 )
+		width = 800;
+	else if( width <= 1024 )
+		width = 1024;
+	else if( width <= 1152 )
+		width = 1152;
+	else if( width <= 1280 )
+		width = 1280;
+	else if( width <= 1600 )
+		width = 1600;
+#ifdef XASH_DLL_LOADER
+	else if ( Q_strstr( vguiloader, ".dll" ) )
+		width = 1600;
+#endif
+
+
+	if( vgui.initialized )
 	{
-		if( vgui.dllFuncs.ClientStartup )
+		//host.mouse_visible = true;
-			vgui.dllFuncs.ClientStartup( clientInstance, width, height );
+		vgui.Startup( width, height );
+	}
+	else if ( COM_CheckString( clientlib ) )
+	{
+		failed = true;
 	}
 }
 
+
+
 /*
 ================
 VGui_Shutdown
@@ -326,223 +347,207 @@ Unload vgui_support library and call VGui_Shutdown
 */
 void VGui_Shutdown( void )
 {
-	if( vgui.dllFuncs.Shutdown )
+	if( vgui.Shutdown )
-		vgui.dllFuncs.Shutdown();
+		vgui.Shutdown();
 
-	if( vgui.hInstance )
+	if( s_pVGuiSupport )
-		COM_FreeLibrary( vgui.hInstance );
+		COM_FreeLibrary( s_pVGuiSupport );
+	s_pVGuiSupport = NULL;
 
-	vgui.hInstance = NULL;
 	vgui.initialized = false;
 }
 
 
-static void VGUI_InitKeyTranslationTable( void )
+void VGUI_InitKeyTranslationTable( void )
 {
-	static qboolean initialized = false;
+	static qboolean bInitted = false;
 
-	if( initialized ) return;
+	if( bInitted )
-
+		return;
-	initialized = true;
+	bInitted = true;
 
 	// set virtual key translation table
-	memset( vgui.virtualKeyTrans, -1, sizeof( vgui.virtualKeyTrans ) );
+	memset( s_pVirtualKeyTrans, -1, sizeof( s_pVirtualKeyTrans ) );
 
-	// TODO: engine keys are not enough here!
+	s_pVirtualKeyTrans['0'] = KEY_0;
-	// make crossplatform way to pass SDL keys here
+	s_pVirtualKeyTrans['1'] = KEY_1;
+	s_pVirtualKeyTrans['2'] = KEY_2;
+	s_pVirtualKeyTrans['3'] = KEY_3;
+	s_pVirtualKeyTrans['4'] = KEY_4;
+	s_pVirtualKeyTrans['5'] = KEY_5;
+	s_pVirtualKeyTrans['6'] = KEY_6;
+	s_pVirtualKeyTrans['7'] = KEY_7;
+	s_pVirtualKeyTrans['8'] = KEY_8;
+	s_pVirtualKeyTrans['9'] = KEY_9;
+	s_pVirtualKeyTrans['A'] = s_pVirtualKeyTrans['a'] = KEY_A;
+	s_pVirtualKeyTrans['B'] = s_pVirtualKeyTrans['b'] = KEY_B;
+	s_pVirtualKeyTrans['C'] = s_pVirtualKeyTrans['c'] = KEY_C;
+	s_pVirtualKeyTrans['D'] = s_pVirtualKeyTrans['d'] = KEY_D;
+	s_pVirtualKeyTrans['E'] = s_pVirtualKeyTrans['e'] = KEY_E;
+	s_pVirtualKeyTrans['F'] = s_pVirtualKeyTrans['f'] = KEY_F;
+	s_pVirtualKeyTrans['G'] = s_pVirtualKeyTrans['g'] = KEY_G;
+	s_pVirtualKeyTrans['H'] = s_pVirtualKeyTrans['h'] = KEY_H;
+	s_pVirtualKeyTrans['I'] = s_pVirtualKeyTrans['i'] = KEY_I;
+	s_pVirtualKeyTrans['J'] = s_pVirtualKeyTrans['j'] = KEY_J;
+	s_pVirtualKeyTrans['K'] = s_pVirtualKeyTrans['k'] = KEY_K;
+	s_pVirtualKeyTrans['L'] = s_pVirtualKeyTrans['l'] = KEY_L;
+	s_pVirtualKeyTrans['M'] = s_pVirtualKeyTrans['m'] = KEY_M;
+	s_pVirtualKeyTrans['N'] = s_pVirtualKeyTrans['n'] = KEY_N;
+	s_pVirtualKeyTrans['O'] = s_pVirtualKeyTrans['o'] = KEY_O;
+	s_pVirtualKeyTrans['P'] = s_pVirtualKeyTrans['p'] = KEY_P;
+	s_pVirtualKeyTrans['Q'] = s_pVirtualKeyTrans['q'] = KEY_Q;
+	s_pVirtualKeyTrans['R'] = s_pVirtualKeyTrans['r'] = KEY_R;
+	s_pVirtualKeyTrans['S'] = s_pVirtualKeyTrans['s'] = KEY_S;
+	s_pVirtualKeyTrans['T'] = s_pVirtualKeyTrans['t'] = KEY_T;
+	s_pVirtualKeyTrans['U'] = s_pVirtualKeyTrans['u'] = KEY_U;
+	s_pVirtualKeyTrans['V'] = s_pVirtualKeyTrans['v'] = KEY_V;
+	s_pVirtualKeyTrans['W'] = s_pVirtualKeyTrans['w'] = KEY_W;
+	s_pVirtualKeyTrans['X'] = s_pVirtualKeyTrans['x'] = KEY_X;
+	s_pVirtualKeyTrans['Y'] = s_pVirtualKeyTrans['y'] = KEY_Y;
+	s_pVirtualKeyTrans['Z'] = s_pVirtualKeyTrans['z'] = KEY_Z;
 
-	vgui.virtualKeyTrans['0'] = KEY_0;
+	s_pVirtualKeyTrans[K_KP_5 - 5] = KEY_PAD_0;
-	vgui.virtualKeyTrans['1'] = KEY_1;
+	s_pVirtualKeyTrans[K_KP_5 - 4] = KEY_PAD_1;
-	vgui.virtualKeyTrans['2'] = KEY_2;
+	s_pVirtualKeyTrans[K_KP_5 - 3] = KEY_PAD_2;
-	vgui.virtualKeyTrans['3'] = KEY_3;
+	s_pVirtualKeyTrans[K_KP_5 - 2] = KEY_PAD_3;
-	vgui.virtualKeyTrans['4'] = KEY_4;
+	s_pVirtualKeyTrans[K_KP_5 - 1] = KEY_PAD_4;
-	vgui.virtualKeyTrans['5'] = KEY_5;
+	s_pVirtualKeyTrans[K_KP_5 - 0] = KEY_PAD_5;
-	vgui.virtualKeyTrans['6'] = KEY_6;
+	s_pVirtualKeyTrans[K_KP_5 + 1] = KEY_PAD_6;
-	vgui.virtualKeyTrans['7'] = KEY_7;
+	s_pVirtualKeyTrans[K_KP_5 + 2] = KEY_PAD_7;
-	vgui.virtualKeyTrans['8'] = KEY_8;
+	s_pVirtualKeyTrans[K_KP_5 + 3] = KEY_PAD_8;
-	vgui.virtualKeyTrans['9'] = KEY_9;
+	s_pVirtualKeyTrans[K_KP_5 + 4] = KEY_PAD_9;
-	vgui.virtualKeyTrans['A'] = vgui.virtualKeyTrans['a'] = KEY_A;
+	s_pVirtualKeyTrans[K_KP_SLASH]	= KEY_PAD_DIVIDE;
-	vgui.virtualKeyTrans['B'] = vgui.virtualKeyTrans['b'] = KEY_B;
+	s_pVirtualKeyTrans['*'] = KEY_PAD_MULTIPLY;
-	vgui.virtualKeyTrans['C'] = vgui.virtualKeyTrans['c'] = KEY_C;
+	s_pVirtualKeyTrans[K_KP_MINUS] = KEY_PAD_MINUS;
-	vgui.virtualKeyTrans['D'] = vgui.virtualKeyTrans['d'] = KEY_D;
+	s_pVirtualKeyTrans[K_KP_PLUS] = KEY_PAD_PLUS;
-	vgui.virtualKeyTrans['E'] = vgui.virtualKeyTrans['e'] = KEY_E;
+	s_pVirtualKeyTrans[K_KP_ENTER]	= KEY_PAD_ENTER;
-	vgui.virtualKeyTrans['F'] = vgui.virtualKeyTrans['f'] = KEY_F;
+	//s_pVirtualKeyTrans[K_KP_DECIMAL] = KEY_PAD_DECIMAL;
-	vgui.virtualKeyTrans['G'] = vgui.virtualKeyTrans['g'] = KEY_G;
+	s_pVirtualKeyTrans['['] = KEY_LBRACKET;
-	vgui.virtualKeyTrans['H'] = vgui.virtualKeyTrans['h'] = KEY_H;
+	s_pVirtualKeyTrans[']'] = KEY_RBRACKET;
-	vgui.virtualKeyTrans['I'] = vgui.virtualKeyTrans['i'] = KEY_I;
+	s_pVirtualKeyTrans[';'] = KEY_SEMICOLON;
-	vgui.virtualKeyTrans['J'] = vgui.virtualKeyTrans['j'] = KEY_J;
+	s_pVirtualKeyTrans['\''] = KEY_APOSTROPHE;
-	vgui.virtualKeyTrans['K'] = vgui.virtualKeyTrans['k'] = KEY_K;
+	s_pVirtualKeyTrans['`'] = KEY_BACKQUOTE;
-	vgui.virtualKeyTrans['L'] = vgui.virtualKeyTrans['l'] = KEY_L;
+	s_pVirtualKeyTrans[','] = KEY_COMMA;
-	vgui.virtualKeyTrans['M'] = vgui.virtualKeyTrans['m'] = KEY_M;
+	s_pVirtualKeyTrans['.'] = KEY_PERIOD;
-	vgui.virtualKeyTrans['N'] = vgui.virtualKeyTrans['n'] = KEY_N;
+	s_pVirtualKeyTrans[K_KP_SLASH] = KEY_SLASH;
-	vgui.virtualKeyTrans['O'] = vgui.virtualKeyTrans['o'] = KEY_O;
+	s_pVirtualKeyTrans['\\'] = KEY_BACKSLASH;
-	vgui.virtualKeyTrans['P'] = vgui.virtualKeyTrans['p'] = KEY_P;
+	s_pVirtualKeyTrans['-'] = KEY_MINUS;
-	vgui.virtualKeyTrans['Q'] = vgui.virtualKeyTrans['q'] = KEY_Q;
+	s_pVirtualKeyTrans['='] = KEY_EQUAL;
-	vgui.virtualKeyTrans['R'] = vgui.virtualKeyTrans['r'] = KEY_R;
+	s_pVirtualKeyTrans[K_ENTER]	= KEY_ENTER;
-	vgui.virtualKeyTrans['S'] = vgui.virtualKeyTrans['s'] = KEY_S;
+	s_pVirtualKeyTrans[K_SPACE] = KEY_SPACE;
-	vgui.virtualKeyTrans['T'] = vgui.virtualKeyTrans['t'] = KEY_T;
+	s_pVirtualKeyTrans[K_BACKSPACE] = KEY_BACKSPACE;
-	vgui.virtualKeyTrans['U'] = vgui.virtualKeyTrans['u'] = KEY_U;
+	s_pVirtualKeyTrans[K_TAB] = KEY_TAB;
-	vgui.virtualKeyTrans['V'] = vgui.virtualKeyTrans['v'] = KEY_V;
+	s_pVirtualKeyTrans[K_CAPSLOCK] = KEY_CAPSLOCK;
-	vgui.virtualKeyTrans['W'] = vgui.virtualKeyTrans['w'] = KEY_W;
+	s_pVirtualKeyTrans[K_KP_NUMLOCK] = KEY_NUMLOCK;
-	vgui.virtualKeyTrans['X'] = vgui.virtualKeyTrans['x'] = KEY_X;
+	s_pVirtualKeyTrans[K_ESCAPE]	= KEY_ESCAPE;
-	vgui.virtualKeyTrans['Y'] = vgui.virtualKeyTrans['y'] = KEY_Y;
+	//s_pVirtualKeyTrans[K_KP_SCROLLLOCK]	= KEY_SCROLLLOCK;
-	vgui.virtualKeyTrans['Z'] = vgui.virtualKeyTrans['z'] = KEY_Z;
+	s_pVirtualKeyTrans[K_INS]	= KEY_INSERT;
-
+	s_pVirtualKeyTrans[K_DEL]	= KEY_DELETE;
-	vgui.virtualKeyTrans[K_KP_5 - 5] = KEY_PAD_0;
+	s_pVirtualKeyTrans[K_HOME] = KEY_HOME;
-	vgui.virtualKeyTrans[K_KP_5 - 4] = KEY_PAD_1;
+	s_pVirtualKeyTrans[K_END] = KEY_END;
-	vgui.virtualKeyTrans[K_KP_5 - 3] = KEY_PAD_2;
+	s_pVirtualKeyTrans[K_PGUP] = KEY_PAGEUP;
-	vgui.virtualKeyTrans[K_KP_5 - 2] = KEY_PAD_3;
+	s_pVirtualKeyTrans[K_PGDN] = KEY_PAGEDOWN;
-	vgui.virtualKeyTrans[K_KP_5 - 1] = KEY_PAD_4;
+	s_pVirtualKeyTrans[K_PAUSE] = KEY_BREAK;
-	vgui.virtualKeyTrans[K_KP_5 - 0] = KEY_PAD_5;
+	//s_pVirtualKeyTrans[K_SHIFT] = KEY_RSHIFT;
-	vgui.virtualKeyTrans[K_KP_5 + 1] = KEY_PAD_6;
+	s_pVirtualKeyTrans[K_SHIFT] = KEY_LSHIFT;	// SHIFT -> left SHIFT
-	vgui.virtualKeyTrans[K_KP_5 + 2] = KEY_PAD_7;
+	//s_pVirtualKeyTrans[SDLK_RALT] = KEY_RALT;
-	vgui.virtualKeyTrans[K_KP_5 + 3] = KEY_PAD_8;
+	s_pVirtualKeyTrans[K_ALT] = KEY_LALT;		// ALT -> left ALT
-	vgui.virtualKeyTrans[K_KP_5 + 4] = KEY_PAD_9;
+	//s_pVirtualKeyTrans[SDLK_RCTRL] = KEY_RCONTROL;
-	vgui.virtualKeyTrans[K_KP_SLASH] = KEY_PAD_DIVIDE;
+	s_pVirtualKeyTrans[K_CTRL] = KEY_LCONTROL;	// CTRL -> left CTRL
-	vgui.virtualKeyTrans['*']        = KEY_PAD_MULTIPLY;
+	s_pVirtualKeyTrans[K_WIN] = KEY_LWIN;
-	vgui.virtualKeyTrans[K_KP_MINUS] = KEY_PAD_MINUS;
+	//s_pVirtualKeyTrans[SDLK_APPLICATION] = KEY_RWIN;
-	vgui.virtualKeyTrans[K_KP_PLUS]  = KEY_PAD_PLUS;
+	//s_pVirtualKeyTrans[K_WIN] = KEY_APP;
-	vgui.virtualKeyTrans[K_KP_ENTER] = KEY_PAD_ENTER;
+	s_pVirtualKeyTrans[K_UPARROW] = KEY_UP;
-	vgui.virtualKeyTrans[K_KP_NUMLOCK] = KEY_NUMLOCK;
+	s_pVirtualKeyTrans[K_LEFTARROW] = KEY_LEFT;
-	vgui.virtualKeyTrans['['] = KEY_LBRACKET;
+	s_pVirtualKeyTrans[K_DOWNARROW] = KEY_DOWN;
-	vgui.virtualKeyTrans[']'] = KEY_RBRACKET;
+	s_pVirtualKeyTrans[K_RIGHTARROW] = KEY_RIGHT;
-	vgui.virtualKeyTrans[';'] = KEY_SEMICOLON;
+	s_pVirtualKeyTrans[K_F1] = KEY_F1;
-	vgui.virtualKeyTrans['`'] = KEY_BACKQUOTE;
+	s_pVirtualKeyTrans[K_F2] = KEY_F2;
-	vgui.virtualKeyTrans[','] = KEY_COMMA;
+	s_pVirtualKeyTrans[K_F3] = KEY_F3;
-	vgui.virtualKeyTrans['.'] = KEY_PERIOD;
+	s_pVirtualKeyTrans[K_F4] = KEY_F4;
-	vgui.virtualKeyTrans['-'] = KEY_MINUS;
+	s_pVirtualKeyTrans[K_F5] = KEY_F5;
-	vgui.virtualKeyTrans['='] = KEY_EQUAL;
+	s_pVirtualKeyTrans[K_F6] = KEY_F6;
-	vgui.virtualKeyTrans['/'] = KEY_SLASH;
+	s_pVirtualKeyTrans[K_F7] = KEY_F7;
-	vgui.virtualKeyTrans['\\'] = KEY_BACKSLASH;
+	s_pVirtualKeyTrans[K_F8] = KEY_F8;
-	vgui.virtualKeyTrans['\''] = KEY_APOSTROPHE;
+	s_pVirtualKeyTrans[K_F9] = KEY_F9;
-	vgui.virtualKeyTrans[K_TAB] = KEY_TAB;
+	s_pVirtualKeyTrans[K_F10] = KEY_F10;
-	vgui.virtualKeyTrans[K_ENTER] = KEY_ENTER;
+	s_pVirtualKeyTrans[K_F11] = KEY_F11;
-	vgui.virtualKeyTrans[K_SPACE] = KEY_SPACE;
+	s_pVirtualKeyTrans[K_F12] = KEY_F12;
-	vgui.virtualKeyTrans[K_CAPSLOCK] = KEY_CAPSLOCK;
-	vgui.virtualKeyTrans[K_BACKSPACE] = KEY_BACKSPACE;
-	vgui.virtualKeyTrans[K_ESCAPE]	= KEY_ESCAPE;
-	vgui.virtualKeyTrans[K_INS] = KEY_INSERT;
-	vgui.virtualKeyTrans[K_DEL] = KEY_DELETE;
-	vgui.virtualKeyTrans[K_HOME] = KEY_HOME;
-	vgui.virtualKeyTrans[K_END] = KEY_END;
-	vgui.virtualKeyTrans[K_PGUP] = KEY_PAGEUP;
-	vgui.virtualKeyTrans[K_PGDN] = KEY_PAGEDOWN;
-	vgui.virtualKeyTrans[K_PAUSE] = KEY_BREAK;
-	vgui.virtualKeyTrans[K_SHIFT] = KEY_LSHIFT;	// SHIFT -> left SHIFT
-	vgui.virtualKeyTrans[K_ALT] = KEY_LALT;		// ALT -> left ALT
-	vgui.virtualKeyTrans[K_CTRL] = KEY_LCONTROL;	// CTRL -> left CTRL
-	vgui.virtualKeyTrans[K_WIN] = KEY_LWIN;
-	vgui.virtualKeyTrans[K_UPARROW] = KEY_UP;
-	vgui.virtualKeyTrans[K_LEFTARROW] = KEY_LEFT;
-	vgui.virtualKeyTrans[K_DOWNARROW] = KEY_DOWN;
-	vgui.virtualKeyTrans[K_RIGHTARROW] = KEY_RIGHT;
-	vgui.virtualKeyTrans[K_F1] = KEY_F1;
-	vgui.virtualKeyTrans[K_F2] = KEY_F2;
-	vgui.virtualKeyTrans[K_F3] = KEY_F3;
-	vgui.virtualKeyTrans[K_F4] = KEY_F4;
-	vgui.virtualKeyTrans[K_F5] = KEY_F5;
-	vgui.virtualKeyTrans[K_F6] = KEY_F6;
-	vgui.virtualKeyTrans[K_F7] = KEY_F7;
-	vgui.virtualKeyTrans[K_F8] = KEY_F8;
-	vgui.virtualKeyTrans[K_F9] = KEY_F9;
-	vgui.virtualKeyTrans[K_F10] = KEY_F10;
-	vgui.virtualKeyTrans[K_F11] = KEY_F11;
-	vgui.virtualKeyTrans[K_F12] = KEY_F12;
 }
 
-static enum VGUI_KeyCode VGUI_MapKey( int keyCode )
+enum VGUI_KeyCode VGUI_MapKey( int keyCode )
 {
 	VGUI_InitKeyTranslationTable();
 
-	if( keyCode >= 0 && keyCode < ARRAYSIZE( vgui.virtualKeyTrans ))
+	if( keyCode < 0 || keyCode >= (int)sizeof( s_pVirtualKeyTrans ) / (int)sizeof( s_pVirtualKeyTrans[0] ))
-		return vgui.virtualKeyTrans[keyCode];
-
-	return (enum VGUI_KeyCode)-1;
-}
-
-void VGui_MouseEvent( int key, int clicks )
-{
-	enum VGUI_MouseAction mact;
-	enum VGUI_MouseCode   code;
-
-	if( !vgui.dllFuncs.Mouse )
-		return;
-
-	switch( key )
 	{
-	case K_MOUSE1: code = MOUSE_LEFT; break;
+		//Assert( false );
-	case K_MOUSE2: code = MOUSE_RIGHT; break;
+		return (enum VGUI_KeyCode)-1;
-	case K_MOUSE3: code = MOUSE_MIDDLE; break;
-	default: return;
 	}
-
-	if( clicks >= 2 )
-		mact = MA_DOUBLE;
-	else if( clicks == 1 )
-		mact = MA_PRESSED;
 	else
-		mact = MA_RELEASED;
+	{
-
+		return s_pVirtualKeyTrans[keyCode];
-	vgui.dllFuncs.Mouse( mact, code );
+	}
-}
-
-void VGui_MWheelEvent( int y )
-{
-	if( !vgui.dllFuncs.Mouse )
-		return;
-
-	vgui.dllFuncs.Mouse( MA_WHEEL, y );
 }
 
 void VGui_KeyEvent( int key, int down )
 {
-	enum VGUI_KeyCode code;
+	if( !vgui.initialized )
-
-	if( !vgui.dllFuncs.Key )
 		return;
 
-	if(( code = VGUI_MapKey( key )) < 0 )
+	switch( key )
-		return;
-
-	if( down )
 	{
-		vgui.dllFuncs.Key( KA_PRESSED, code );
+	case K_MOUSE1:
-		vgui.dllFuncs.Key( KA_TYPED, code );
+		if( down && host.mouse_visible )
+			Key_EnableTextInput( true, false );
+		vgui.Mouse( down ? MA_PRESSED : MA_RELEASED, MOUSE_LEFT );
+		return;
+	case K_MOUSE2:
+		vgui.Mouse( down ? MA_PRESSED : MA_RELEASED, MOUSE_RIGHT );
+		return;
+	case K_MOUSE3:
+		vgui.Mouse( down ? MA_PRESSED : MA_RELEASED, MOUSE_MIDDLE );
+		return;
+	case K_MWHEELDOWN:
+		vgui.Mouse( MA_WHEEL, 1 );
+		return;
+	case K_MWHEELUP:
+		vgui.Mouse( MA_WHEEL, -1 );
+		return;
+	default:
+		break;
 	}
-	else vgui.dllFuncs.Key( KA_RELEASED, code );
+
+	if( down == 2 )
+		vgui.Key( KA_TYPED, VGUI_MapKey( key ) );
+	else
+		vgui.Key( down?KA_PRESSED:KA_RELEASED, VGUI_MapKey( key ) );
+	//Msg("VGui_KeyEvent %d %d %d\n", key, VGUI_MapKey( key ), down );
 }
 
 void VGui_MouseMove( int x, int y )
 {
-	if( vgui.dllFuncs.MouseMove )
+	float xscale = (float)refState.width / (float)clgame.scrInfo.iWidth;
-	{
+	float yscale = (float)refState.height / (float)clgame.scrInfo.iHeight;
-		float xscale = (float)refState.width / (float)clgame.scrInfo.iWidth;
+	if( vgui.initialized )
-		float yscale = (float)refState.height / (float)clgame.scrInfo.iHeight;
+		vgui.MouseMove( x / xscale, y / yscale );
-		vgui.dllFuncs.MouseMove( x / xscale, y / yscale );
-	}
 }
 
 void VGui_Paint( void )
 {
-	if( vgui.dllFuncs.Paint )
+	if(vgui.initialized)
-		vgui.dllFuncs.Paint();
+		vgui.Paint();
 }
 
-void VGui_UpdateInternalCursorState( VGUI_DefaultCursor cursorType )
+void VGui_RunFrame( void )
 {
-	vgui.cursor = cursorType;
+	//stub
 }
 
+
 void *GAME_EXPORT VGui_GetPanel( void )
 {
-	if( vgui.dllFuncs.GetPanel )
+	if( vgui.initialized )
-		return vgui.dllFuncs.GetPanel();
+		return vgui.GetPanel();
 	return NULL;
 }
-
-void VGui_ReportTextInput( const char *text )
-{
-	if( vgui.dllFuncs.TextInput )
-		vgui.dllFuncs.TextInput( text );
-}
-

engine/client/vgui/vgui_draw.h

@@ -16,22 +16,24 @@ GNU General Public License for more details.
 #ifndef VGUI_DRAW_H
 #define VGUI_DRAW_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "port.h"
+
 //
 // vgui_draw.c
 //
-void VGui_RegisterCvars( void );
+void VGui_Startup( const char *clientlib, int width, int height );
-qboolean VGui_LoadProgs( HINSTANCE hInstance );
-void VGui_Startup( HINSTANCE clientInstance, int width, int height );
 void VGui_Shutdown( void );
 void VGui_Paint( void );
 void VGui_RunFrame( void );
-void VGui_MouseEvent( int key, int clicks );
-void VGui_MWheelEvent( int y );
 void VGui_KeyEvent( int key, int down );
 void VGui_MouseMove( int x, int y );
 qboolean VGui_IsActive( void );
 void *VGui_GetPanel( void );
-void VGui_ReportTextInput( const char *text );
+#ifdef __cplusplus
-void VGui_UpdateInternalCursorState( VGUI_DefaultCursor cursorType );
+}
-
+#endif
-#endif // VGUI_DRAW_H
+#endif//VGUI_DRAW_H

engine/client/vid_common.c

@@ -21,6 +21,7 @@ GNU General Public License for more details.
 #include "platform/platform.h"
 
 #define WINDOW_NAME			XASH_ENGINE_NAME " Window" // Half-Life
+convar_t	*vid_displayfrequency;
 convar_t	*vid_fullscreen;
 convar_t	*vid_mode;
 convar_t	*vid_brightness;
@@ -66,30 +67,19 @@ void VID_InitDefaultResolution( void )
 R_SaveVideoMode
 =================
 */
-void R_SaveVideoMode( int w, int h, int render_w, int render_h )
+void R_SaveVideoMode( int w, int h , int render_w, int render_h )
 {
-	if( !w || !h || !render_w || !render_h )
-	{
-		host.renderinfo_changed = false;
-		return;
-	}
-
 	host.window_center_x = w / 2;
 	host.window_center_y = h / 2;
 
 	Cvar_SetValue( "width", w );
 	Cvar_SetValue( "height", h );
 
-	// immediately drop changed state or we may trigger
-	// video subsystem to reapply settings
-	host.renderinfo_changed = false;
-
-	if( refState.width == render_w && refState.height == render_h )
-		return;
-
 	refState.width = render_w;
 	refState.height = render_h;
 
+	host.renderinfo_changed = false;
+
 	// check for 4:3 or 5:4
 	if( render_w * 3 != render_h * 4 && render_w * 4 != render_h * 5 )
 		refState.wideScreen = true;
@@ -186,11 +176,12 @@ void VID_Init( void )
 	Cvar_Get( "width", "0", FCVAR_RENDERINFO|FCVAR_VIDRESTART, "screen width" );
 	Cvar_Get( "height", "0", FCVAR_RENDERINFO|FCVAR_VIDRESTART, "screen height" );
 
-	window_xpos = Cvar_Get( "_window_xpos", "-1", FCVAR_RENDERINFO, "window position by horizontal" );
+	window_xpos = Cvar_Get( "_window_xpos", "130", FCVAR_RENDERINFO, "window position by horizontal" );
-	window_ypos = Cvar_Get( "_window_ypos", "-1", FCVAR_RENDERINFO, "window position by vertical" );
+	window_ypos = Cvar_Get( "_window_ypos", "48", FCVAR_RENDERINFO, "window position by vertical" );
 
 	vid_gamma = Cvar_Get( "gamma", "2.5", FCVAR_ARCHIVE, "gamma amount" );
 	vid_brightness = Cvar_Get( "brightness", "0.0", FCVAR_ARCHIVE, "brightness factor" );
+	vid_displayfrequency = Cvar_Get ( "vid_displayfrequency", "0", FCVAR_RENDERINFO|FCVAR_VIDRESTART, "fullscreen refresh rate" );
 	vid_fullscreen = Cvar_Get( "fullscreen", "0", FCVAR_RENDERINFO|FCVAR_VIDRESTART, "enable fullscreen mode" );
 	vid_mode = Cvar_Get( "vid_mode", "0", FCVAR_RENDERINFO, "current video mode index (used just for storage)" );
 	vid_highdpi = Cvar_Get( "vid_highdpi", "1", FCVAR_RENDERINFO|FCVAR_VIDRESTART, "enable High-DPI mode" );
@@ -199,7 +190,7 @@ void VID_Init( void )
 
 	// a1ba: planned to be named vid_mode for compability
 	// but supported mode list is filled by backends, so numbers are not portable any more
-	Cmd_AddRestrictedCommand( "vid_setmode", VID_Mode_f, "display video mode" );
+	Cmd_AddCommand( "vid_setmode", VID_Mode_f, "display video mode" );
 
 	R_Init(); // init renderer
 }

engine/client/vid_common.h

@@ -31,11 +31,12 @@ extern glwstate_t glw_state;
 #define VID_MIN_WIDTH 320
 
 extern convar_t	*vid_fullscreen;
+extern convar_t	*vid_displayfrequency;
 extern convar_t	*vid_highdpi;
 extern convar_t	*vid_rotate;
 extern convar_t	*vid_scale;
 
-extern convar_t	*gl_msaa_samples;
+extern convar_t	*gl_wgl_msaa_samples;
 void R_SaveVideoMode( int w, int h, int render_w, int render_h );
 void VID_CheckChanges( void );
 const char *VID_GetModeString( int vid_mode );

engine/client/voice.c

@@ -1,633 +0,0 @@
-/*
-voice.c - voice chat implementation
-Copyright (C) 2022 Velaron
-Copyright (C) 2022 SNMetamorph
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#define CUSTOM_MODES 1 // required to correctly link with Opus Custom
-#include <opus_custom.h>
-#include "common.h"
-#include "client.h"
-#include "voice.h"
-
-voice_state_t voice = { 0 };
-
-CVAR_DEFINE_AUTO( voice_enable, "1", FCVAR_PRIVILEGED|FCVAR_ARCHIVE, "enable voice chat" );
-CVAR_DEFINE_AUTO( voice_loopback, "0", FCVAR_PRIVILEGED, "loopback voice back to the speaker" );
-CVAR_DEFINE_AUTO( voice_scale, "1.0", FCVAR_PRIVILEGED|FCVAR_ARCHIVE, "incoming voice volume scale" );
-CVAR_DEFINE_AUTO( voice_avggain, "0.5", FCVAR_PRIVILEGED|FCVAR_ARCHIVE, "automatic voice gain control (average)" );
-CVAR_DEFINE_AUTO( voice_maxgain, "5.0", FCVAR_PRIVILEGED|FCVAR_ARCHIVE, "automatic voice gain control (maximum)" );
-CVAR_DEFINE_AUTO( voice_inputfromfile, "0", FCVAR_PRIVILEGED, "input voice from voice_input.wav" );
-
-static void Voice_ApplyGainAdjust( int16_t *samples, int count );
-
-/*
-===============================================================================
-
-	OPUS INTEGRATION
-
-===============================================================================
-*/
-
-/*
-=========================
-Voice_InitOpusDecoder
-
-=========================
-*/
-static qboolean Voice_InitOpusDecoder( void )
-{
-	int err;
-
-	voice.width      = sizeof( opus_int16 );
-	voice.samplerate = VOICE_OPUS_CUSTOM_SAMPLERATE;
-	voice.frame_size = VOICE_OPUS_CUSTOM_FRAME_SIZE;
-
-	voice.custom_mode = opus_custom_mode_create( SOUND_44k, voice.frame_size, &err );
-	if( !voice.custom_mode )
-	{
-		Con_Printf( S_ERROR "Can't create Opus Custom mode: %s\n", opus_strerror( err ));
-		return false;
-	}
-
-	voice.decoder = opus_custom_decoder_create( voice.custom_mode, VOICE_PCM_CHANNELS, &err );
-	if( !voice.decoder )
-	{
-		Con_Printf( S_ERROR "Can't create Opus encoder: %s\n", opus_strerror( err ));
-		return false;
-	}
-
-	return true;
-}
-
-/*
-=========================
-Voice_InitOpusEncoder
-
-=========================
-*/
-static qboolean Voice_InitOpusEncoder( int quality )
-{
-	int err;
-
-	voice.encoder = opus_custom_encoder_create( voice.custom_mode, VOICE_PCM_CHANNELS, &err );
-	if( !voice.encoder )
-	{
-		Con_Printf( S_ERROR "Can't create Opus encoder: %s\n", opus_strerror( err ));
-		return false;
-	}
-
-	switch( quality )
-	{
-	case 1: // 6 kbps
-		opus_custom_encoder_ctl( voice.encoder, OPUS_SET_BITRATE( 6000 ));
-		break;
-	case 2: // 12 kbps
-		opus_custom_encoder_ctl( voice.encoder, OPUS_SET_BITRATE( 12000 ));
-		break;
-	case 4: // 64 kbps
-		opus_custom_encoder_ctl( voice.encoder, OPUS_SET_BITRATE( 64000 ));
-		break;
-	case 5: // 96 kbps
-		opus_custom_encoder_ctl( voice.encoder, OPUS_SET_BITRATE( 96000 ));
-		break;
-	default: // 36 kbps
-		opus_custom_encoder_ctl( voice.encoder, OPUS_SET_BITRATE( 36000 ));
-		break;
-	}
-
-	return true;
-}
-
-/*
-=========================
-Voice_ShutdownOpusDecoder
-
-=========================
-*/
-static void Voice_ShutdownOpusDecoder( void )
-{
-	if( voice.decoder )
-	{
-		opus_custom_decoder_destroy( voice.decoder );
-		voice.decoder = NULL;
-	}
-}
-
-/*
-=========================
-Voice_ShutdownOpusEncoder
-
-=========================
-*/
-static void Voice_ShutdownOpusEncoder( void )
-{
-	if( voice.encoder )
-	{
-		opus_custom_encoder_destroy( voice.encoder );
-		voice.encoder = NULL;
-	}
-
-	if( voice.custom_mode )
-	{
-		opus_custom_mode_destroy( voice.custom_mode );
-		voice.custom_mode = NULL;
-	}
-}
-
-/*
-=========================
-Voice_GetOpusCompressedData
-
-=========================
-*/
-static uint Voice_GetOpusCompressedData( byte *out, uint maxsize, uint *frames )
-{
-	uint ofs = 0, size = 0;
-	uint frame_size_bytes = voice.frame_size * voice.width;
-
-	if( voice.input_file )
-	{
-		uint numbytes;
-		double updateInterval, curtime = Sys_DoubleTime();
-
-		updateInterval = curtime - voice.start_time;
-		voice.start_time = curtime;
-
-		numbytes = updateInterval * voice.samplerate * voice.width * VOICE_PCM_CHANNELS;
-		numbytes = Q_min( numbytes, voice.input_file->size - voice.input_file_pos );
-		numbytes = Q_min( numbytes, sizeof( voice.input_buffer ) - voice.input_buffer_pos );
-
-		memcpy( voice.input_buffer + voice.input_buffer_pos, voice.input_file->buffer + voice.input_file_pos, numbytes );
-		voice.input_buffer_pos += numbytes;
-		voice.input_file_pos += numbytes;
-	}
-
-	if( !voice.input_file )
-		VoiceCapture_Lock( true );
-
-	for( ofs = 0; voice.input_buffer_pos - ofs >= frame_size_bytes && ofs <= voice.input_buffer_pos; ofs += frame_size_bytes )
-	{
-		int bytes;
-
-#if 1
-		if( !voice.input_file )
-		{
-			// adjust gain before encoding, but only for input from voice
-			Voice_ApplyGainAdjust((opus_int16*)(voice.input_buffer + ofs), voice.frame_size);
-		}
-#endif
-
-		bytes = opus_custom_encode( voice.encoder, (const opus_int16 *)( voice.input_buffer + ofs ),
-			voice.frame_size, out + size + sizeof( uint16_t ), maxsize );
-
-		if( bytes > 0 )
-		{
-			// write compressed frame size
-			*((uint16_t *)&out[size]) = bytes;
-
-			size += bytes + sizeof( uint16_t );
-			maxsize -= bytes + sizeof( uint16_t );
-
-			(*frames)++;
-		}
-		else
-		{
-			Con_Printf( S_ERROR "%s: failed to encode frame: %s\n", __func__, opus_strerror( bytes ));
-		}
-	}
-
-	// did we compress anything? update counters
-	if( ofs )
-	{
-		fs_offset_t remaining = voice.input_buffer_pos - ofs;
-
-		// move remaining samples to the beginning of buffer
-		memmove( voice.input_buffer, voice.input_buffer + ofs, remaining );
-
-		voice.input_buffer_pos = remaining;
-	}
-
-	if( !voice.input_file )
-		VoiceCapture_Lock( false );
-
-	return size;
-}
-
-/*
-===============================================================================
-
-	VOICE CHAT INTEGRATION
-
-===============================================================================
-*/
-
-/*
-=========================
-Voice_ApplyGainAdjust
-
-=========================
-*/
-static void Voice_ApplyGainAdjust( int16_t *samples, int count )
-{
-	float gain, modifiedMax;
-	int average, adjustedSample, blockOffset = 0;
-
-	for( ;; )
-	{
-		int i, localMax = 0, localSum = 0;
-		int blockSize = Q_min( count - ( blockOffset + voice.autogain.block_size ), voice.autogain.block_size );
-
-		if( blockSize < 1 )
-			break;
-
-		for( i = 0; i < blockSize; ++i )
-		{
-			int sample = samples[blockOffset + i];
-			int absSample = abs( sample );
-
-			if( absSample > localMax )
-				localMax = absSample;
-
-			localSum += absSample;
-
-			gain = voice.autogain.current_gain + i * voice.autogain.gain_multiplier;
-			adjustedSample = Q_min( SHRT_MAX, Q_max(( int )( sample * gain ), SHRT_MIN ));
-			samples[blockOffset + i] = adjustedSample;
-		}
-
-		if( blockOffset % voice.autogain.block_size == 0 )
-		{
-			average = localSum / blockSize;
-			modifiedMax = average + ( localMax - average ) * voice_avggain.value;
-
-			voice.autogain.current_gain = voice.autogain.next_gain * voice_scale.value;
-			voice.autogain.next_gain = Q_min( (float)SHRT_MAX / modifiedMax, voice_maxgain.value ) * voice_scale.value;
-			voice.autogain.gain_multiplier = ( voice.autogain.next_gain - voice.autogain.current_gain ) / ( voice.autogain.block_size - 1 );
-		}
-		blockOffset += blockSize;
-	}
-}
-
-/*
-=========================
-Voice_Status
-
-Notify user dll aboit voice transmission
-=========================
-*/
-static void Voice_Status( int entindex, qboolean bTalking )
-{
-	if( cls.state == ca_active && clgame.dllFuncs.pfnVoiceStatus )
-		clgame.dllFuncs.pfnVoiceStatus( entindex, bTalking );
-}
-
-/*
-=========================
-Voice_StatusTimeout
-
-Waits few milliseconds and if there was no
-voice transmission, sends notification
-=========================
-*/
-static void Voice_StatusTimeout( voice_status_t *status, int entindex, double frametime )
-{
-	if( status->talking_ack )
-	{
-		status->talking_timeout += frametime;
-		if( status->talking_timeout > 0.2 )
-		{
-			status->talking_ack = false;
-			Voice_Status( entindex, false );
-		}
-	}
-}
-
-/*
-=========================
-Voice_StatusAck
-
-Sends notification to user dll and
-zeroes timeouts for this client
-=========================
-*/
-void Voice_StatusAck( voice_status_t *status, int playerIndex )
-{
-	if( !status->talking_ack )
-		Voice_Status( playerIndex, true );
-
-	status->talking_ack = true;
-	status->talking_timeout = 0.0;
-}
-
-/*
-=========================
-Voice_IsRecording
-
-=========================
-*/
-qboolean Voice_IsRecording( void )
-{
-	return voice.is_recording;
-}
-
-/*
-=========================
-Voice_RecordStop
-
-=========================
-*/
-void Voice_RecordStop( void )
-{
-	if( voice.input_file )
-	{
-		FS_FreeSound( voice.input_file );
-		voice.input_file = NULL;
-	}
-
-	VoiceCapture_Activate( false );
-	voice.is_recording = false;
-
-	Voice_Status( VOICE_LOCALCLIENT_INDEX, false );
-
-	voice.input_buffer_pos = 0;
-	memset( voice.input_buffer, 0, sizeof( voice.input_buffer ));
-}
-
-/*
-=========================
-Voice_RecordStart
-
-=========================
-*/
-void Voice_RecordStart( void )
-{
-	Voice_RecordStop();
-
-	if( voice_inputfromfile.value )
-	{
-		voice.input_file = FS_LoadSound( "voice_input.wav", NULL, 0 );
-
-		if( voice.input_file )
-		{
-			Sound_Process( &voice.input_file, voice.samplerate, voice.width, SOUND_RESAMPLE );
-			voice.input_file_pos = 0;
-			
-			voice.start_time = Sys_DoubleTime();
-			voice.is_recording = true;
-		}
-		else
-		{
-			FS_FreeSound( voice.input_file );
-			voice.input_file = NULL;
-		}
-	}
-
-	if( !Voice_IsRecording() )
-		voice.is_recording = VoiceCapture_Activate( true );
-
-	if( Voice_IsRecording() )
-		Voice_Status( VOICE_LOCALCLIENT_INDEX, true );
-}
-
-/*
-=========================
-Voice_Disconnect
-
-We're disconnected from server
-stop recording and notify user dlls
-=========================
-*/
-void Voice_Disconnect( void )
-{
-	int i;
-
-	Voice_RecordStop();
-
-	if( voice.local.talking_ack )
-	{
-		Voice_Status( VOICE_LOOPBACK_INDEX, false );
-		voice.local.talking_ack = false;
-	}
-
-	for( i = 0; i < MAX_CLIENTS; i++ )
-	{
-		if( voice.players_status[i].talking_ack )
-		{
-			Voice_Status( i, false );
-			voice.players_status[i].talking_ack = false;
-		}
-	}
-}
-
-/*
-=========================
-Voice_StartChannel
-
-Feed the decoded data to engine sound subsystem
-=========================
-*/
-static void Voice_StartChannel( uint samples, byte *data, int entnum )
-{
-	SND_ForceInitMouth( entnum );
-	S_RawEntSamples( entnum, samples, voice.samplerate, voice.width, VOICE_PCM_CHANNELS, data, 255 );
-}
-
-/*
-=========================
-Voice_AddIncomingData
-
-Received encoded voice data, decode it
-=========================
-*/
-void Voice_AddIncomingData( int ent, const byte *data, uint size, uint frames )
-{
-	int samples = 0;
-	int ofs = 0;
-
-	if( !voice.decoder )
-		return;
-
-	// decode frame by frame
-	for( ;; )
-	{
-		int frame_samples;
-		uint16_t compressed_size;
-
-		// no compressed size mark
-		if( ofs + sizeof( uint16_t ) > size )
-			break;
-
-		compressed_size = *(const uint16_t *)(data + ofs);
-		ofs += sizeof( uint16_t );
-
-		// no frame data
-		if( ofs + compressed_size > size )
-			break;
-
-		frame_samples = opus_custom_decode( voice.decoder, data + ofs, compressed_size,
-			(opus_int16*)voice.decompress_buffer + samples, voice.frame_size );
-
-		ofs += compressed_size;
-		samples += frame_samples;
-	}
-
-	if( samples > 0 )
-		Voice_StartChannel( samples, voice.decompress_buffer, ent );
-}
-
-/*
-=========================
-CL_AddVoiceToDatagram
-
-Encode our voice data and send it to server
-=========================
-*/
-void CL_AddVoiceToDatagram( void )
-{
-	uint size, frames = 0;
-
-	if( cls.state != ca_active || !Voice_IsRecording() || !voice.encoder )
-		return;
-	
-	size = Voice_GetOpusCompressedData( voice.output_buffer, sizeof( voice.output_buffer ), &frames );
-
-	if( size > 0 && MSG_GetNumBytesLeft( &cls.datagram ) >= size + 32 )
-	{
-		MSG_BeginClientCmd( &cls.datagram, clc_voicedata );
-		MSG_WriteByte( &cls.datagram, voice_loopback.value != 0 );
-		MSG_WriteByte( &cls.datagram, frames );
-		MSG_WriteShort( &cls.datagram, size );
-		MSG_WriteBytes( &cls.datagram, voice.output_buffer, size );
-	}
-}
-
-/*
-=========================
-Voice_RegisterCvars
-
-Register voice related cvars and commands
-=========================
-*/
-void Voice_RegisterCvars( void )
-{
-	Cvar_RegisterVariable( &voice_enable );
-	Cvar_RegisterVariable( &voice_loopback );
-	Cvar_RegisterVariable( &voice_scale );
-	Cvar_RegisterVariable( &voice_avggain );
-	Cvar_RegisterVariable( &voice_maxgain );
-	Cvar_RegisterVariable( &voice_inputfromfile );
-}
-
-/*
-=========================
-Voice_Shutdown
-
-Completely shutdown the voice subsystem
-=========================
-*/
-static void Voice_Shutdown( void )
-{
-	int i;
-
-	Voice_RecordStop();
-	Voice_ShutdownOpusEncoder();
-	Voice_ShutdownOpusDecoder();
-	VoiceCapture_Shutdown();
-
-	if( voice.local.talking_ack )
-		Voice_Status( VOICE_LOOPBACK_INDEX, false );
-
-	for( i = 0; i < MAX_CLIENTS; i++ )
-	{
-		if( voice.players_status[i].talking_ack )
-			Voice_Status( i, false );
-	}
-
-	memset( &voice, 0, sizeof( voice ));
-}
-
-/*
-=========================
-Voice_Idle
-
-Run timeout for all clients
-=========================
-*/
-void Voice_Idle( double frametime )
-{
-	int i;
-
-	if( FBitSet( voice_enable.flags, FCVAR_CHANGED ) && !voice_enable.value )
-	{
-		Voice_Shutdown();
-		return;
-	}
-
-	// update local player status first
-	Voice_StatusTimeout( &voice.local, VOICE_LOOPBACK_INDEX, frametime );
-
-	for( i = 0; i < MAX_CLIENTS; i++ )
-		Voice_StatusTimeout( &voice.players_status[i], i, frametime );
-}
-
-/*
-=========================
-Voice_Init
-
-Initialize the voice subsystem
-=========================
-*/
-qboolean Voice_Init( const char *pszCodecName, int quality )
-{
-	if( !voice_enable.value )
-		return false;
-
-	if( Q_strcmp( pszCodecName, VOICE_OPUS_CUSTOM_CODEC ))
-	{
-		Con_Printf( S_ERROR "Server requested unsupported codec: %s\n", pszCodecName );
-		return false;
-	}
-
-	// reinitialize only if codec parameters are different
-	if( Q_strcmp( voice.codec, pszCodecName ) && voice.quality != quality )
-		Voice_Shutdown();
-
-	voice.autogain.block_size = 128;
-
-	if( !Voice_InitOpusDecoder( ))
-	{
-		// no reason to init encoder and open audio device
-		// if we can't hear other players
-		Con_Printf( S_ERROR "Voice chat disabled.\n" );
-		Voice_Shutdown();
-		return false;
-	}
-
-	// we can hear others players, so it's fine to fail now
-	voice.initialized = true;
-	Q_strncpy( voice.codec, pszCodecName, sizeof( voice.codec ));
-
-	if( !Voice_InitOpusEncoder( quality ))
-	{
-		Con_Printf( S_WARN "Other players will not be able to hear you.\n" );
-		return false;
-	}
-
-	voice.quality = quality;
-
-	if( !VoiceCapture_Init( ))
-		Con_Printf( S_WARN "No microphone is available.\n" );
-
-	return true;
-}

engine/client/voice.h

@@ -1,104 +0,0 @@
-/*
-voice.h - voice chat implementation
-Copyright (C) 2022 Velaron
-Copyright (C) 2022 SNMetamorph
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#ifndef VOICE_H
-#define VOICE_H
-
-#include "common.h"
-#include "protocol.h" // MAX_CLIENTS
-#include "sound.h"
-
-typedef struct OpusCustomEncoder OpusCustomEncoder;
-typedef struct OpusCustomDecoder OpusCustomDecoder;
-typedef struct OpusCustomMode OpusCustomMode;
-
-#define VOICE_LOOPBACK_INDEX (-2)
-#define VOICE_LOCALCLIENT_INDEX (-1)
-
-#define VOICE_PCM_CHANNELS 1 // always mono
-
-// never change these parameters when using opuscustom
-#define VOICE_OPUS_CUSTOM_SAMPLERATE SOUND_44k
-// must follow opus custom requirements
-// also be divisible with MAX_RAW_SAMPLES
-#define VOICE_OPUS_CUSTOM_FRAME_SIZE 1024
-#define VOICE_OPUS_CUSTOM_CODEC "opus_custom_44k_512"
-
-// a1ba: do not change, we don't have any re-encoding support now
-#define VOICE_DEFAULT_CODEC VOICE_OPUS_CUSTOM_CODEC
-
-typedef struct voice_status_s
-{
-	qboolean talking_ack;
-	double talking_timeout;
-} voice_status_t;
-
-typedef struct voice_state_s
-{
-	string codec;
-	int quality;
-
-	qboolean initialized;
-	qboolean is_recording;
-	double start_time;
-
-	voice_status_t local;
-	voice_status_t players_status[MAX_CLIENTS];
-
-	// opus stuff
-	OpusCustomMode    *custom_mode;
-	OpusCustomEncoder *encoder;
-	OpusCustomDecoder *decoder;
-
-	// audio info
-	uint width;
-	uint samplerate;
-	uint frame_size; // in samples
-
-	// buffers
-	byte input_buffer[MAX_RAW_SAMPLES];
-	byte output_buffer[MAX_RAW_SAMPLES];
-	byte decompress_buffer[MAX_RAW_SAMPLES];
-	fs_offset_t input_buffer_pos; // in bytes
-
-	// input from file
-	wavdata_t *input_file;
-	fs_offset_t input_file_pos; // in bytes
-
-	// automatic gain control
-	struct {
-		int block_size;
-		float current_gain;
-		float next_gain;
-		float gain_multiplier;
-	} autogain;
-} voice_state_t;
-
-extern voice_state_t voice;
-
-void CL_AddVoiceToDatagram( void );
-
-void Voice_RegisterCvars( void );
-qboolean Voice_Init( const char *pszCodecName, int quality );
-void Voice_Idle( double frametime );
-qboolean Voice_IsRecording( void );
-void Voice_RecordStop( void );
-void Voice_RecordStart( void );
-void Voice_Disconnect( void );
-void Voice_AddIncomingData( int ent, const byte *data, uint size, uint frames );
-void Voice_StatusAck( voice_status_t *status, int playerIndex );
-
-#endif // VOICE_H

engine/client/vox.h

@@ -16,9 +16,9 @@ GNU General Public License for more details.
 #ifndef VOX_H
 #define VOX_H
 
-#define CVOXWORDMAX	64
+#define CVOXWORDMAX			64
-#define CVOXFILESENTENCEMAX 4096
+#define CVOXZEROSCANMAX		255	// scan up to this many samples for next zero crossing
-
+#define MAX_SENTENCES		4096
 #define SENTENCE_INDEX		-99999	// unique sentence index
 
 typedef struct voxword_s
@@ -34,6 +34,13 @@ typedef struct voxword_s
 	sfx_t	*sfx;		// name and cache pointer
 } voxword_t;
 
+
+typedef struct
+{
+	char	*pName;
+	float	length;
+} sentence_t;
+
 struct channel_s;
 void VOX_LoadWord( struct channel_s *pchan );
 void VOX_FreeWord( struct channel_s *pchan );

engine/common/base_cmd.c

@@ -17,20 +17,10 @@ GNU General Public License for more details.
 #include "base_cmd.h"
 #include "cdll_int.h"
 
+// TODO: use another hash function, as COM_HashKey depends on string length
 #define HASH_SIZE 128 // 128 * 4 * 4 == 2048 bytes
-
-typedef struct base_command_hashmap_s
-{
-	base_command_t          *basecmd; // base command: cvar, alias or command
-	const char              *name;    // key for searching
-	base_command_type_e     type;     // type for faster searching
-	struct base_command_hashmap_s *next;
-} base_command_hashmap_t;
-
 static base_command_hashmap_t *hashed_cmds[HASH_SIZE];
 
-#define BaseCmd_HashKey( x ) COM_HashKey( name, HASH_SIZE )
-
 /*
 ============
 BaseCmd_FindInBucket
@@ -38,7 +28,7 @@ BaseCmd_FindInBucket
 Find base command in bucket
 ============
 */
-static base_command_hashmap_t *BaseCmd_FindInBucket( base_command_hashmap_t *bucket, base_command_type_e type, const char *name )
+base_command_hashmap_t *BaseCmd_FindInBucket( base_command_hashmap_t *bucket, base_command_type_e type, const char *name )
 {
 	base_command_hashmap_t *i = bucket;
 	for( ; i && ( i->type != type || Q_stricmp( name, i->name ) ); // filter out
@@ -54,9 +44,9 @@ BaseCmd_GetBucket
 Get bucket which contain basecmd by given name
 ============
 */
-static base_command_hashmap_t *BaseCmd_GetBucket( const char *name )
+base_command_hashmap_t *BaseCmd_GetBucket( const char *name )
 {
-	return hashed_cmds[ BaseCmd_HashKey( name ) ];
+	return hashed_cmds[ COM_HashKey( name, HASH_SIZE ) ];
 }
 
 /*
@@ -83,7 +73,7 @@ BaseCmd_Find
 Find every type of base command and write into arguments
 ============
 */
-void BaseCmd_FindAll( const char *name, base_command_t **cmd, base_command_t **alias, base_command_t **cvar )
+void BaseCmd_FindAll(const char *name, base_command_t **cmd, base_command_t **alias, base_command_t **cvar)
 {
 	base_command_hashmap_t *base = BaseCmd_GetBucket( name );
 	base_command_hashmap_t *i = base;
@@ -111,6 +101,7 @@ void BaseCmd_FindAll( const char *name, base_command_t **cmd, base_command_t **a
 			}
 		}
 	}
+
 }
 
 /*
@@ -122,23 +113,41 @@ Add new typed base command to hashmap
 */
 void BaseCmd_Insert( base_command_type_e type, base_command_t *basecmd, const char *name )
 {
-	base_command_hashmap_t *elem, *cur, *find;
+	uint hash = COM_HashKey( name, HASH_SIZE );
-	uint hash = BaseCmd_HashKey( name );
+	base_command_hashmap_t *elem;
 
 	elem = Z_Malloc( sizeof( base_command_hashmap_t ) );
 	elem->basecmd = basecmd;
 	elem->type = type;
 	elem->name = name;
+	elem->next = hashed_cmds[hash];
+	hashed_cmds[hash] = elem;
+}
 
-	// link the variable in alphanumerical order
+/*
-	for( cur = NULL, find = hashed_cmds[hash];
+============
-		  find && Q_strcmp( find->name, elem->name ) < 0;
+BaseCmd_Replace
-		  cur = find, find = find->next );
 
-	if( cur ) cur->next = elem;
+Used in case, when basecmd has been registered, but gamedll wants to register it's own
-	else hashed_cmds[hash] = elem;
+============
+*/
+qboolean BaseCmd_Replace( base_command_type_e type, base_command_t *basecmd, const char *name )
+{
+	base_command_hashmap_t *i = BaseCmd_GetBucket( name );
 
-	elem->next = find;
+	for( ; i && ( i->type != type || Q_stricmp( name, i->name ) ) ; // filter out
+		 i = i->next );
+
+	if( !i )
+	{
+		Con_Reportf( S_ERROR  "BaseCmd_Replace: couldn't find %s\n", name);
+		return false;
+	}
+
+	i->basecmd = basecmd;
+	i->name = name; // may be freed after
+
+	return true;
 }
 
 /*
@@ -150,7 +159,7 @@ Remove base command from hashmap
 */
 void BaseCmd_Remove( base_command_type_e type, const char *name )
 {
-	uint hash = BaseCmd_HashKey( name );
+	uint hash = COM_HashKey( name, HASH_SIZE );
 	base_command_hashmap_t *i, *prev;
 
 	for( prev = NULL, i = hashed_cmds[hash]; i &&
@@ -212,27 +221,23 @@ void BaseCmd_Stats_f( void )
 
 		if( len > maxsize )
 			maxsize = len;
-
 	}
 
-	Con_Printf( "min length: %d, max length: %d, empty: %d\n", minsize, maxsize, empty );
+	Con_Printf( "Base command stats:\n");
+	Con_Printf( "Bucket minimal length: %d\n", minsize );
+	Con_Printf( "Bucket maximum length: %d\n", maxsize );
+	Con_Printf( "Empty buckets: %d\n", empty );
 }
 
-typedef struct
+static void BaseCmd_CheckCvars( const char *key, const char *value, void *buffer, void *ptr )
 {
-	qboolean valid;
+	base_command_t *v = BaseCmd_Find( HM_CVAR, key );
-	int lookups;
+	qboolean *invalid = ptr;
-} basecmd_test_stats_t;
 
-static void BaseCmd_CheckCvars( const char *key, const char *value, const void *unused, void *ptr )
+	if( !v )
-{
-	basecmd_test_stats_t *stats = ptr;
-
-	stats->lookups++;
-	if( !BaseCmd_Find( HM_CVAR, key ))
 	{
 		Con_Printf( "Cvar %s is missing in basecmd\n", key );
-		stats->valid = false;
+		*invalid = true;
 	}
 }
 
@@ -245,51 +250,38 @@ testing order matches cbuf execute
 */
 void BaseCmd_Test_f( void )
 {
-	basecmd_test_stats_t stats;
+	void *cmd;
-	double start, end, dt;
+	cmdalias_t *a;
-	int i;
+	qboolean invalid = false;
 
-	stats.valid = true;
+	// Cmd_LookupCmds don't allows to check alias, so just iterate
-	stats.lookups = 0;
+	for( a = Cmd_AliasGetList(); a; a = a->next )
-
-	start = Sys_DoubleTime() * 1000;
-
-	for( i = 0; i < 1000; i++ )
 	{
-		cmdalias_t *a;
+		base_command_t *v = BaseCmd_Find( HM_CMDALIAS, a->name );
-		void *cmd;
 
-		// Cmd_LookupCmds don't allows to check alias, so just iterate
+		if( !v )
-		for( a = Cmd_AliasGetList(); a; a = a->next, stats.lookups++ )
 		{
-			if( !BaseCmd_Find( HM_CMDALIAS, a->name ))
+			Con_Printf( "Alias %s is missing in basecmd\n", a->name );
-			{
+			invalid = true;
-				Con_Printf( "Alias %s is missing in basecmd\n", a->name );
-				stats.valid = false;
-			}
 		}
-
-		for( cmd = Cmd_GetFirstFunctionHandle(); cmd;
-			 cmd = Cmd_GetNextFunctionHandle( cmd ), stats.lookups++ )
-		{
-			if( !BaseCmd_Find( HM_CMD, Cmd_GetName( cmd )))
-			{
-				Con_Printf( "Command %s is missing in basecmd\n", Cmd_GetName( cmd ));
-				stats.valid = false;
-			}
-		}
-
-		Cvar_LookupVars( 0, NULL, &stats.valid, (setpair_t)BaseCmd_CheckCvars );
 	}
 
-	end = Sys_DoubleTime() * 1000;
+	for( cmd = Cmd_GetFirstFunctionHandle(); cmd;
+		 cmd = Cmd_GetNextFunctionHandle( cmd ) )
+	{
+		base_command_t *v = BaseCmd_Find( HM_CMD, Cmd_GetName( cmd ) );
 
-	dt = end - start;
+		if( !v )
+		{
+			Con_Printf( "Command %s is missing in basecmd\n", Cmd_GetName( cmd ) );
+			invalid = true;
+		}
+	}
 
-	if( !stats.valid )
+	Cvar_LookupVars( 0, NULL, &invalid, (setpair_t)BaseCmd_CheckCvars );
+
+	if( !invalid )
+	{
 		Con_Printf( "BaseCmd is valid\n" );
-
+	}
-	Con_Printf( "Test took %.3f ms, %d lookups, %.3f us/lookup\n", dt, stats.lookups, dt / stats.lookups * 1000 );
-
-	BaseCmd_Stats_f();
 }

engine/common/base_cmd.h

@@ -17,6 +17,8 @@ GNU General Public License for more details.
 #ifndef BASE_CMD_H
 #define BASE_CMD_H
 
+// TODO: Find cases when command hashmap works incorrect
+// and maybe disable it
 #define XASH_HASHED_VARS
 
 #ifdef XASH_HASHED_VARS
@@ -31,13 +33,23 @@ typedef enum base_command_type
 
 typedef void base_command_t;
 
+typedef struct base_command_hashmap_s
+{
+	base_command_t          *basecmd; // base command: cvar, alias or command
+	const char              *name;    // key for searching
+	base_command_type_e     type;     // type for faster searching
+	struct base_command_hashmap_s *next;
+} base_command_hashmap_t;
 
 
 void BaseCmd_Init( void );
+base_command_hashmap_t *BaseCmd_GetBucket( const char *name );
+base_command_hashmap_t *BaseCmd_FindInBucket( base_command_hashmap_t *bucket, base_command_type_e type, const char *name );
 base_command_t *BaseCmd_Find( base_command_type_e type, const char *name );
 void BaseCmd_FindAll( const char *name,
 	base_command_t **cmd, base_command_t **alias, base_command_t **cvar );
 void BaseCmd_Insert ( base_command_type_e type, base_command_t *basecmd, const char *name );
+qboolean BaseCmd_Replace( base_command_type_e type, base_command_t *basecmd, const char *name ); // only if same name
 void BaseCmd_Remove ( base_command_type_e type, const char *name );
 void BaseCmd_Stats_f( void ); // to be registered later
 void BaseCmd_Test_f( void ); // to be registered later

engine/common/build.c

@@ -0,0 +1,194 @@
+/*
+build.c - returns a engine build number
+Copyright (C) 2010 Uncle Mike
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+*/
+
+#include "common.h"
+
+static const char *date = __DATE__ ;
+static const char *mon[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+static const char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+
+// returns days since Apr 1 2015
+int Q_buildnum( void )
+{
+	int m = 0, d = 0, y = 0;
+	static int b = 0;
+
+	if( b != 0 ) return b;
+
+	for( m = 0; m < 11; m++ )
+	{
+		if( !Q_strnicmp( &date[0], mon[m], 3 ))
+			break;
+		d += mond[m];
+	}
+
+	d += Q_atoi( &date[4] ) - 1;
+	y = Q_atoi( &date[7] ) - 1900;
+	b = d + (int)((y - 1) * 365.25f );
+
+	if((( y % 4 ) == 0 ) && m > 1 )
+	{
+		b += 1;
+	}
+	b -= 41728; // Apr 1 2015
+
+	return b;
+}
+
+/*
+=============
+Q_buildnum_compat
+
+Returns a Xash3D build number. This is left for compability with original Xash3D.
+IMPORTANT: this value must be changed ONLY after updating to newer Xash3D
+IMPORTANT: this value must be acquired through "build" cvar.
+=============
+*/
+int Q_buildnum_compat( void )
+{
+	// do not touch this! Only author of Xash3D can increase buildnumbers!
+	return 4529;
+}
+
+/*
+============
+Q_buildos
+
+Returns current name of operating system. Without any spaces.
+============
+*/
+const char *Q_buildos( void )
+{
+	const char *osname;
+
+#if XASH_MINGW
+	osname = "win32-mingw";
+#elif XASH_WIN32
+	osname = "win32";
+#elif XASH_ANDROID
+	osname = "android";
+#elif XASH_LINUX
+	osname = "linux";
+#elif XASH_APPLE
+	osname = "apple";
+#elif XASH_FREEBSD
+	osname = "freebsd";
+#elif XASH_NETBSD
+	osname = "netbsd";
+#elif XASH_OPENBSD
+	osname = "openbsd";
+#elif XASH_EMSCRIPTEN
+	osname = "emscripten";
+#elif XASH_DOS4GW
+	osname = "DOS4GW";
+#elif XASH_HAIKU
+	osname = "haiku";
+#else
+#error "Place your operating system name here! If this is a mistake, try to fix conditions above and report a bug"
+#endif
+
+	return osname;
+}
+
+/*
+============
+Q_buildarch
+
+Returns current name of the architecture. Without any spaces.
+============
+*/
+const char *Q_buildarch( void )
+{
+	const char *archname;
+
+#if XASH_AMD64
+	archname = "amd64";
+#elif XASH_X86
+	archname = "i386";
+#elif XASH_ARM && XASH_64BIT
+	archname = "arm64";
+#elif XASH_ARM
+	archname = "armv"
+	#if XASH_ARM == 8
+		"8_32" // for those who (mis)using 32-bit OS on 64-bit CPU
+	#elif XASH_ARM == 7
+		"7"
+	#elif XASH_ARM == 6
+		"6"
+	#elif XASH_ARM == 5
+		"5"
+	#elif XASH_ARM == 4
+		"4"
+	#endif
+
+	#if XASH_ARM_HARDFP
+		"hf"
+	#else
+		"l"
+	#endif
+	;
+#elif XASH_MIPS && XASH_BIG_ENDIAN
+	archname = "mips"
+	#if XASH_64BIT
+		"64"
+	#endif
+	#if XASH_LITTLE_ENDIAN
+		"el"
+	#endif
+	;
+#elif XASH_RISCV
+	archname = "riscv"
+	#if XASH_64BIT
+		"64"
+	#else
+		"32"
+	#endif
+	#if XASH_RISCV_SINGLEFP
+		"d"
+	#elif XASH_RISCV_DOUBLEFP
+		"f"
+	#endif
+	;
+#elif XASH_JS
+	archname = "javascript";
+#elif XASH_E2K
+	archname = "e2k";
+#else
+#error "Place your architecture name here! If this is a mistake, try to fix conditions above and report a bug"
+#endif
+
+	return archname;
+}
+
+/*
+=============
+Q_buildcommit
+
+Returns a short hash of current commit in VCS as string.
+XASH_BUILD_COMMIT must be passed in quotes
+
+if XASH_BUILD_COMMIT is not defined,
+Q_buildcommit will identify this build as "notset"
+=============
+*/
+const char *Q_buildcommit( void )
+{
+#ifdef XASH_BUILD_COMMIT
+	return XASH_BUILD_COMMIT;
+#else
+	return "notset";
+#endif
+}
+