engine: rework how HTTP finite-machine works, use function pointers instead of enum. Preliminary chunked transfer and compression support.

* Update MultiEmulator submodule

.builds/alpine.yml

@@ -5,6 +5,7 @@ packages:
 - freetype-dev
 - fontconfig-dev
 - opus-dev
+- bzip2-dev
 sources:
 - https://git.sr.ht/~a1batross/xash3d-fwgs
 tasks:

.builds/debian-arm64.yml

@@ -7,6 +7,7 @@ packages:
 - libfreetype-dev
 - libfontconfig-dev
 - libopus-dev
+- libbz2-dev
 sources:
 - https://git.sr.ht/~a1batross/xash3d-fwgs
 tasks:

.builds/debian.yml

@@ -6,6 +6,7 @@ packages:
 - libfreetype-dev
 - libfontconfig-dev
 - libopus-dev
+- libbz2-dev
 sources:
 - https://git.sr.ht/~a1batross/xash3d-fwgs
 tasks:

.builds/freebsd.yml

@@ -6,6 +6,7 @@ packages:
 - print/freetype2
 - x11-fonts/fontconfig
 - audio/opus
+- archivers/bzip2
 sources:
 - https://git.sr.ht/~a1batross/xash3d-fwgs
 tasks:

.builds/netbsd.yml

@@ -6,6 +6,7 @@ packages:
 - fontconfig
 - libopus
 - pkgconf
+- bzip2
 sources:
 - https://git.sr.ht/~a1batross/xash3d-fwgs
 tasks:

.builds/openbsd.yml

@@ -3,6 +3,7 @@ packages:
 - python3
 - sdl2
 - opus
+- bzip2
 sources:
 - https://git.sr.ht/~a1batross/xash3d-fwgs
 tasks:

.gitignore

@@ -342,3 +342,6 @@ enc_temp_folder/
 
 # KDevelop4
 *.kdev4
+
+# ccls langauge server
+.ccls-*

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "3rdparty/bzip2/bzip2"]
 	path = 3rdparty/bzip2/bzip2
 	url = https://gitlab.com/bzip2/bzip2
+[submodule "3rdparty/MultiEmulator"]
+	path = 3rdparty/MultiEmulator
+	url = https://github.com/FWGS/MultiEmulator

3rdparty/bzip2/bz_version.h

@@ -0,0 +1 @@
+#define BZ_VERSION "1.1.0-fwgs"

3rdparty/bzip2/wscript

@@ -1,15 +1,12 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
-BZIP_CHECK='''#include <bzlib.h>
-int main(void) { return BZ2_bzlibVersion() != NULL; }
-'''
-
 def options(opt):
 	pass
 
 def configure(conf):
 	conf.define('_GNU_SOURCE', 1)
+	conf.define('BZ_NO_STDIO', 1)
 
 	if conf.env.DEST_OS == 'win32':
 		conf.define('BZ_LCCWIN32', 1)
@@ -17,19 +14,21 @@ def configure(conf):
 		conf.define('BZ_UNIX', 1)
 
 def build(bld):
-	bld(
-		features = 'subst',
-		source = 'bzip2/bz_version.h.in',
-		target = 'bz_version.h',
-		BZ_VERSION='1.1.0-fwgs'
-	)
+# doesn't work with CMake generator
+#	bld(
+#		features = 'subst',
+#		source = 'bzip2/bz_version.h.in',
+#		target = 'bz_version.h',
+#		BZ_VERSION='1.1.0-fwgs'
+#	)
+
+	bz_sources = ['bzip2/blocksort.c', 'bzip2/huffman.c', 'bzip2/crctable.c', 'bzip2/randtable.c', 'bzip2/compress.c', 'bzip2/decompress.c', 'bzip2/bzlib.c']
 
 	bld.stlib(
-		source = bld.path.ant_glob(['bzip2/*.c']),
+		source = bz_sources,
 		target = 'bzip2',
-		use = 'bz_version.h',
-		features = 'c',
-		includes = ['bzip2/', '.'],
+#		use = 'bz_version.h',
+		includes = ['.', 'bzip2/'],
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		export_includes = ['bzip2/']
 	)

3rdparty/gl4es/wscript

@@ -16,7 +16,6 @@ def build(bld):
 
 	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', 'NO_LOADER', 'STATICLIB'],
 		cflags   = ['-w', '-fvisibility=hidden', '-std=gnu99'],

3rdparty/opus/wscript

@@ -27,7 +27,7 @@ def build(bld):
 		'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']
+	defines = ['USE_ALLOCA', 'OPUS_BUILD', 'FLOAT_APPROX', 'PACKAGE_VERSION="1.4.0"', 'CUSTOM_MODES']
 
 	bld.stlib(
 		source = sources,

Documentation/goldsrc-protocol-support.md

@@ -0,0 +1,14 @@
+# Support for GoldSrc network protocol
+This feature is still work-in-progress, but for now it's available for all users, and we appreciate any bug-reports and contributions around it.
+
+For connecting to GoldSrc-based servers, use this command:
+```
+connect ip:port gs
+```
+
+But keep in mind, there are requirement for server to be able to accept connections from Xash3D-based clients: it should accept HLTV connections.
+Without this requirement, you will just get "Steam validation rejected" error on connecting.
+
+That is because proper authorization with Steam API is not implemented in engine yet (but we have plans on it).
+
+In case of ReHLDS with Reunion plugin, by default it rejects HLTV clients. But connections from HLTV can be easily enabled in `reunion.cfg` file.

README.md

@@ -11,12 +11,12 @@ Xash3D FWGS is a heavily modified fork of an original [Xash3D Engine](https://ww
 If you like Xash3D FWGS, consider supporting individual engine maintainers. By supporting us, you help to continue developing this game engine further. The sponsorship links are available in [documentation](Documentation/donate.md).
 
 ## Fork features
-* Steam Half-Life (HLSDK 2.4) support.
+* Steam Half-Life (HLSDK 2.5) support.
 * Crossplatform and modern compilers support: supports Windows, Linux, BSD & Android on x86 & ARM and [many more](Documentation/ports.md).
-* Better multiplayer support: multiple master servers, headless dedicated server, voice chat and IPv6 support.
+* Better multiplayer: multiple master servers, headless dedicated server, voice chat, [GoldSrc protocol support](Documentation/goldsrc-protocol-support.md) and IPv6 support.
 * Multiple renderers support: OpenGL, GLESv1, GLESv2 and Software.
 * Advanced virtual filesystem: `.pk3` and `.pk3dir` support, compatibility with GoldSrc FS module, fast case-insensitivity emulation for crossplatform.
-* Mobility API: better game integration on mobile devices (vibration, touch controls)
+* Mobility API: better game integration on mobile devices (vibration, touch controls).
 * Different input methods: touch and gamepad in addition to mouse & keyboard.
 * TrueType font rendering, as a part of mainui_cpp.
 * External VGUI support module.
@@ -35,17 +35,16 @@ You still needed to copy `valve` directory as all game resources located there.
 For additional info, run Xash3D with `-help` command line key.
 
 ## Contributing
-* Before sending an issue, check if someone already reported your issue. Make sure you're following "How To Ask Questions The Smart Way" guide by Eric Steven Raymond. Read more: http://www.catb.org/~esr/faqs/smart-questions.html
-* Issues are accepted in both English and Russian
+* Before sending an issue, check if someone already reported your issue. Make sure you're following "How To Ask Questions The Smart Way" guide by Eric Steven Raymond. Read more: http://www.catb.org/~esr/faqs/smart-questions.html.
+* Issues are accepted in both English and Russian.
 * Before sending a PR, check if you followed our contribution guide in CONTRIBUTING.md file.
 
 ## Build instructions
-We are using Waf build system. If you have some Waf-related questions, I recommend you to read https://waf.io/book/
+We are using Waf build system. If you have some Waf-related questions, I recommend you to read [Waf Book](https://waf.io/book/).
 
 NOTE: NEVER USE GitHub's ZIP ARCHIVES. GitHub doesn't include external dependencies we're using!
 
 ### Prerequisites
-
 If your CPU is x86 compatible and you're on Windows or Linux, 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!
 
@@ -62,31 +61,40 @@ This repository contains our fork of HLSDK and restored source code for Half-Lif
 
 #### GNU/Linux
 ##### Debian/Ubuntu
-* Enable i386 on your system, if you're compiling 32-bit engine on amd64. If not, skip this
+* Only for 32-bit engine on 64-bit x86 operating system:
+  * Enable i386 on your system: `$ sudo dpkg --add-architecture i386`.
+  * Install `aptitude` ([why?](https://github.com/FWGS/xash3d-fwgs/issues/1828#issuecomment-2415131759)):  `$ sudo apt update && sudo apt upgrade && sudo apt install aptitude`
+  * Install development tools: `$ sudo aptitude --without-recommends install git build-essential gcc-multilib g++-multilib libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype-dev:i386 libopus-dev:i386 libbz2-dev:i386`.
+  * Set PKG_CONFIG_PATH environment variable to point at 32-bit libraries: `$ export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig`.
 
-`$ sudo dpkg --add-architecture i386`
-* Install development tools
-  * For 32-bit engine on amd64: \
-    `$ sudo apt install build-essential gcc-multilib g++-multilib python libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386 libopus-dev:i386 libbz2-dev:i386`
-  * For everything else: \
-    `$ sudo apt install build-essential python libsdl2-dev libfontconfig-dev libfreetype6-dev libopus-dev libbz2-dev`
-* Clone this repostory:
-`$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`
+* For 64-bit engine on 64-bit x86 and other non-x86 systems:
+  * Install development tools: `$ sudo apt install git build-essential python libsdl2-dev libfontconfig-dev libfreetype6-dev libopus-dev libbz2-dev`.
+
+* Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
+
+##### RedHat/Fedora
+* Only for 32-bit engine on 64-bit x86 operating system:
+  * Install development tools: `$ sudo dnf install git gcc gcc-c++ glibc-devel.i686 SDL2-devel.i686 opus-devel.i686 fontconfig-devel.i686 freetype-devel.i686 bzip2-devel.i686`.
+  * Set PKG_CONFIG_PATH environment variable to point at 32-bit libraries: `$ export PKG_CONFIG_PATH=/usr/lib/pkgconfig`.
+
+* For 64-bit engine on 64-bit x86 and other non-x86 systems:
+  * Install development tools: `$ sudo dnf install git gcc gcc-c++ SDL2-devel opus-devel fontconfig-devel freetype-devel bzip2-devel`.
+
+* Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
 
 ### Building
 #### Windows (Visual Studio)
-0) Open command line
+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`
-4) Compile: `waf build`
-5) Install: `waf install --destdir=c:/path/to/any/output/directory`
+2) (optional) Examine which build options are available: `waf --help`.
+3) Configure build: `waf configure --sdl2=c:/path/to/SDL2`.
+4) Compile: `waf build`.
+5) Install: `waf install --destdir=c:/path/to/any/output/directory`.
 
 #### 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.
+If compiling 32-bit on amd64, make sure `PKG_CONFIG_PATH` from the previous step is set correctly, prior to running configure.
 
-0) Examine which build options are available: `./waf --help`
-1) Configure build: `./waf configure -T release`
-(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`
+0) (optional) Examine which build options are available: `./waf --help`.
+1) Configure build: `./waf configure` (you need to pass `-8` to compile 64-bit engine on 64-bit x86 processor).
+2) Compile: `./waf build`.
+3) Install: `./waf install --destdir=/path/to/any/output/directory`.

engine/client/cl_cmds.c

@@ -146,7 +146,7 @@ void CL_PlayCDTrack_f( void )
 			if( paused ) Con_Printf( "Paused %s track %u\n", looped ? "looping" : "playing", track );
 			else Con_Printf( "Currently %s track %u\n", looped ? "looping" : "playing", track );
 		}
-		Con_Printf( "Volume is %f\n", Cvar_VariableValue( "MP3Volume" ));
+		Con_Printf( "Volume is %f\n", s_musicvolume.value );
 		return;
 	}
 	else Con_Printf( "%s: unknown command %s\n", Cmd_Argv( 0 ), command );

engine/client/cl_custom.c

@@ -50,7 +50,7 @@ qboolean CL_CheckFile( sizebuf_t *msg, resource_t *pResource )
 
 	if( !cl_allow_download.value )
 	{
-		Con_Reportf( "Download refused, cl_allow_download is 0\n" );
+		Con_Reportf( "Download refused, cl_allowdownload is 0\n" );
 		return true;
 	}
 
@@ -74,7 +74,7 @@ qboolean CL_CheckFile( sizebuf_t *msg, resource_t *pResource )
 
 	if( cl.http_download )
 	{
-		HTTP_AddDownload( filepath, pResource->nDownloadSize, true );
+		HTTP_AddDownload( filepath, pResource->nDownloadSize, true, pResource );
 	}
 	else
 	{

engine/client/cl_demo.c

@@ -285,7 +285,7 @@ void CL_WriteDemoUserCmd( int cmdnumber )
 
 	// write usercmd_t
 	MSG_Init( &buf, "UserCmd", data, sizeof( data ));
-	CL_WriteUsercmd( &buf, -1, cmdnumber );	// always no delta
+	CL_WriteUsercmd( PROTO_CURRENT, &buf, -1, cmdnumber ); // always no delta, always in current protocol
 
 	bytes = MSG_GetNumBytesWritten( &buf );
 
@@ -708,7 +708,7 @@ static void CL_DemoStartPlayback( int mode )
 
 	demo.starttime = CL_GetDemoPlaybackClock(); // for determining whether to read another message
 
-	Netchan_Setup( NS_CLIENT, &cls.netchan, net_from, Cvar_VariableInteger( "net_qport" ), NULL, CL_GetFragmentSize, 0 );
+	CL_SetupNetchanForProtocol( cls.legacymode );
 
 	memset( demo.cmds, 0, sizeof( demo.cmds ));
 	demo.angle_position = 1;
@@ -1470,7 +1470,7 @@ static qboolean CL_ParseDemoHeader( const char *callee, const char *filename, fi
 		return false;
 	}
 
-	if( hdr->net_protocol != PROTOCOL_VERSION && hdr->net_protocol != PROTOCOL_LEGACY_VERSION )
+	if( hdr->net_protocol != PROTOCOL_VERSION && hdr->net_protocol != PROTOCOL_LEGACY_VERSION && hdr->net_protocol != PROTOCOL_GOLDSRC_VERSION_DEMO )
 	{
 		Con_Printf( S_ERROR "%s: net protocol outdated (%i should be %i or %i)\n",
 			callee, hdr->net_protocol, PROTOCOL_VERSION, PROTOCOL_LEGACY_VERSION );

engine/client/cl_efx.c

@@ -25,13 +25,16 @@ static CVAR_DEFINE_AUTO( tracerspeed, "6000", 0, "tracer speed" );
 static CVAR_DEFINE_AUTO( tracerlength, "0.8", 0, "tracer length factor" );
 static CVAR_DEFINE_AUTO( traceroffset, "30", 0, "tracer starting offset" );
 
-particle_t	*cl_active_particles;
-particle_t	*cl_active_tracers;
-particle_t	*cl_free_particles;
-particle_t	*cl_particles = NULL;	// particle pool
+static particle_t	*cl_active_particles;
+static particle_t	*cl_active_tracers;
+static particle_t	*cl_free_particles;
+static particle_t	*cl_particles = NULL;	// particle pool
 static vec3_t	cl_avelocities[NUMVERTEXNORMALS];
 static float	cl_lasttimewarn = 0.0f;
 
+// expand debugging BBOX particle hulls by this many units.
+#define BOX_GAP	0.0f
+
 /*
 ================
 R_LookupColor
@@ -262,9 +265,9 @@ VIEWBEAMS MANAGEMENT
 
 ==============================================================
 */
-BEAM		*cl_active_beams;
-BEAM		*cl_free_beams;
-BEAM		*cl_viewbeams = NULL;		// beams pool
+static BEAM		*cl_active_beams;
+static BEAM		*cl_free_beams;
+static BEAM		*cl_viewbeams = NULL;		// beams pool
 
 
 /*
@@ -1601,6 +1604,73 @@ void GAME_EXPORT R_RocketTrail( vec3_t start, vec3_t end, int type )
 	}
 }
 
+/*
+===============
+PM_ParticleLine
+
+draw line from particles
+================
+*/
+static void PM_ParticleLine( const vec3_t start, const vec3_t end, int pcolor, float life, float zvel )
+{
+	float	len, curdist;
+	vec3_t	diff, pos;
+
+	// determine distance
+	VectorSubtract( end, start, diff );
+	len = VectorNormalizeLength( diff );
+	curdist = 0;
+
+	while( curdist <= len )
+	{
+		VectorMA( start, curdist, diff, pos );
+		CL_Particle( pos, pcolor, life, 0, zvel );
+		curdist += 2.0f;
+	}
+}
+
+/*
+================
+PM_DrawRectangle
+
+================
+*/
+static void PM_DrawRectangle( const vec3_t tl, const vec3_t bl, const vec3_t tr, const vec3_t br, int pcolor, float life )
+{
+	PM_ParticleLine( tl, bl, pcolor, life, 0 );
+	PM_ParticleLine( bl, br, pcolor, life, 0 );
+	PM_ParticleLine( br, tr, pcolor, life, 0 );
+	PM_ParticleLine( tr, tl, pcolor, life, 0 );
+}
+
+/*
+================
+PM_DrawBBox
+
+================
+*/
+static void PM_DrawBBox( const vec3_t mins, const vec3_t maxs, const vec3_t origin, int pcolor, float life )
+{
+	vec3_t	p[8], tmp;
+	float	gap = BOX_GAP;
+	int	i;
+
+	for( i = 0; i < 8; i++ )
+	{
+		tmp[0] = (i & 1) ? mins[0] - gap : maxs[0] + gap;
+		tmp[1] = (i & 2) ? mins[1] - gap : maxs[1] + gap ;
+		tmp[2] = (i & 4) ? mins[2] - gap : maxs[2] + gap ;
+
+		VectorAdd( tmp, origin, tmp );
+		VectorCopy( tmp, p[i] );
+	}
+
+	for( i = 0; i < 6; i++ )
+	{
+		PM_DrawRectangle( p[boxpnt[i][1]], p[boxpnt[i][0]], p[boxpnt[i][2]], p[boxpnt[i][3]], pcolor, life );
+	}
+}
+
 /*
 ================
 R_ParticleLine
@@ -1764,25 +1834,6 @@ void GAME_EXPORT R_StreakSplash( const vec3_t pos, const vec3_t dir, int color,
 	}
 }
 
-/*
-===============
-R_DebugParticle
-
-just for debug purposes
-===============
-*/
-void R_DebugParticle( const vec3_t pos, byte r, byte g, byte b )
-{
-	particle_t	*p;
-
-	p = R_AllocParticle( NULL );
-	if( !p ) return;
-
-	VectorCopy( pos, p->org );
-	p->color = R_LookupColor( r, g, b );
-	p->die = cl.time + 0.01f;
-}
-
 /*
 ===============
 CL_Particle

engine/client/cl_events.c

@@ -422,14 +422,12 @@ void CL_ParseEvent( sizebuf_t *msg, connprotocol_t proto )
 	int		event_index;
 	int		i, num_events;
 	int		packet_index;
-	event_args_t	nullargs, args;
+	const event_args_t nullargs = { 0 };
+	event_args_t args = { 0 };
 	entity_state_t	*state;
 	float		delay;
 	int		entity_bits;
 
-	memset( &nullargs, 0, sizeof( nullargs ));
-	memset( &args, 0, sizeof( args ));
-
 	num_events = MSG_ReadUBitLong( msg, 5 );
 
 	if( proto == PROTO_GOLDSRC )
@@ -443,16 +441,18 @@ void CL_ParseEvent( sizebuf_t *msg, connprotocol_t proto )
 	{
 		event_index = MSG_ReadUBitLong( msg, MAX_EVENT_BITS );
 
-		if( MSG_ReadOneBit( msg ))
-			packet_index = MSG_ReadUBitLong( msg, entity_bits );
-		else packet_index = -1;
-
 		if( MSG_ReadOneBit( msg ))
 		{
-			if( proto == PROTO_GOLDSRC )
-				Delta_ReadGSFields( msg, DT_EVENT_T, &nullargs, &args, 0.0f );
-			else MSG_ReadDeltaEvent( msg, &nullargs, &args );
+			packet_index = MSG_ReadUBitLong( msg, entity_bits );
+
+			if( MSG_ReadOneBit( msg ))
+			{
+				if( proto == PROTO_GOLDSRC )
+					Delta_ReadGSFields( msg, DT_EVENT_T, &nullargs, &args, 0.0f );
+				else MSG_ReadDeltaEvent( msg, &nullargs, &args );
+			}
 		}
+		else packet_index = -1;
 
 		if( MSG_ReadOneBit( msg ))
 			delay = (float)MSG_ReadWord( msg ) * (1.0f / 100.0f);

engine/client/cl_frame.c

@@ -174,7 +174,7 @@ static qboolean CL_EntityCustomLerp( cl_entity_t *e )
 	// INTERPOLATION IN GRAVGUNMOD COOP
 	// MUST BE REMOVED ONCE WE REMOVE 48 PROTO SUPPORT
 	case MOVETYPE_TOSS:
-		if( cls.legacymode && e->model && e->model->type == mod_studio )
+		if( cls.legacymode == PROTO_LEGACY && e->model && e->model->type == mod_studio )
 			return false;
 	}
 
@@ -1265,7 +1265,7 @@ static void CL_LinkPacketEntities( frame_t *frame )
 			// ABSOLUTELY STUPID HACK TO ALLOW MONSTERS
 			// INTERPOLATION IN GRAVGUNMOD COOP
 			// MUST BE REMOVED ONCE WE REMOVE 48 PROTO SUPPORT
-			else if( cls.legacymode && ent->model->type == mod_studio && ent->curstate.movetype == MOVETYPE_TOSS )
+			else if( cls.legacymode == PROTO_LEGACY && ent->model->type == mod_studio && ent->curstate.movetype == MOVETYPE_TOSS )
 			{
 				if( !CL_InterpolateModel( ent ))
 					continue;

engine/client/cl_game.c

@@ -34,10 +34,10 @@ GNU General Public License for more details.
 #define MAX_TEXTCHANNELS	8		// must be power of two (GoldSrc uses 4 channels)
 #define TEXT_MSGNAME	"TextMessage%i"
 
-char			cl_textbuffer[MAX_TEXTCHANNELS][2048];
-client_textmessage_t	cl_textmessage[MAX_TEXTCHANNELS];
+static char cl_textbuffer[MAX_TEXTCHANNELS][2048];
+static client_textmessage_t cl_textmessage[MAX_TEXTCHANNELS];
 
-static dllfunc_t cdll_exports[] =
+static const dllfunc_t cdll_exports[] =
 {
 { "Initialize", (void **)&clgame.dllFuncs.pfnInitialize },
 { "HUD_VidInit", (void **)&clgame.dllFuncs.pfnVidInit },
@@ -80,7 +80,7 @@ static dllfunc_t cdll_exports[] =
 };
 
 // optional exports
-static dllfunc_t cdll_new_exports[] = 	// allowed only in SDK 2.3 and higher
+static const dllfunc_t cdll_new_exports[] = 	// allowed only in SDK 2.3 and higher
 {
 { "HUD_GetStudioModelInterface", (void **)&clgame.dllFuncs.pfnGetStudioModelInterface },
 { "HUD_DirectorMessage", (void **)&clgame.dllFuncs.pfnDirectorMessage },
@@ -140,11 +140,7 @@ returns true if thirdperson is enabled
 */
 qboolean CL_IsThirdPerson( void )
 {
-	cl.local.thirdperson = clgame.dllFuncs.CL_IsThirdPerson();
-
-	if( cl.local.thirdperson )
-		return true;
-	return false;
+	return clgame.dllFuncs.CL_IsThirdPerson() ? true : false;
 }
 
 /*
@@ -1019,7 +1015,8 @@ void CL_DrawHUD( int state )
 		CL_DrawCrosshair ();
 		CL_DrawCenterPrint ();
 		clgame.dllFuncs.pfnRedraw( cl.time, cl.intermission );
-		CL_DrawLoadingOrPaused( cls.pauseIcon );
+		if( showpause.value )
+			CL_DrawLoadingOrPaused( cls.pauseIcon );
 		break;
 	case CL_LOADING:
 		CL_DrawLoadingOrPaused( cls.loadingBar );
@@ -3488,7 +3485,7 @@ static void GAME_EXPORT NetAPI_SendRequest( int context, int request, int flags,
 	nr->flags = flags;
 
 	// local servers request
-	Netchan_OutOfBandPrint( NS_CLIENT, nr->resp.remote_address, "netinfo %i %i %i", FBitSet( flags, FNETAPI_LEGACY_PROTOCOL ) ? PROTOCOL_LEGACY_VERSION : PROTOCOL_VERSION, context, request );
+	Netchan_OutOfBandPrint( NS_CLIENT, nr->resp.remote_address, A2A_NETINFO" %i %i %i", FBitSet( flags, FNETAPI_LEGACY_PROTOCOL ) ? PROTOCOL_LEGACY_VERSION : PROTOCOL_VERSION, context, request );
 }
 
 /*

engine/client/cl_gameui.c

@@ -1303,6 +1303,16 @@ static gameinfo2_t *pfnGetModInfo( int gi_version, int i )
 	return &gameui.modsInfo[i];
 }
 
+static int pfnIsCvarReadOnly( const char *name )
+{
+	convar_t *cv = Cvar_FindVar( name );
+
+	if( !cv )
+		return -1;
+
+	return FBitSet( cv->flags, FCVAR_READ_ONLY ) ? 1 : 0;
+}
+
 static ui_extendedfuncs_t gExtendedfuncs =
 {
 	pfnEnableTextInput,
@@ -1318,6 +1328,7 @@ static ui_extendedfuncs_t gExtendedfuncs =
 	&gNetApi,
 	pfnGetGameInfo,
 	pfnGetModInfo,
+	pfnIsCvarReadOnly,
 };
 
 void UI_UnloadProgs( void )

engine/client/cl_netgraph.c

@@ -63,9 +63,9 @@ static byte netcolors[NETGRAPH_NET_COLORS+NETGRAPH_LERP_HEIGHT][4] =
 	// other will be generated through NetGraph_InitColors()
 };
 
-static byte sendcolor[4] = { 88, 29, 130, 255 };
-static byte holdcolor[4] = { 255, 0, 0, 200 };
-static byte extrap_base_color[4] = { 255, 255, 255, 255 };
+static const byte sendcolor[4] = { 88, 29, 130, 255 };
+static const byte holdcolor[4] = { 255, 0, 0, 200 };
+static const byte extrap_base_color[4] = { 255, 255, 255, 255 };
 static netbandwidthgraph_t	netstat_graph[NET_TIMINGS];
 static float		packet_loss;
 static float		packet_choke;
@@ -79,7 +79,7 @@ NetGraph_DrawRect
 NetGraph_FillRGBA shortcut
 ==========
 */
-static void NetGraph_DrawRect( wrect_t *rect, byte colors[4] )
+static void NetGraph_DrawRect( const wrect_t *rect, const byte colors[4] )
 {
 	ref.dllFuncs.Color4ub( colors[0], colors[1], colors[2], colors[3] );	// color for this quad
 

engine/client/cl_parse.c

@@ -156,7 +156,7 @@ void CL_ParseRestoreSoundPacket( sizebuf_t *msg )
 		char	sentenceName[32];
 
 		if( flags & SND_SEQUENCE )
-			Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound + MAX_SOUNDS_NONSENTENCE );
+			Q_snprintf( sentenceName, sizeof( sentenceName ), "!#%i", sound + MAX_SOUNDS_NONSENTENCE );
 		else Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound );
 
 		handle = S_RegisterSound( sentenceName );
@@ -181,14 +181,14 @@ CL_ParseServerTime
 
 ==================
 */
-void CL_ParseServerTime( sizebuf_t *msg )
+void CL_ParseServerTime( sizebuf_t *msg, connprotocol_t proto )
 {
 	double	dt;
 
 	cl.mtime[1] = cl.mtime[0];
 	cl.mtime[0] = MSG_ReadFloat( msg );
 
-	if( cls.legacymode == PROTO_QUAKE )
+	if( proto == PROTO_QUAKE )
 		return; // don't mess the time
 
 	if( cl.maxclients == 1 )
@@ -264,7 +264,7 @@ CL_ParseParticles
 
 ==================
 */
-void CL_ParseParticles( sizebuf_t *msg )
+void CL_ParseParticles( sizebuf_t *msg, connprotocol_t proto )
 {
 	vec3_t		org, dir;
 	int		i, count, color;
@@ -277,8 +277,12 @@ void CL_ParseParticles( sizebuf_t *msg )
 
 	count = MSG_ReadByte( msg );
 	color = MSG_ReadByte( msg );
-	if( count == 255 ) count = 1024;
-	life = MSG_ReadByte( msg ) * 0.125f;
+	if( count == 255 )
+		count = 1024;
+
+	if( proto == PROTO_GOLDSRC )
+		life = 0.0f;
+	else life = MSG_ReadByte( msg ) * 0.125f;
 
 	if( life != 0.0f && count == 1 )
 	{
@@ -304,7 +308,7 @@ CL_ParseStaticEntity
 static client entity
 ==================
 */
-void CL_ParseStaticEntity( sizebuf_t *msg )
+static void CL_ParseStaticEntity( sizebuf_t *msg )
 {
 	int		i, newnum;
 	entity_state_t	from, to;
@@ -694,7 +698,7 @@ void CL_ParseCustomization( sizebuf_t *msg )
 
 	if( !cl_allow_download.value )
 	{
-		Con_DPrintf( "Refusing new resource, cl_allow_download set to 0\n" );
+		Con_DPrintf( "Refusing new resource, cl_allowdownload set to 0\n" );
 		Mem_Free( pRes );
 		return;
 	}
@@ -787,7 +791,9 @@ void CL_ParseResourceRequest( sizebuf_t *msg )
 			MSG_WriteBytes( &sbuf, cl.resourcelist[i].rgucMD5_hash, 16 );
 	}
 
-	if( MSG_GetNumBytesWritten( &sbuf ) > 0 )
+	// a1ba: useless check? MSG_BeginClientCmd and MSG_WriteShort will always
+	// write to the buffer
+	// if( MSG_GetNumBytesWritten( &sbuf ) > 0 )
 	{
 		Netchan_CreateFragments( &cls.netchan, &sbuf );
 		Netchan_FragSend( &cls.netchan );
@@ -850,7 +856,7 @@ void CL_ParseServerData( sizebuf_t *msg, connprotocol_t proto )
 	char	gamefolder[MAX_QPATH];
 	string	mapfile;
 	qboolean	background;
-	int	i;
+	int	i, required_version;
 	uint32_t	mapCRC;
 
 	HPAK_CheckSize( hpk_custom_file.string );
@@ -858,12 +864,15 @@ void CL_ParseServerData( sizebuf_t *msg, connprotocol_t proto )
 	switch( proto )
 	{
 	case PROTO_LEGACY:
+		required_version = PROTOCOL_LEGACY_VERSION;
 		Con_Reportf( "Legacy serverdata packet received.\n" );
 		break;
 	case PROTO_GOLDSRC:
+		required_version = PROTOCOL_GOLDSRC_VERSION;
 		Con_Reportf( "GoldSrc serverdata packet received.\n" );
 		break;
 	default:
+		required_version = PROTOCOL_VERSION;
 		Con_Reportf( "Serverdata packet received.\n" );
 		break;
 	}
@@ -882,43 +891,47 @@ void CL_ParseServerData( sizebuf_t *msg, connprotocol_t proto )
 
 	// parse protocol version number
 	i = MSG_ReadLong( msg );
-
-	if( proto == PROTO_LEGACY || proto == PROTO_GOLDSRC ) // GoldSrc protocol version is 48, same as Xash3D 48
-	{
-		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 );
-	}
+	if( i != required_version ) // GoldSrc protocol version is 48, same as Xash3D 48
+		Host_Error( "Server use invalid protocol (%i should be %i)\n", i, required_version );
 
 	cl.servercount = MSG_ReadLong( msg );
 	cl.checksum = MSG_ReadLong( msg );
 	if( proto == PROTO_GOLDSRC )
 	{
 		byte clientdllmd5[16];
-		byte unused;
+		const char *s;
 
 		MSG_ReadBytes( msg, clientdllmd5, sizeof( clientdllmd5 ));
 		cl.maxclients = MSG_ReadByte( msg );
 		cl.playernum = MSG_ReadByte( msg );
-		unused = MSG_ReadByte( msg ); // coop flag
+		COM_UnMunge3((byte *)&cl.checksum, sizeof( cl.checksum ), ( 0xff - cl.playernum ) & 0xff );
+
+		MSG_SeekToBit( msg, sizeof( uint8_t ) << 3, SEEK_CUR ); // quake leftover, coop flag
+
 		Q_strncpy( gamefolder, MSG_ReadString( msg ), sizeof( gamefolder ));
-		MSG_ReadString( msg ); // hostname
-		Q_strncpy( clgame.mapname, MSG_ReadString( msg ), sizeof( clgame.mapname ));
-		MSG_ReadString( msg ); // mapcycle?????
-		unused = MSG_ReadByte( msg ); // vac secure
+		Con_Printf( "Remote host: %s\n", MSG_ReadString( msg ));
+		Q_strncpy( clgame.mapname, COM_FileWithoutPath( MSG_ReadString( msg )), sizeof( clgame.mapname ));
+		COM_StripExtension( clgame.mapname );
+
+		s = MSG_ReadString( msg );
+		if( COM_CheckStringEmpty( s ))
+			Con_Printf( "Server map cycle: %s\n", s ); // VALVEWHY?
+
+		if( MSG_ReadByte( msg ))
+			Con_Printf( "Uh, server says it's VAC2 secured.\n" );
 
 		background = false;
 		clgame.maxEntities = GI->max_edicts + (( cl.maxclients - 1 ) * 15 );
 		clgame.maxEntities = bound( MIN_LEGACY_EDICTS, clgame.maxEntities, MAX_GOLDSRC_EDICTS );
 		clgame.maxModels = 512; // ???
 		Q_strncpy( clgame.maptitle, clgame.mapname, sizeof( clgame.maptitle ));
+
+		Host_ValidateEngineFeatures( 0, 0 );
 	}
 	else
 	{
+		uint32_t mask;
+
 		cl.playernum = MSG_ReadByte( msg );
 		cl.maxclients = MSG_ReadByte( msg );
 		clgame.maxEntities = MSG_ReadWord( msg );
@@ -926,19 +939,21 @@ void CL_ParseServerData( sizebuf_t *msg, connprotocol_t proto )
 		{
 			clgame.maxEntities = bound( MIN_LEGACY_EDICTS, clgame.maxEntities, MAX_LEGACY_EDICTS );
 			clgame.maxModels = 512; // ???
+			mask = ENGINE_LEGACY_FEATURES_MASK;
 		}
 		else
 		{
 			clgame.maxEntities = bound( MIN_EDICTS, clgame.maxEntities, MAX_EDICTS );
 			clgame.maxModels = MSG_ReadWord( msg );
+			mask = ENGINE_FEATURES_MASK;
 		}
 		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 ));
-		Host_ValidateEngineFeatures( MSG_ReadDword( msg ));
+		Host_ValidateEngineFeatures( 0, MSG_ReadDword( msg ));
 
-		if( proto == PROTO_LEGACY )
+		if( proto != PROTO_LEGACY )
 		{
 			// receive the player hulls
 			for( i = 0; i < MAX_MAP_HULLS * 3; i++ )
@@ -1034,9 +1049,13 @@ void CL_ParseServerData( sizebuf_t *msg, connprotocol_t proto )
 		COM_ClearCustomizationList( &cl.players[i].customdata, true );
 	CL_CreateCustomizationList();
 
-	if( proto != PROTO_LEGACY )
+	// request resources from server
+	if( proto == PROTO_GOLDSRC )
+	{
+		CL_ServerCommand( true, "sendres" );
+	}
+	else if( proto != PROTO_LEGACY )
 	{
-		// request resources from server
 		CL_ServerCommand( true, "sendres %i\n", cl.servercount );
 	}
 
@@ -1223,9 +1242,6 @@ void CL_ParseBaseline( sizebuf_t *msg, connprotocol_t proto )
 
 	Delta_InitClient ();	// finalize client delta's
 
-	if( proto == PROTO_GOLDSRC )
-		MSG_StartBitWriting( msg );
-
 	while( 1 )
 	{
 		cl_entity_t *ent;
@@ -1263,7 +1279,6 @@ void CL_ParseBaseline( sizebuf_t *msg, connprotocol_t proto )
 		if( proto == PROTO_GOLDSRC )
 		{
 			int type = MSG_ReadUBitLong( msg, 2 );
-			int bits = MSG_GetNumBitsWritten( msg );
 			int delta_type;
 
 			if( player ) delta_type = DT_ENTITY_STATE_PLAYER_T;
@@ -1271,6 +1286,7 @@ void CL_ParseBaseline( sizebuf_t *msg, connprotocol_t proto )
 			else delta_type = DT_ENTITY_STATE_T;
 
 			Delta_ReadGSFields( msg, delta_type, &ent->prevstate, &ent->baseline, 1.0f );
+			ent->baseline.entityType = type;
 		}
 		else MSG_ReadDeltaEntity( msg, &nullstate, &ent->baseline, newnum, player, 1.0f );
 
@@ -1295,9 +1311,6 @@ void CL_ParseBaseline( sizebuf_t *msg, connprotocol_t proto )
 			}
 		}
 	}
-
-	if( proto == PROTO_GOLDSRC )
-		MSG_EndBitWriting( msg );
 }
 
 /*
@@ -1408,14 +1421,14 @@ CL_RegisterUserMessage
 register new user message or update existing
 ================
 */
-void CL_RegisterUserMessage( sizebuf_t *msg )
+void CL_RegisterUserMessage( sizebuf_t *msg, connprotocol_t proto )
 {
-	char	*pszName;
+	char *pszName;
 	int	svc_num, size, bits;
 
 	svc_num = MSG_ReadByte( msg );
 
-	if( cls.legacymode )
+	if( proto == PROTO_LEGACY || proto == PROTO_GOLDSRC )
 	{
 		size = MSG_ReadByte( msg );
 		bits = 8;
@@ -1426,7 +1439,16 @@ void CL_RegisterUserMessage( sizebuf_t *msg )
 		bits = 16;
 	}
 
-	pszName = MSG_ReadString( msg );
+	if( proto == PROTO_GOLDSRC )
+	{
+		static char szName[17];
+
+		MSG_ReadBytes( msg, szName, sizeof( szName ) - 1 );
+		szName[16] = 0;
+
+		pszName = szName;
+	}
+	else pszName = MSG_ReadString( msg );
 
 	// important stuff
 	if( size == ( BIT( bits ) - 1 ) )
@@ -1484,9 +1506,15 @@ void CL_UpdateUserinfo( sizebuf_t *msg, connprotocol_t proto )
 		if( proto != PROTO_LEGACY )
 			MSG_ReadBytes( msg, player->hashedcdkey, sizeof( player->hashedcdkey ));
 
-		if( slot == cl.playernum ) gameui.playerinfo = *player;
+		if( proto == PROTO_GOLDSRC && ( !COM_CheckStringEmpty( player->userinfo ) || !COM_CheckStringEmpty( player->name )))
+			active = false;
+
+		if( active && slot == cl.playernum )
+			gameui.playerinfo = *player;
 	}
-	else
+
+
+	if( !active )
 	{
 		COM_ClearCustomizationList( &player->customdata, true );
 
@@ -1583,24 +1611,34 @@ void CL_UpdateUserPings( sizebuf_t *msg )
 	}
 }
 
-static void CL_SendConsistencyInfo( sizebuf_t *msg )
+static void CL_SendConsistencyInfo( sizebuf_t *msg, connprotocol_t proto )
 {
 	qboolean		user_changed_diskfile;
 	vec3_t		mins, maxs;
 	string		filename;
 	CRC32_t		crcFile;
-	byte		md5[16];
+	byte		md5[16] = { 0 };
 	consistency_t	*pc;
-	int		i;
+	int		i, pos;
 
 	if( !cl.need_force_consistency_response )
 		return;
 	cl.need_force_consistency_response = false;
 
 	MSG_BeginClientCmd( msg, clc_fileconsistency );
+	pos = MSG_GetNumBytesWritten( msg );
+	if( proto == PROTO_GOLDSRC )
+	{
+		MSG_WriteShort( msg, 0 );
+		MSG_StartBitWriting( msg );
+	}
+
+	FS_AllowDirectPaths( true );
 
 	for( i = 0; i < cl.num_consistency; i++ )
 	{
+		qboolean have_file = true;
+
 		pc = &cl.consistency_list[i];
 
 		user_changed_diskfile = false;
@@ -1611,7 +1649,10 @@ static void CL_SendConsistencyInfo( sizebuf_t *msg )
 			Q_snprintf( filename, sizeof( filename ), DEFAULT_SOUNDPATH "%s", pc->filename );
 		else Q_strncpy( filename, pc->filename, sizeof( filename ));
 
-		if( Q_strstr( filename, "models/" ))
+		COM_FixSlashes( filename );
+		have_file = FS_FileExists( filename, false );
+
+		if( Q_strstr( filename, "models/" ) && have_file )
 		{
 			CRC32_Init( &crcFile );
 			CRC32_File( &crcFile, filename );
@@ -1622,6 +1663,8 @@ static void CL_SendConsistencyInfo( sizebuf_t *msg )
 		switch( pc->check_type )
 		{
 		case force_exactfile:
+			// servers rely on md5 not being initialized after previous file
+			// if current file doesn't exist
 			MD5_HashFile( md5, filename, NULL );
 			memcpy( &pc->value, md5, sizeof( pc->value ));
 			LittleLongSW( pc->value );
@@ -1630,12 +1673,37 @@ static void CL_SendConsistencyInfo( sizebuf_t *msg )
 				MSG_WriteUBitLong( msg, 0, 32 );
 			else MSG_WriteUBitLong( msg, pc->value, 32 );
 			break;
+
+		case force_model_specifybounds_if_avail:
+			if( have_file )
+			{
+				if( !Mod_GetStudioBounds( filename, mins, maxs ))
+					Host_Error( "unable to find %s\n", filename );
+
+				if( user_changed_diskfile )
+				{
+					VectorSet( mins, -9999.9f, -9999.9f, -9999.9f );
+					VectorSet( maxs, 9999.9f, 9999.9f, 9999.9f );
+				}
+			}
+			else
+			{
+				VectorSet( mins, -1.0f, -1.0f, -1.0f );
+				VectorCopy( mins, maxs );
+			}
+
+			MSG_WriteBytes( msg, mins, 12 );
+			MSG_WriteBytes( msg, maxs, 12 );
+			break;
 		case force_model_samebounds:
 		case force_model_specifybounds:
 			if( !Mod_GetStudioBounds( filename, mins, maxs ))
 				Host_Error( "unable to find %s\n", filename );
 			if( user_changed_diskfile )
-				ClearBounds( maxs, mins ); // g-cont. especially swapped
+			{
+				VectorSet( mins, -9999.9f, -9999.9f, -9999.9f );
+				VectorSet( maxs, 9999.9f, 9999.9f, 9999.9f );
+			}
 			MSG_WriteBytes( msg, mins, 12 );
 			MSG_WriteBytes( msg, maxs, 12 );
 			break;
@@ -1645,7 +1713,20 @@ static void CL_SendConsistencyInfo( sizebuf_t *msg )
 		}
 	}
 
+	FS_AllowDirectPaths( false );
+
 	MSG_WriteOneBit( msg, 0 );
+
+	if( proto == PROTO_GOLDSRC )
+	{
+		int len;
+		MSG_EndBitWriting( msg );
+
+		len = MSG_GetNumBytesWritten( msg ) - pos - 2;
+		*(short *)&msg->pData[pos] = len;
+
+		COM_Munge( &msg->pData[pos + 2], len, cl.servercount );
+	}
 }
 
 /*
@@ -1703,7 +1784,7 @@ void CL_RegisterResources( sizebuf_t *msg, connprotocol_t proto )
 	}
 
 	if( !cls.demoplayback )
-		CL_SendConsistencyInfo( msg );
+		CL_SendConsistencyInfo( msg, proto );
 
 	// All done precaching.
 	cl.worldmodel = CL_ModelHandle( 1 ); // get world pointer
@@ -1821,7 +1902,11 @@ static void CL_ParseConsistencyInfo( sizebuf_t *msg, connprotocol_t proto )
 		pc->value = 0;
 
 		if( pResource->type == t_model && memcmp( nullbuffer, pResource->rguc_reserved, 32 ))
+		{
+			if( proto == PROTO_GOLDSRC )
+				COM_UnMunge( pResource->rguc_reserved, sizeof( pResource->rguc_reserved ), cl.servercount );
 			pc->check_type = pResource->rguc_reserved[0];
+		}
 
 		skip_crc_change = pResource;
 		lastcheck = delta;
@@ -1885,15 +1970,29 @@ CL_ParseVoiceData
 
 ==================
 */
-void CL_ParseVoiceData( sizebuf_t *msg )
+void CL_ParseVoiceData( sizebuf_t *msg, connprotocol_t proto )
 {
 	int size, idx, frames;
 	byte received[8192];
 
 	idx = MSG_ReadByte( msg ) + 1;
 
-	frames = MSG_ReadByte( msg );
+	if( proto == PROTO_GOLDSRC )
+	{
+		size = MSG_ReadShort( msg );
+		MSG_SeekToBit( msg, size << 3, SEEK_CUR ); // skip the entire buf, not supported yet
 
+#if 0 // shall we notify client.dll if nothing can be heard?
+		// 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 );
+#endif
+		return;
+	}
+
+	frames = MSG_ReadByte( msg );
 	size = MSG_ReadShort( msg );
 	size = Q_min( size, sizeof( received ));
 
@@ -2082,7 +2181,7 @@ and sent it back to the server
 */
 void CL_ParseCvarValue( sizebuf_t *msg, const qboolean ext, const connprotocol_t proto )
 {
-	const char *cvarName, *response;
+	const char *cvarName, *response = NULL;
 	convar_t *cvar;
 	int requestID;
 
@@ -2090,37 +2189,51 @@ void CL_ParseCvarValue( sizebuf_t *msg, const qboolean ext, const connprotocol_t
 		requestID = MSG_ReadLong( msg );
 
 	cvarName = MSG_ReadString( msg );
-	cvar = Cvar_FindVar( cvarName );
 
-	if( cvar )
+	if( proto == PROTO_GOLDSRC )
 	{
-		if( cvar->flags & FCVAR_PRIVILEGED )
-			response = "CVAR is privileged";
-		else if( cvar->flags & FCVAR_SERVER )
-			response = "CVAR is server-only";
-		else if( cvar->flags & FCVAR_PROTECTED )
-			response = "CVAR is protected";
+		if( !Q_stricmp( cvarName, "sv_version" ))
+			response = "1.1.2.2/Stdio,48,10211";
+	}
+
+	if( !response )
+	{
+		cvar = Cvar_FindVar( cvarName );
+
+		if( cvar )
+		{
+			if( cvar->flags & FCVAR_PRIVILEGED )
+				response = "CVAR is privileged";
+			else if( cvar->flags & FCVAR_SERVER )
+				response = "CVAR is server-only";
+			else if( cvar->flags & FCVAR_PROTECTED )
+				response = "CVAR is protected";
+			else
+				response = cvar->string;
+		}
+		else if( proto == PROTO_LEGACY )
+		{
+			response = "Not Found";
+		}
 		else
-			response = cvar->string;
-	}
-	else if( proto == PROTO_LEGACY )
-	{
-		response = "Not Found";
-	}
-	else
-	{
-		response = "Bad CVAR request";
+		{
+			response = "Bad CVAR request";
+		}
 	}
 
 	if( ext )
 	{
-		MSG_BeginClientCmd( &cls.netchan.message, clc_requestcvarvalue2 );
+		int clc_msg = proto == PROTO_GOLDSRC ? clc_goldsrc_requestcvarvalue2 : clc_requestcvarvalue2;
+
+		MSG_BeginClientCmd( &cls.netchan.message, clc_msg );
 		MSG_WriteLong( &cls.netchan.message, requestID );
 		MSG_WriteString( &cls.netchan.message, cvarName );
 	}
 	else
 	{
-		MSG_BeginClientCmd( &cls.netchan.message, clc_requestcvarvalue );
+		int clc_msg = proto == PROTO_GOLDSRC ? clc_goldsrc_requestcvarvalue : clc_requestcvarvalue;
+
+		MSG_BeginClientCmd( &cls.netchan.message, clc_msg );
 	}
 	MSG_WriteString( &cls.netchan.message, response );
 }
@@ -2218,7 +2331,7 @@ CL_ParseUserMessage
 handles all user messages
 ==============
 */
-void CL_ParseUserMessage( sizebuf_t *msg, int svc_num )
+void CL_ParseUserMessage( sizebuf_t *msg, int svc_num, connprotocol_t proto )
 {
 	byte	pbuf[MAX_USERMSG_LENGTH];
 	int	i, iSize;
@@ -2258,7 +2371,7 @@ void CL_ParseUserMessage( sizebuf_t *msg, int svc_num )
 	// message with variable sizes receive an actual size as first byte
 	if( iSize == -1 )
 	{
-		if( cls.legacymode )
+		if( proto == PROTO_GOLDSRC || proto == PROTO_LEGACY )
 			iSize = MSG_ReadByte( msg );
 		else iSize = MSG_ReadWord( msg );
 	}
@@ -2306,6 +2419,54 @@ ACTION MESSAGES
 
 =====================================================================
 */
+
+/*
+============
+CL_ParseCommonDLLMessage
+
+parse a message which structure is enforced by DLL compatibility
+it should always be the same regardless of protocol used
+============
+*/
+qboolean CL_ParseCommonDLLMessage( sizebuf_t *msg, connprotocol_t proto, int svc_num, int startoffset )
+{
+	int param1, param2;
+
+	switch( svc_num )
+	{
+	case svc_temp_entity:
+		CL_ParseTempEntity( msg, proto ); // need protocol because message header differs
+		cl.frames[cl.parsecountmod].graphdata.tentities += MSG_GetNumBytesRead( msg ) - startoffset;
+		break;
+	case svc_intermission:
+		cl.intermission = 1;
+		break;
+	case svc_cdtrack:
+		param1 = MSG_ReadByte( msg );
+		param1 = bound( 1, param1, MAX_CDTRACKS ); // tracknum
+		param2 = MSG_ReadByte( msg );
+		param2 = bound( 1, param2, MAX_CDTRACKS ); // loopnum
+		S_StartBackgroundTrack( clgame.cdtracks[param1-1], clgame.cdtracks[param2-1], 0, false );
+		break;
+	case svc_weaponanim:
+		param1 = MSG_ReadByte( msg );	// iAnim
+		param2 = MSG_ReadByte( msg );	// body
+		CL_WeaponAnim( param1, param2 );
+		break;
+	case svc_roomtype:
+		param1 = MSG_ReadShort( msg );
+		Cvar_SetValue( "room_type", param1 );
+		break;
+	case svc_director:
+		CL_ParseDirector( msg );
+		break;
+	default:
+		return false;
+	}
+
+	return true;
+}
+
 /*
 =====================
 CL_ParseServerMessage
@@ -2316,7 +2477,7 @@ dispatch messages
 void CL_ParseServerMessage( sizebuf_t *msg )
 {
 	size_t		bufStart, playerbytes;
-	int		cmd, param1, param2;
+	int		cmd;
 	int		old_background;
 	const char	*s;
 
@@ -2341,6 +2502,9 @@ void CL_ParseServerMessage( sizebuf_t *msg )
 		// record command for debugging spew on parse problem
 		CL_Parse_RecordCommand( cmd, bufStart );
 
+		if( CL_ParseCommonDLLMessage( msg, PROTO_CURRENT, cmd, bufStart ))
+			continue;
+
 		// other commands
 		switch( cmd )
 		{
@@ -2404,7 +2568,7 @@ void CL_ParseServerMessage( sizebuf_t *msg )
 			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_time:
-			CL_ParseServerTime( msg );
+			CL_ParseServerTime( msg, PROTO_CURRENT );
 			break;
 		case svc_print:
 			Con_Printf( "%s", MSG_ReadString( msg ));
@@ -2452,7 +2616,7 @@ void CL_ParseServerMessage( sizebuf_t *msg )
 			CL_UpdateUserPings( msg );
 			break;
 		case svc_particle:
-			CL_ParseParticles( msg );
+			CL_ParseParticles( msg, PROTO_CURRENT );
 			break;
 		case svc_restoresound:
 			CL_ParseRestoreSoundPacket( msg );
@@ -2468,10 +2632,6 @@ void CL_ParseServerMessage( sizebuf_t *msg )
 		case svc_spawnbaseline:
 			CL_ParseBaseline( msg, PROTO_CURRENT );
 			break;
-		case svc_temp_entity:
-			CL_ParseTempEntity( msg, PROTO_CURRENT );
-			cl.frames[cl.parsecountmod].graphdata.tentities += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
 		case svc_setpause:
 			cl.paused = ( MSG_ReadOneBit( msg ) != 0 );
 			break;
@@ -2481,42 +2641,23 @@ void CL_ParseServerMessage( sizebuf_t *msg )
 		case svc_centerprint:
 			CL_CenterPrint( MSG_ReadString( msg ), 0.25f );
 			break;
-		case svc_intermission:
-			cl.intermission = 1;
-			break;
 		case svc_finale:
 			CL_ParseFinaleCutscene( msg, 2 );
 			break;
-		case svc_cdtrack:
-			param1 = MSG_ReadByte( msg );
-			param1 = bound( 1, param1, MAX_CDTRACKS ); // tracknum
-			param2 = MSG_ReadByte( msg );
-			param2 = bound( 1, param2, MAX_CDTRACKS ); // loopnum
-			S_StartBackgroundTrack( clgame.cdtracks[param1-1], clgame.cdtracks[param2-1], 0, false );
-			break;
 		case svc_restore:
 			CL_ParseRestore( msg );
 			break;
 		case svc_cutscene:
 			CL_ParseFinaleCutscene( msg, 3 );
 			break;
-		case svc_weaponanim:
-			param1 = MSG_ReadByte( msg );	// iAnim
-			param2 = MSG_ReadByte( msg );	// body
-			CL_WeaponAnim( param1, param2 );
-			break;
 		case svc_bspdecal:
 			CL_ParseStaticDecal( msg );
 			break;
-		case svc_roomtype:
-			param1 = MSG_ReadShort( msg );
-			Cvar_SetValue( "room_type", param1 );
-			break;
 		case svc_addangle:
 			CL_ParseAddAngle( msg );
 			break;
 		case svc_usermessage:
-			CL_RegisterUserMessage( msg );
+			CL_RegisterUserMessage( msg, PROTO_CURRENT );
 			break;
 		case svc_packetentities:
 			playerbytes = CL_ParsePacketEntities( msg, false, PROTO_CURRENT );
@@ -2556,14 +2697,11 @@ void CL_ParseServerMessage( sizebuf_t *msg )
 		case svc_hltv:
 			CL_ParseHLTV( msg );
 			break;
-		case svc_director:
-			CL_ParseDirector( msg );
-			break;
 		case svc_voiceinit:
 			CL_ParseVoiceInit( msg );
 			break;
 		case svc_voicedata:
-			CL_ParseVoiceData( msg );
+			CL_ParseVoiceData( msg, PROTO_CURRENT );
 			cl.frames[cl.parsecountmod].graphdata.voicebytes += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_resourcelocation:
@@ -2579,7 +2717,7 @@ void CL_ParseServerMessage( sizebuf_t *msg )
 			CL_ParseExec( msg );
 			break;
 		default:
-			CL_ParseUserMessage( msg, cmd );
+			CL_ParseUserMessage( msg, cmd, PROTO_CURRENT );
 			cl.frames[cl.parsecountmod].graphdata.usr += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		}

engine/client/cl_parse_48.c

@@ -137,12 +137,7 @@ static void CL_LegacyParseSoundPacket( sizebuf_t *msg, qboolean is_ambient )
 	if( FBitSet( flags, SND_SENTENCE ))
 	{
 		char	sentenceName[32];
-
-		//if( FBitSet( flags, SND_SEQUENCE ))
-			//Q_snprintf( sentenceName, sizeof( sentenceName ), "!#%i", sound + MAX_SOUNDS );
-		//else
 		Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound );
-
 		handle = S_RegisterSound( sentenceName );
 	}
 	else handle = cl.sound_index[sound];	// see precached sound
@@ -269,7 +264,7 @@ static void CL_LegacyParseResourceList( sizebuf_t *msg )
 
 	if( !cl_allow_download.value )
 	{
-		Con_DPrintf( "Refusing new resource, cl_allow_download set to 0\n" );
+		Con_DPrintf( "Refusing new resource, cl_allowdownload set to 0\n" );
 		reslist.rescount = 0;
 	}
 
@@ -300,7 +295,7 @@ static void CL_LegacyParseResourceList( sizebuf_t *msg )
 			continue;	// already exists
 
 		host.downloadcount++;
-		HTTP_AddDownload( path, -1, true );
+		HTTP_AddDownload( path, -1, true, NULL );
 	}
 
 	if( !host.downloadcount )
@@ -320,7 +315,7 @@ dispatch messages
 void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 {
 	size_t		bufStart, playerbytes;
-	int		cmd, param1, param2;
+	int		cmd;
 	int		old_background;
 	const char	*s;
 
@@ -345,6 +340,9 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 		// record command for debugging spew on parse problem
 		CL_Parse_RecordCommand( cmd, bufStart );
 
+		if( CL_ParseCommonDLLMessage( msg, PROTO_LEGACY, cmd, bufStart ))
+			continue;
+
 		// other commands
 		switch( cmd )
 		{
@@ -421,7 +419,7 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 
 			break;
 		case svc_time:
-			CL_ParseServerTime( msg );
+			CL_ParseServerTime( msg, PROTO_LEGACY );
 			break;
 		case svc_print:
 			Con_Printf( "%s", MSG_ReadString( msg ));
@@ -468,11 +466,10 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 			CL_UpdateUserPings( msg );
 			break;
 		case svc_particle:
-			CL_ParseParticles( msg );
+			CL_ParseParticles( msg, PROTO_LEGACY );
 			break;
 		case svc_restoresound:
-			CL_ParseRestoreSoundPacket( msg );
-			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
+			Con_Printf( S_ERROR "%s: svc_restoresound: implement me!\n", __func__ );
 			break;
 		case svc_spawnstatic:
 			CL_LegacyParseStaticEntity( msg );
@@ -484,10 +481,6 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 		case svc_spawnbaseline:
 			CL_ParseBaseline( msg, PROTO_LEGACY );
 			break;
-		case svc_temp_entity:
-			CL_ParseTempEntity( msg, PROTO_LEGACY );
-			cl.frames[cl.parsecountmod].graphdata.tentities += MSG_GetNumBytesRead( msg ) - bufStart;
-			break;
 		case svc_setpause:
 			cl.paused = ( MSG_ReadOneBit( msg ) != 0 );
 			break;
@@ -497,45 +490,26 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 		case svc_centerprint:
 			CL_CenterPrint( MSG_ReadString( msg ), 0.25f );
 			break;
-		case svc_intermission:
-			cl.intermission = 1;
-			break;
 		case svc_legacy_modelindex:
 			CL_LegacyPrecacheModel( msg );
 			break;
 		case svc_legacy_soundindex:
 			CL_LegacyPrecacheSound( msg );
 			break;
-		case svc_cdtrack:
-			param1 = MSG_ReadByte( msg );
-			param1 = bound( 1, param1, MAX_CDTRACKS ); // tracknum
-			param2 = MSG_ReadByte( msg );
-			param2 = bound( 1, param2, MAX_CDTRACKS ); // loopnum
-			S_StartBackgroundTrack( clgame.cdtracks[param1-1], clgame.cdtracks[param2-1], 0, false );
-			break;
 		case svc_restore:
 			CL_ParseRestore( msg );
 			break;
 		case svc_legacy_eventindex:
 			CL_LegacyPrecacheEvent(msg);
 			break;
-		case svc_weaponanim:
-			param1 = MSG_ReadByte( msg );	// iAnim
-			param2 = MSG_ReadByte( msg );	// body
-			CL_WeaponAnim( param1, param2 );
-			break;
 		case svc_bspdecal:
 			CL_ParseStaticDecal( msg );
 			break;
-		case svc_roomtype:
-			param1 = MSG_ReadShort( msg );
-			Cvar_SetValue( "room_type", param1 );
-			break;
 		case svc_addangle:
 			CL_ParseAddAngle( msg );
 			break;
 		case svc_usermessage:
-			CL_RegisterUserMessage( msg );
+			CL_RegisterUserMessage( msg, PROTO_LEGACY );
 			break;
 		case svc_packetentities:
 			playerbytes = CL_ParsePacketEntities( msg, false, PROTO_LEGACY );
@@ -590,9 +564,6 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 		case svc_hltv:
 			CL_ParseHLTV( msg );
 			break;
-		case svc_director:
-			CL_ParseDirector( msg );
-			break;
 		case svc_resourcelocation:
 			CL_ParseResLocation( msg );
 			break;
@@ -603,7 +574,7 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg )
 			CL_ParseCvarValue( msg, true, PROTO_LEGACY );
 			break;
 		default:
-			CL_ParseUserMessage( msg, cmd );
+			CL_ParseUserMessage( msg, cmd, PROTO_LEGACY );
 			cl.frames[cl.parsecountmod].graphdata.usr += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		}
@@ -615,7 +586,7 @@ void CL_LegacyPrecache_f( void )
 	int	spawncount, i;
 	model_t *mod;
 
-	if( !cls.legacymode )
+	if( cls.legacymode != PROTO_LEGACY )
 		return;
 
 	spawncount = Q_atoi( Cmd_Argv( 1 ));

engine/client/cl_parse_gs.c

@@ -28,7 +28,18 @@ static void CL_ParseExtraInfo( sizebuf_t *msg )
 	string clientfallback;
 
 	Q_strncpy( clientfallback, MSG_ReadString( msg ), sizeof( clientfallback ));
-	Cvar_FullSet( "sv_cheats", MSG_ReadByte( msg ) ? "1" : "0", FCVAR_READ_ONLY | FCVAR_SERVER );
+	if( COM_CheckStringEmpty( clientfallback ))
+		Con_Reportf( S_ERROR "%s: TODO: add fallback directory %s!\n", __func__, clientfallback );
+
+	if( MSG_ReadByte( msg ))
+	{
+		Cvar_FullSet( "sv_cheats", "1", FCVAR_READ_ONLY | FCVAR_SERVER );
+	}
+	else
+	{
+		Cvar_SetCheatState();
+		Cvar_FullSet( "sv_cheats", "0", FCVAR_READ_ONLY | FCVAR_SERVER );
+	}
 }
 
 static void CL_ParseNewMovevars( sizebuf_t *msg )
@@ -71,29 +82,13 @@ static void CL_ParseNewMovevars( sizebuf_t *msg )
 	if( Q_strcmp( clgame.oldmovevars.skyName, clgame.movevars.skyName ) && cl.video_prepped )
 		R_SetupSky( clgame.movevars.skyName );
 
-	memcpy( &clgame.oldmovevars, &clgame.movevars, sizeof( movevars_t ));
+	clgame.oldmovevars = clgame.movevars;
 	clgame.entities->curstate.scale = clgame.movevars.waveHeight;
 
 	// keep features an actual!
 	clgame.oldmovevars.features = clgame.movevars.features = host.features;
 }
 
-static void CL_ParseNewUserMsg( sizebuf_t *msg )
-{
-	int svc_num, size;
-	char s[16];
-
-	svc_num = MSG_ReadByte( msg );
-	size = MSG_ReadByte( msg );
-	MSG_ReadBytes( msg, s, sizeof( s ));
-
-	s[15] = 0;
-	if( size == 255 )
-		size = -1;
-
-	CL_LinkUserMessage( s, svc_num, size );
-}
-
 typedef struct delta_header_t
 {
 	qboolean remove : 1;
@@ -105,11 +100,8 @@ typedef struct delta_header_t
 
 static int CL_ParseDeltaHeader( sizebuf_t *msg, qboolean delta, int oldnum, struct delta_header_t *hdr )
 {
-	int entnum;
-
-	hdr->remove = hdr->custom = hdr->instanced = false;
-	hdr->instanced_baseline_index = hdr->offset = 0;
-	entnum = oldnum;
+	int entnum = oldnum;
+	memset( hdr, 0, sizeof( *hdr ));
 
 	if( !delta )
 	{
@@ -121,7 +113,7 @@ static int CL_ParseDeltaHeader( sizebuf_t *msg, qboolean delta, int oldnum, stru
 		else if( MSG_ReadOneBit( msg ) == 0 )
 			entnum += MSG_ReadUBitLong( msg, 6 );
 		else
-			entnum += MSG_ReadUBitLong( msg, MAX_GOLDSRC_ENTITY_BITS );
+			entnum = MSG_ReadUBitLong( msg, MAX_GOLDSRC_ENTITY_BITS );
 	}
 	else
 	{
@@ -139,9 +131,6 @@ static int CL_ParseDeltaHeader( sizebuf_t *msg, qboolean delta, int oldnum, stru
 	{
 		hdr->custom = MSG_ReadOneBit( msg );
 
-		hdr->instanced = false;
-		hdr->instanced_baseline_index = 0;
-
 		// do we got instanced baselines in svc_spawnbaselines?
 		if( cl.instanced_baseline_count )
 		{
@@ -150,7 +139,6 @@ static int CL_ParseDeltaHeader( sizebuf_t *msg, qboolean delta, int oldnum, stru
 				hdr->instanced_baseline_index = MSG_ReadUBitLong( msg, 6 );
 		}
 
-		hdr->offset = 0;
 		if( !delta && !hdr->instanced )
 		{
 			if( MSG_ReadOneBit( msg ))
@@ -187,7 +175,6 @@ static void CL_FlushEntityPacketGS( frame_t *frame, sizebuf_t *msg )
 		if( MSG_ReadWord( msg ) != 0 )
 		{
 			MSG_SeekToBit( msg, -16, SEEK_CUR );
-
 			num = CL_ParseDeltaHeader( msg, false, num, &hdr );
 		}
 		else break;
@@ -200,16 +187,15 @@ static void CL_FlushEntityPacketGS( frame_t *frame, sizebuf_t *msg )
 
 		Delta_ReadGSFields( msg, CL_GetEntityDelta( &hdr, num ), &from, &to, cl.mtime[0] );
 	}
-
-	MSG_EndBitWriting( msg );
 }
 
-static void CL_DeltaEntityGS( const delta_header_t *hdr, sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t *from, qboolean has_update )
+static void CL_DeltaEntityGS( const delta_header_t *hdr, sizebuf_t *msg, frame_t *frame, int newnum, const entity_state_t *from )
 {
 	cl_entity_t	*ent;
 	entity_state_t	*to;
 	qboolean newent = from == NULL;
 	int pack = frame->num_entities;
+	qboolean has_update = msg != NULL;
 
 	// alloc next slot to store update
 	to = &cls.packet_entities[cls.next_client_entities % cls.num_client_entities];
@@ -226,6 +212,8 @@ static void CL_DeltaEntityGS( const delta_header_t *hdr, sizebuf_t *msg, frame_t
 	{
 		if( !newent )
 			CL_KillDeadBeams( ent );
+		else
+			Con_Printf( S_WARN "%s: entity remove on non-delta update (%d)\n", __func__, newnum );
 		return;
 	}
 
@@ -261,13 +249,13 @@ static void CL_DeltaEntityGS( const delta_header_t *hdr, sizebuf_t *msg, frame_t
 	frame->num_entities++;
 }
 
-static void CL_CopyPacketEntity( frame_t *frame, int num, entity_state_t *from )
+static void CL_CopyPacketEntity( frame_t *frame, int num, const entity_state_t *from )
 {
 	delta_header_t fakehdr =
 	{
 		.custom = FBitSet( from->entityType, ENTITY_BEAM ) == ENTITY_BEAM,
 	};
-	CL_DeltaEntityGS( &fakehdr, NULL, frame, num, from, false );
+	CL_DeltaEntityGS( &fakehdr, NULL, frame, num, from );
 }
 
 static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
@@ -290,8 +278,6 @@ static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
 	frame->num_entities = 0;
 	frame->valid = true;
 
-	MSG_StartBitWriting( msg );
-
 	if( delta )
 	{
 		uint oldpacket = MSG_ReadByte( msg );
@@ -299,7 +285,9 @@ static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
 
 		if( !CL_ValidateDeltaPacket( oldpacket, oldframe ))
 		{
+			MSG_StartBitWriting( msg );
 			CL_FlushEntityPacketGS( frame, msg );
+			MSG_EndBitWriting( msg );
 			return playerbytes;
 		}
 	}
@@ -312,6 +300,8 @@ static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
 
 	cl.validsequence = cls.netchan.incoming_sequence;
 
+	MSG_StartBitWriting( msg );
+
 	oldent = NULL;
 	oldindex = 0;
 	oldnum = CL_UpdateOldEntNum( oldindex, oldframe, &oldent );
@@ -338,6 +328,9 @@ static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
 
 		while( oldnum < newnum )
 		{
+			if( !delta )
+				Con_Printf( S_WARN "%s: old frame copy on non-delta update (%d < %d)\n", __func__, oldnum, newnum );
+
 			// one or more entities from the old packet are unchanged
 			CL_CopyPacketEntity( frame, oldnum, oldent );
 			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
@@ -347,14 +340,17 @@ static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
 
 		if( oldnum == newnum )
 		{
+			if( !delta )
+				Con_Printf( S_WARN "%s: delta entity on non-delta update (%d)\n", __func__, oldnum );
+
 			// from delta
-			CL_DeltaEntityGS( &hdr, msg, frame, newnum, oldent, true );
+			CL_DeltaEntityGS( &hdr, msg, frame, newnum, oldent );
 			oldnum = CL_UpdateOldEntNum( ++oldindex, oldframe, &oldent );
 		}
 		else if( oldnum > newnum )
 		{
 			// from baseline
-			CL_DeltaEntityGS( &hdr, msg, frame, newnum, NULL, true );
+			CL_DeltaEntityGS( &hdr, msg, frame, newnum, NULL );
 		}
 
 		if( player ) playerbytes += MSG_GetNumBytesRead( msg ) - bufstart;
@@ -382,13 +378,10 @@ static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
 	CL_ProcessPacket( frame );
 	CL_SetSolidEntities();
 
-	// first update is the final signon stage where we actually receive an entity (i.e., the world at least)
+	// first update, received world, remove loading plaque
 	if( cls.signon == ( SIGNONS - 1 ))
 	{
-		// we are done with signon sequence.
 		cls.signon = SIGNONS;
-
-		// Clear loading plaque.
 		CL_SignonReply( PROTO_GOLDSRC );
 	}
 
@@ -459,7 +452,9 @@ static void CL_ParseSoundPacketGS( sizebuf_t *msg )
 
 	chan = MSG_ReadUBitLong( msg, 3 );
 	entnum = MSG_ReadUBitLong( msg, MAX_GOLDSRC_ENTITY_BITS );
-	sound = MSG_ReadUBitLong( msg, FBitSet( flags, SND_SEQUENCE ) ? 16 : 8 );
+	if( FBitSet( flags, SND_LEGACY_LARGE_INDEX ))
+		sound = MSG_ReadWord( msg );
+	else sound = MSG_ReadByte( msg );
 	MSG_ReadGSBitVec3Coord( msg, pos );
 
 	if( FBitSet( flags, SND_PITCH ))
@@ -468,14 +463,12 @@ static void CL_ParseSoundPacketGS( sizebuf_t *msg )
 
 	MSG_EndBitWriting( msg );
 
+	ClearBits( flags, SND_LEGACY_LARGE_INDEX );
+
 	if( FBitSet( flags, SND_SENTENCE ))
 	{
 		char	sentenceName[32];
-
-		if( FBitSet( flags, SND_SEQUENCE ))
-			Q_snprintf( sentenceName, sizeof( sentenceName ), "!#%i", sound + MAX_SOUNDS_NONSENTENCE );
-		else Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound );
-
+		Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound );
 		handle = S_RegisterSound( sentenceName );
 	}
 	else handle = cl.sound_index[sound];	// see precached sound
@@ -528,8 +521,7 @@ dispatch messages
 void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 {
 	size_t		bufStart, playerbytes;
-	int		cmd, param1, param2;
-	int		old_background;
+	int		cmd, param1;
 	const char	*s;
 
 	// parse the message
@@ -553,6 +545,9 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 		// record command for debugging spew on parse problem
 		CL_Parse_RecordCommand( cmd, bufStart );
 
+		if( CL_ParseCommonDLLMessage( msg, PROTO_GOLDSRC, cmd, bufStart ))
+			continue;
+
 		// other commands
 		switch( cmd )
 		{
@@ -560,9 +555,16 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 			Host_Error( "svc_bad\n" );
 			break;
 		case svc_nop:
+		case svc_spawnstatic:
+		case svc_goldsrc_damage:
+		case svc_goldsrc_killedmonster:
+		case svc_goldsrc_foundsecret:
 			// this does nothing
 			break;
 		case svc_disconnect:
+			s = MSG_ReadString( msg );
+			if( COM_CheckStringEmpty( s ))
+				Con_Printf( "Server issued disconnect. Reason: %s\n", s );
 			CL_Drop ();
 			Host_AbortCurrentFrame ();
 			break;
@@ -572,6 +574,11 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 			MSG_EndBitWriting( msg );
 			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
+		case svc_goldsrc_version:
+			param1 = MSG_ReadLong( msg );
+			if( param1 != PROTOCOL_GOLDSRC_VERSION )
+				Host_Error( "Server use invalid protocol (%i should be %i)\n", param1, PROTOCOL_GOLDSRC_VERSION );
+			break;
 		case svc_setview:
 			CL_ParseViewEntity( msg );
 			break;
@@ -580,13 +587,19 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_time:
-			CL_ParseServerTime( msg );
+			CL_ParseServerTime( msg, PROTO_GOLDSRC );
 			break;
 		case svc_print:
 			Con_Printf( "%s", MSG_ReadString( msg ));
 			break;
 		case svc_stufftext:
 			s = MSG_ReadString( msg );
+			if( cl_trace_stufftext.value )
+			{
+				size_t len = Q_strlen( s );
+				Con_Printf( "Stufftext: %s%c", s, len && s[len-1] == '\n' ? '\0' : '\n' );
+			}
+
 #ifdef HACKS_RELATED_HLMODS
 			// disable Cry Of Fear antisave protection
 			if( !Q_strnicmp( s, "disconnect", 10 ) && cls.signon != SIGNONS )
@@ -600,7 +613,6 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 		case svc_goldsrc_serverinfo:
 			Cbuf_Execute(); // make sure any stuffed commands are done
 			CL_ParseServerData( msg, PROTO_GOLDSRC );
-			Delta_InitMeta();
 			break;
 		case svc_lightstyle:
 			CL_ParseLightStyle( msg, PROTO_GOLDSRC );
@@ -617,16 +629,18 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 			MSG_EndBitWriting( msg );
 			cl.frames[cl.parsecountmod].graphdata.client += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
+		case svc_goldsrc_stopsound:
+			param1 = MSG_ReadWord( msg );
+			S_StopSound( param1 >> 3, param1 & 7, NULL );
+			cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart;
+			break;
 		case svc_pings:
 			MSG_StartBitWriting( msg );
 			CL_UpdateUserPings( msg );
 			MSG_EndBitWriting( msg );
 			break;
 		case svc_particle:
-			CL_ParseParticles( msg );
-			break;
-		case svc_spawnstatic:
-			CL_ParseStaticEntity( msg );
+			CL_ParseParticles( msg, PROTO_GOLDSRC );
 			break;
 		case svc_event_reliable:
 			MSG_StartBitWriting( msg );
@@ -635,14 +649,12 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 			cl.frames[cl.parsecountmod].graphdata.event += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_spawnbaseline:
+			MSG_StartBitWriting( msg );
 			CL_ParseBaseline( msg, PROTO_GOLDSRC );
-			break;
-		case svc_temp_entity:
-			CL_ParseTempEntity( msg, PROTO_GOLDSRC );
-			cl.frames[cl.parsecountmod].graphdata.tentities += MSG_GetNumBytesRead( msg ) - bufStart;
+			MSG_EndBitWriting( msg );
 			break;
 		case svc_setpause:
-			cl.paused = ( MSG_ReadOneBit( msg ) != 0 );
+			cl.paused = ( MSG_ReadByte( msg ) != 0 );
 			break;
 		case svc_signonnum:
 			CL_ParseSignon( msg, PROTO_GOLDSRC );
@@ -653,39 +665,25 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 		case svc_goldsrc_spawnstaticsound:
 			CL_ParseSpawnStaticSound( msg );
 			break;
-		case svc_intermission:
-			cl.intermission = 1;
-			break;
 		case svc_finale:
 			CL_ParseFinaleCutscene( msg, 2 );
 			break;
-		case svc_cdtrack:
-			param1 = MSG_ReadByte( msg );
-			param1 = bound( 1, param1, MAX_CDTRACKS ); // tracknum
-			param2 = MSG_ReadByte( msg );
-			param2 = bound( 1, param2, MAX_CDTRACKS ); // loopnum
-			S_StartBackgroundTrack( clgame.cdtracks[param1-1], clgame.cdtracks[param2-1], 0, false );
-			break;
 		case svc_restore:
 			CL_ParseRestore( msg );
 			break;
 		case svc_cutscene:
 			CL_ParseFinaleCutscene( msg, 3 );
 			break;
-		case svc_weaponanim:
-			param1 = MSG_ReadByte( msg );	// iAnim
-			param2 = MSG_ReadByte( msg );	// body
-			CL_WeaponAnim( param1, param2 );
-			break;
-		case svc_roomtype:
-			param1 = MSG_ReadShort( msg );
-			Cvar_SetValue( "room_type", param1 );
+		case svc_goldsrc_decalname:
+			param1 = MSG_ReadByte( msg );
+			s = MSG_ReadString( msg );
+			Q_strncpy( host.draw_decals[param1], s, sizeof( host.draw_decals[param1] ));
 			break;
 		case svc_addangle:
 			CL_ParseAddAngle( msg );
 			break;
 		case svc_goldsrc_newusermsg:
-			CL_ParseNewUserMsg( msg );
+			CL_RegisterUserMessage( msg, PROTO_GOLDSRC );
 			break;
 		case svc_packetentities:
 			playerbytes = CL_ParsePacketEntitiesGS( msg, false );
@@ -727,14 +725,11 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 		case svc_hltv:
 			CL_ParseHLTV( msg );
 			break;
-		case svc_director:
-			CL_ParseDirector( msg );
-			break;
 		case svc_voiceinit:
 			CL_ParseVoiceInit( msg );
 			break;
 		case svc_voicedata:
-			CL_ParseVoiceData( msg );
+			CL_ParseVoiceData( msg, PROTO_GOLDSRC );
 			cl.frames[cl.parsecountmod].graphdata.voicebytes += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		case svc_resourcelocation:
@@ -743,17 +738,23 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg )
 		case svc_goldsrc_sendextrainfo:
 			CL_ParseExtraInfo( msg );
 			break;
-		case svc_querycvarvalue:
+		case svc_goldsrc_timescale:
+			// we can set sys_timescale to anything we want but in GoldSrc it's locked for
+			// HLTV and demoplayback. Do we really want to have it then if both are out of scope?
+			Con_Reportf( S_ERROR "%s: svc_goldsrc_timescale: implement me!\n", __func__ );
+			MSG_ReadFloat( msg );
+			break;
+		case svc_goldsrc_sendcvarvalue:
 			CL_ParseCvarValue( msg, false, PROTO_GOLDSRC );
 			break;
-		case svc_querycvarvalue2:
+		case svc_goldsrc_sendcvarvalue2:
 			CL_ParseCvarValue( msg, true, PROTO_GOLDSRC );
 			break;
 		case svc_exec:
 			CL_ParseExec( msg );
 			break;
 		default:
-			CL_ParseUserMessage( msg, cmd );
+			CL_ParseUserMessage( msg, cmd, PROTO_LEGACY );
 			cl.frames[cl.parsecountmod].graphdata.usr += MSG_GetNumBytesRead( msg ) - bufStart;
 			break;
 		}

engine/client/cl_pmove.c

@@ -59,7 +59,7 @@ void GAME_EXPORT CL_PopPMStates( void )
 CL_IsPredicted
 ===============
 */
-qboolean CL_IsPredicted( void )
+static qboolean CL_IsPredicted( void )
 {
 	if( cl_nopred.value || cl.intermission )
 		return false;

engine/client/cl_qparse.c

@@ -950,7 +950,7 @@ void CL_ParseQuakeMessage( sizebuf_t *msg )
 			break;
 		case svc_time:
 			Cbuf_AddText( "\n" ); // new frame was started
-			CL_ParseServerTime( msg );
+			CL_ParseServerTime( msg, PROTO_QUAKE );
 			break;
 		case svc_print:
 			str = MSG_ReadString( msg );

engine/client/cl_scrn.c

@@ -853,7 +853,6 @@ void SCR_Shutdown( void )
 {
 	if( !scr_init ) return;
 
-	Cmd_RemoveCommand( "timerefresh" );
 	Cmd_RemoveCommand( "skyname" );
 	Cmd_RemoveCommand( "viewpos" );
 	UI_SetActiveMenu( false );

engine/client/cl_tent.c

@@ -35,17 +35,17 @@ TEMPENTS MANAGEMENT
 #define SHARD_VOLUME		12.0f	// on shard ever n^3 units
 #define MAX_MUZZLEFLASH		3
 
-TEMPENTITY	*cl_active_tents;
-TEMPENTITY	*cl_free_tents;
-TEMPENTITY	*cl_tempents = NULL;		// entities pool
+static TEMPENTITY *cl_active_tents;
+static TEMPENTITY *cl_free_tents;
+static TEMPENTITY *cl_tempents = NULL;		// entities pool
 
-model_t		*cl_sprite_muzzleflash[MAX_MUZZLEFLASH];	// muzzle flashes
-model_t		*cl_sprite_dot = NULL;
-model_t		*cl_sprite_ricochet = NULL;
-model_t		*cl_sprite_shell = NULL;
-model_t		*cl_sprite_glow = NULL;
+static model_t *cl_sprite_muzzleflash[MAX_MUZZLEFLASH];	// muzzle flashes
+static model_t *cl_sprite_ricochet = NULL;
+static model_t *cl_sprite_glow = NULL;
+model_t        *cl_sprite_dot = NULL;
+model_t        *cl_sprite_shell = NULL;
 
-const char *cl_default_sprites[] =
+static const char *const cl_default_sprites[] =
 {
 	// built-in sprites
 	"sprites/muzzleflash1.spr",
@@ -169,29 +169,13 @@ void CL_AddClientResources( void )
 #endif
 }
 
-
-/*
-================
-CL_InitTempents
-
-================
-*/
-void CL_InitTempEnts( void )
-{
-	cl_tempents = Mem_Calloc( cls.mempool, sizeof( TEMPENTITY ) * GI->max_tents );
-	CL_ClearTempEnts();
-
-	// load tempent sprites (glowshell, muzzleflashes etc)
-	CL_LoadClientSprites ();
-}
-
 /*
 ================
 CL_ClearTempEnts
 
 ================
 */
-void CL_ClearTempEnts( void )
+static void CL_ClearTempEnts( void )
 {
 	int	i;
 
@@ -208,6 +192,21 @@ void CL_ClearTempEnts( void )
 	cl_active_tents = NULL;
 }
 
+/*
+================
+CL_InitTempents
+
+================
+*/
+void CL_InitTempEnts( void )
+{
+	cl_tempents = Mem_Calloc( cls.mempool, sizeof( TEMPENTITY ) * GI->max_tents );
+	CL_ClearTempEnts();
+
+	// load tempent sprites (glowshell, muzzleflashes etc)
+	CL_LoadClientSprites ();
+}
+
 /*
 ================
 CL_FreeTempEnts
@@ -444,11 +443,16 @@ alloc normal\low priority tempentity
 */
 TEMPENTITY *CL_TempEntAlloc( const vec3_t org, model_t *pmodel )
 {
+	static float cl_lasttimewarn;
 	TEMPENTITY	*pTemp;
 
 	if( !cl_free_tents )
 	{
-		Con_DPrintf( "Overflow %d temporary ents!\n", GI->max_tents );
+		if( cl_lasttimewarn < host.realtime )
+		{
+			Con_DPrintf( "Overflow %d temporary ents!\n", GI->max_tents );
+			cl_lasttimewarn = host.realtime + 1.0f;
+		}
 		return NULL;
 	}
 
@@ -1916,16 +1920,16 @@ void CL_ParseTempEntity( sizebuf_t *msg, connprotocol_t proto )
 		else iSize = MSG_ReadWord( msg );
 
 		// this will probably be fatal anyway
-		if( iSize > sizeof( pbuf ))
+		if( iSize > sizeof( msg_data ))
 			Con_Printf( S_ERROR "%s: Temp buffer overflow!\n", __func__ );
 
 		// parse user message into buffer
-		MSG_ReadBytes( msg, pbuf, iSize );
+		MSG_ReadBytes( msg, msg_data, iSize );
 
 		// init a safe tempbuffer
-		MSG_Init( pbuf, "TempEntity", pbuf, iSize );
+		MSG_Init( &buf, "TempEntity", msg_data, iSize );
 
-		pbuf = pbuf;
+		pbuf = &buf;
 	}
 	else
 	{

engine/client/cl_tent.h

@@ -77,7 +77,6 @@ void R_MultiGunshot( const vec3_t org, const vec3_t dir, const vec3_t noise, int
 void R_FireField( float *org, int radius, int modelIndex, int count, int flags, float life );
 void R_PlayerSprites( int client, int modelIndex, int count, int size );
 void R_Sprite_WallPuff( struct tempent_s *pTemp, float scale );
-void R_DebugParticle( const vec3_t pos, byte r, byte g, byte b );
 void R_RicochetSound( const vec3_t pos );
 struct dlight_s *CL_AllocDlight( int key );
 struct dlight_s *CL_AllocElight( int key );

engine/client/client.h

@@ -129,7 +129,6 @@ typedef struct
 
 	// misc local info
 	qboolean		repredicting;	// repredicting in progress
-	qboolean		thirdperson;
 	qboolean		apply_effects;	// local player will not added but we should apply their effects: flashlight etc
 	float		idealpitch;
 	int		viewmodel;
@@ -561,7 +560,6 @@ typedef struct
 	byte		datagram_buf[MAX_DATAGRAM];
 
 	netchan_t		netchan;
-	int		challenge;		// from the server to use for connecting
 
 	float		packet_loss;
 	double		packet_loss_recalc_time;
@@ -654,6 +652,7 @@ extern gameui_static_t	gameui;
 //
 // cvars
 //
+extern convar_t	showpause;
 extern convar_t	mp_decals;
 extern convar_t	cl_logomaxdim;
 extern convar_t	cl_allow_download;
@@ -748,8 +747,8 @@ void CL_Particle( const vec3_t org, int color, float life, int zpos, int zvel );
 void CL_Init( void );
 void CL_Disconnect_f( void );
 void CL_ProcessFile( qboolean successfully_received, const char *filename );
-void CL_WriteUsercmd( sizebuf_t *msg, int from, int to );
-int CL_GetFragmentSize( void *unused , fragsize_t mode );
+void CL_WriteUsercmd( connprotocol_t proto, sizebuf_t *msg, int from, int to );
+void CL_SetupNetchanForProtocol( connprotocol_t proto );
 qboolean CL_PrecacheResources( void );
 void CL_SetupOverviewParams( void );
 void CL_UpdateFrameLerp( void );
@@ -868,15 +867,14 @@ void CL_UpdateUserinfo( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseResource( sizebuf_t *msg );
 void CL_ParseClientData( sizebuf_t *msg, connprotocol_t proto );
 void CL_UpdateUserPings( sizebuf_t *msg );
-void CL_ParseParticles( sizebuf_t *msg );
+void CL_ParseParticles( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseRestoreSoundPacket( sizebuf_t *msg );
 void CL_ParseBaseline( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseSignon( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseRestore( sizebuf_t *msg );
-void CL_ParseStaticEntity( sizebuf_t *msg );
 void CL_ParseStaticDecal( sizebuf_t *msg );
 void CL_ParseAddAngle( sizebuf_t *msg );
-void CL_RegisterUserMessage( sizebuf_t *msg );
+void CL_RegisterUserMessage( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseResourceList( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseMovevars( sizebuf_t *msg );
 void CL_ParseResourceRequest( sizebuf_t *msg );
@@ -887,17 +885,18 @@ void CL_ParseFileTransferFailed( sizebuf_t *msg );
 void CL_ParseHLTV( sizebuf_t *msg );
 void CL_ParseDirector( sizebuf_t *msg );
 void CL_ParseVoiceInit( sizebuf_t *msg );
-void CL_ParseVoiceData( sizebuf_t *msg );
+void CL_ParseVoiceData( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseResLocation( sizebuf_t *msg );
 void CL_ParseCvarValue( sizebuf_t *msg, const qboolean ext, const connprotocol_t proto );
 void CL_ParseServerMessage( sizebuf_t *msg );
+qboolean CL_ParseCommonDLLMessage( sizebuf_t *msg, connprotocol_t proto, int svc_num, int startoffset );
 void CL_ParseTempEntity( sizebuf_t *msg, connprotocol_t proto );
 qboolean CL_DispatchUserMessage( const char *pszName, int iSize, void *pbuf );
 qboolean CL_RequestMissingResources( void );
 void CL_RegisterResources( sizebuf_t *msg, connprotocol_t proto );
 void CL_ParseViewEntity( sizebuf_t *msg );
-void CL_ParseServerTime( sizebuf_t *msg );
-void CL_ParseUserMessage( sizebuf_t *msg, int svc_num );
+void CL_ParseServerTime( sizebuf_t *msg, connprotocol_t proto );
+void CL_ParseUserMessage( sizebuf_t *msg, int svc_num, connprotocol_t proto );
 void CL_ParseFinaleCutscene( sizebuf_t *msg, int level );
 void CL_ParseTextMessage( sizebuf_t *msg );
 void CL_ParseExec( sizebuf_t *msg );
@@ -956,7 +955,6 @@ void CL_SetSolidPlayers( int playernum );
 void CL_InitClientMove( void );
 void CL_PredictMovement( qboolean repredicting );
 void CL_CheckPredictionError( void );
-qboolean CL_IsPredicted( void );
 int CL_WaterEntity( const float *rgflPos );
 cl_entity_t *CL_GetWaterEntity( const float *rgflPos );
 pmtrace_t *CL_VisTraceLine( vec3_t start, vec3_t end, int flags );
@@ -1031,7 +1029,6 @@ void CL_InitParticles( void );
 void CL_ClearParticles( void );
 void CL_FreeParticles( void );
 void CL_InitTempEnts( void );
-void CL_ClearTempEnts( void );
 void CL_FreeTempEnts( void );
 void CL_TempEntUpdate( void );
 void CL_InitViewBeams( void );

engine/client/console.c

@@ -875,7 +875,6 @@ void Con_Print( const char *txt )
 			Con_DeleteLastLine();
 			cr_pending = 0;
 		}
-
 		c = *txt;
 
 		switch( c )
@@ -883,10 +882,13 @@ void Con_Print( const char *txt )
 		case '\0':
 			break;
 		case '\r':
-			Con_AddLine( buf, bufpos, true );
-			lastlength = CON_LINES_LAST().length;
-			cr_pending = 1;
-			bufpos = 0;
+			if( txt[1] != '\n' )
+			{
+				Con_AddLine( buf, bufpos, true );
+				lastlength = CON_LINES_LAST().length;
+				cr_pending = 1;
+				bufpos = 0;
+			}
 			break;
 		case '\n':
 			Con_AddLine( buf, bufpos, true );
@@ -894,6 +896,7 @@ void Con_Print( const char *txt )
 			bufpos = 0;
 			break;
 		default:
+
 			buf[bufpos++] = c | mask;
 			if(( bufpos >= sizeof( buf ) - 1 ) || bufpos >= ( con.linewidth - 1 ))
 			{
@@ -1941,7 +1944,7 @@ void Con_DrawConsole( void )
 	{
 		if( !cl_allow_levelshots.value && !cls.timedemo )
 		{
-			if(( Cvar_VariableInteger( "cl_background" ) || Cvar_VariableInteger( "sv_background" )) && cls.key_dest != key_console )
+			if( cls.key_dest != key_console && ( Cvar_VariableInteger( "cl_background" ) || Cvar_VariableInteger( "sv_background" )))
 				con.vislines = con.showlines = 0;
 			else con.vislines = con.showlines = refState.height;
 		}

engine/client/input.c

@@ -569,10 +569,9 @@ IN_EngineAppendMove
 Called from cl_main.c after generating command in client
 ================
 */
-void IN_EngineAppendMove( float frametime, void *cmd1, qboolean active )
+void IN_EngineAppendMove( float frametime, usercmd_t *cmd, qboolean active )
 {
 	float forward, side, pitch, yaw;
-	usercmd_t *cmd = cmd1;
 
 	if( clgame.dllFuncs.pfnLookEvent )
 		return;

engine/client/input.h

@@ -25,6 +25,7 @@ INPUT
 */
 
 #include "keydefs.h"
+#include "usercmd.h"
 
 //
 // input.c
@@ -43,7 +44,7 @@ void IN_ToggleClientMouse( int newstate, int oldstate );
 
 uint IN_CollectInputDevices( void );
 void IN_LockInputDevices( qboolean lock );
-void IN_EngineAppendMove( float frametime, void *cmd, qboolean active );
+void IN_EngineAppendMove( float frametime, usercmd_t *cmd, qboolean active );
 
 extern convar_t m_yaw;
 extern convar_t m_pitch;

engine/client/s_main.c

@@ -1894,7 +1894,7 @@ S_VoiceRecordStart_f
 */
 static void S_VoiceRecordStart_f( void )
 {
-	if( cls.state != ca_active || cls.legacymode )
+	if( cls.state != ca_active )
 		return;
 	
 	Voice_RecordStart();

engine/client/s_vox.c

@@ -248,6 +248,12 @@ static const char *VOX_GetDirectory( char *szpath, const char *psz, int nsize )
 	const char *p;
 	int len;
 
+	// HACKHACK: some modders send strings like "/fvox/_period four"
+	// which should get parsed as "_period four" said by fvox
+	// it might be incorrect but ignore first slash here for now
+	if( psz[0] == '/' )
+		psz++;
+
 	// search / backwards
 	p = Q_strrchr( psz, '/' );
 
@@ -595,8 +601,8 @@ static void Test_VOX_GetDirectory( void )
 	{
 		"", "", "vox/",
 		"bark bark", "bark bark", "vox/",
-		"barney/meow", "meow", "barney/"
-
+		"barney/meow", "meow", "barney/",
+		"/fvox/_period", "_period", "fvox/",
 	};
 	int i;
 

engine/client/voice.c

@@ -396,6 +396,9 @@ void Voice_RecordStart( void )
 {
 	Voice_RecordStop();
 
+	if( !voice.initialized )
+		return;
+
 	if( voice_inputfromfile.value )
 	{
 		voice.input_file = FS_LoadSound( "voice_input.wav", NULL, 0 );
@@ -415,7 +418,7 @@ void Voice_RecordStart( void )
 		}
 	}
 
-	if( !Voice_IsRecording() )
+	if( !Voice_IsRecording( ) && voice.device_opened )
 		voice.is_recording = VoiceCapture_Activate( true );
 
 	if( Voice_IsRecording() )
@@ -627,7 +630,8 @@ qboolean Voice_Init( const char *pszCodecName, int quality, qboolean preinit )
 {
 	if( Q_strcmp( pszCodecName, VOICE_OPUS_CUSTOM_CODEC ))
 	{
-		Con_Printf( S_ERROR "Server requested unsupported codec: %s\n", pszCodecName );
+		if( COM_CheckStringEmpty( pszCodecName ))
+			Con_Printf( S_ERROR "Server requested unsupported codec: %s\n", pszCodecName );
 
 		// reset saved codec name, we won't enable voice for this connection
 		voice_codec_init[0] = 0;

engine/common/cfgscript.c

@@ -25,7 +25,7 @@ typedef enum
 	T_COUNT
 } cvartype_t;
 
-const char *cvartypes[] = { NULL, "BOOL", "NUMBER", "LIST", "STRING" };
+static const char *const cvartypes[] = { NULL, "BOOL", "NUMBER", "LIST", "STRING" };
 
 typedef struct parserstate_s
 {

engine/common/cmd.c

@@ -24,18 +24,27 @@ GNU General Public License for more details.
 
 typedef struct
 {
-	byte		*data;
-	int		cursize;
-	int		maxsize;
+	byte *const data;
+	const int maxsize;
+	int cursize;
 } cmdbuf_t;
 
-qboolean			cmd_wait;
-cmdbuf_t			cmd_text, filteredcmd_text;
-byte			cmd_text_buf[MAX_CMD_BUFFER];
-byte			filteredcmd_text_buf[MAX_CMD_BUFFER];
-cmdalias_t		*cmd_alias;
-uint			cmd_condition;
-int			cmd_condlevel;
+static qboolean cmd_wait;
+static byte     cmd_text_buf[MAX_CMD_BUFFER];
+static byte     filteredcmd_text_buf[MAX_CMD_BUFFER];
+static cmdbuf_t cmd_text =
+{
+	.data = cmd_text_buf,
+	.maxsize = ARRAYSIZE( cmd_text_buf ),
+};
+static cmdbuf_t filteredcmd_text =
+{
+	.data = filteredcmd_text_buf,
+	.maxsize = ARRAYSIZE( filteredcmd_text_buf ),
+};
+static cmdalias_t *cmd_alias;
+static uint cmd_condition;
+static int  cmd_condlevel;
 static qboolean cmd_currentCommandIsPrivileged;
 
 static void Cmd_ExecuteStringWithPrivilegeCheck( const char *text, qboolean isPrivileged );
@@ -48,20 +57,6 @@ static void Cmd_ExecuteStringWithPrivilegeCheck( const char *text, qboolean isPr
 =============================================================================
 */
 
-/*
-============
-Cbuf_Init
-============
-*/
-static void Cbuf_Init( void )
-{
-	cmd_text.data = cmd_text_buf;
-	filteredcmd_text.data = filteredcmd_text_buf;
-
-	filteredcmd_text.maxsize = cmd_text.maxsize = MAX_CMD_BUFFER;
-	filteredcmd_text.cursize = cmd_text.cursize = 0;
-}
-
 /*
 ============
 Cbuf_Clear
@@ -1219,13 +1214,13 @@ void Cmd_Unlink( int group )
 	cmd_t	**prev;
 	int	count = 0;
 
-	if( Cvar_VariableInteger( "host_gameloaded" ) && FBitSet( group, CMD_SERVERDLL ))
+	if( FBitSet( group, CMD_SERVERDLL ) && Cvar_VariableInteger( "host_gameloaded" ))
 		return;
 
-	if( Cvar_VariableInteger( "host_clientloaded" ) && FBitSet( group, CMD_CLIENTDLL ))
+	if( FBitSet( group, CMD_CLIENTDLL ) && Cvar_VariableInteger( "host_clientloaded" ))
 		return;
 
-	if( Cvar_VariableInteger( "host_gameuiloaded" ) && FBitSet( group, CMD_GAMEUIDLL ))
+	if( FBitSet( group, CMD_GAMEUIDLL ) && Cvar_VariableInteger( "host_gameuiloaded" ))
 		return;
 
 	prev = &cmd_functions;
@@ -1387,8 +1382,6 @@ Cmd_Init
 */
 void Cmd_Init( void )
 {
-	Cbuf_Init();
-
 	cmd_functions = NULL;
 	cmd_condition = 0;
 	cmd_alias = NULL;

engine/common/common.c

@@ -23,7 +23,7 @@ GNU General Public License for more details.
 #include "client.h"
 #include "library.h"
 
-static const char *file_exts[] =
+static const char *const file_exts[] =
 {
 	// ban text files that don't make sense as resource
 	"cfg", "lst", "ini", "log",
@@ -759,25 +759,6 @@ void GAME_EXPORT COM_FreeFile( void *buffer )
 	free( buffer );
 }
 
-/*
-=============
-COM_NormalizeAngles
-
-=============
-*/
-void COM_NormalizeAngles( vec3_t angles )
-{
-	int i;
-
-	for( i = 0; i < 3; i++ )
-	{
-		if( angles[i] > 180.0f )
-			angles[i] -= 360.0f;
-		else if( angles[i] < -180.0f )
-			angles[i] += 360.0f;
-	}
-}
-
 /*
 =============
 pfnGetModelType
@@ -843,7 +824,7 @@ int GAME_EXPORT COM_CompareFileTime( const char *filename1, const char *filename
 		if( ft1 == -1 || ft2 == -1 )
 			return bRet;
 
-		*iCompare = Host_CompareFileTime( ft1,  ft2 );
+		*iCompare = ft1 < ft2 ? -1 : ( ft1 > ft2 ? 1 : 0 );
 		bRet = 1;
 	}
 
@@ -898,18 +879,40 @@ qboolean COM_IsSafeFileToDownload( const char *filename )
 	char		lwrfilename[4096];
 	const char	*first, *last;
 	const char	*ext;
+	size_t	len;
 	int		i;
 
 	if( !COM_CheckString( filename ))
 		return false;
 
-	ext = COM_FileExtension( lwrfilename );
+	ext = COM_FileExtension( filename );
+	len = Q_strlen( filename );
 
 	// only allow extensionless files that start with !MD5
-	if( !Q_strncmp( filename, "!MD5", 4 ) && ext[0] == 0 )
+	if( !Q_strncmp( filename, "!MD5", 4 ))
+	{
+		if( COM_CheckStringEmpty( ext ))
+			return false;
+
+		len = Q_strlen( filename );
+
+		if( len != 36 )
+			return false;
+
+		for( i = 4; i < len; i++ )
+		{
+			if(( filename[i] >= '0' && filename[i] <= '9' ) ||
+				( filename[i] >= 'A' && filename[i] <= 'F' ))
+				continue;
+
+			return false;
+		}
+
 		return true;
+	}
 
 	Q_strnlwr( filename, lwrfilename, sizeof( lwrfilename ));
+	ext = COM_FileExtension( lwrfilename );
 
 	if( Q_strpbrk( lwrfilename, "\\:~" ) || Q_strstr( lwrfilename, ".." ) )
 		return false;
@@ -1042,28 +1045,13 @@ void GAME_EXPORT pfnResetTutorMessageDecayData( void )
 
 void Test_RunCommon( void )
 {
-	char *file = (char *)"q asdf \"qwerty\" \"f \\\"f\" meowmeow\n// comment \"stuff ignored\"\nbark";
-	int len;
-	char buf[5];
+	Msg( "Checking COM_IsSafeFileToDownload...\n" );
 
-	Msg( "Checking COM_ParseFile...\n" );
-
-	file = COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len, NULL );
-	TASSERT( !Q_strcmp( buf, "q" ) && len == 1);
-
-	file = COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len, NULL );
-	TASSERT( !Q_strcmp( buf, "asdf" ) && len == 4);
-
-	file = COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len, NULL );
-	TASSERT( !Q_strcmp( buf, "qwer" ) && len == -1);
-
-	file = COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len, NULL );
-	TASSERT( !Q_strcmp( buf, "f \"f" ) && len == 4);
-
-	file = COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len, NULL );
-	TASSERT( !Q_strcmp( buf, "meow" ) && len == -1);
-
-	file = COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len, NULL );
-	TASSERT( !Q_strcmp( buf, "bark" ) && len == 4);
+	TASSERT_EQi( COM_IsSafeFileToDownload( "!MD5AAB5E8B307672DA86FBD10AC302BC732" ), true );
+	TASSERT_EQi( COM_IsSafeFileToDownload( "!MD56f1ffd8c96bd64c9c27955309f6ecfe6" ), false );
+	TASSERT_EQi( COM_IsSafeFileToDownload( "!MD5AAB5E8B307672DA86FBD10AC302B.exe" ), false );
+	TASSERT_EQi( COM_IsSafeFileToDownload( "!MD5/../../valve/resource/GameMenu.res" ), false );
+	TASSERT_EQi( COM_IsSafeFileToDownload( "not-a-virus-trust-me.bat" ), false );
+	TASSERT_EQi( COM_IsSafeFileToDownload( "a-texture.png" ), true );
 }
 #endif

engine/common/common.h

@@ -168,6 +168,7 @@ extern convar_t	sys_timescale;
 extern convar_t	cl_filterstuffcmd;
 extern convar_t	rcon_password;
 extern convar_t	hpk_custom_file;
+extern convar_t	con_gamemaps;
 
 #define Mod_AllowMaterials() ( host_allow_materials.value != 0.0f && !FBitSet( host.features, ENGINE_DISABLE_HDTEXTURES ))
 
@@ -528,7 +529,6 @@ typedef void( *pfnChangeGame )( const char *progname );
 qboolean Host_IsQuakeCompatible( void );
 void EXPORT Host_Shutdown( void );
 int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGame, pfnChangeGame func );
-int Host_CompareFileTime( int ft1, int ft2 );
 void Host_EndGame( qboolean abort, const char *message, ... ) _format( 2 );
 void Host_AbortCurrentFrame( void ) NORETURN;
 void Host_WriteServerConfig( const char *name );
@@ -537,7 +537,7 @@ void Host_WriteVideoConfig( void );
 void Host_WriteConfig( void );
 void Host_ShutdownServer( void );
 void Host_Error( const char *error, ... ) _format( 1 );
-void Host_ValidateEngineFeatures( uint32_t features );
+void Host_ValidateEngineFeatures( uint32_t mask, uint32_t features );
 void Host_Frame( double time );
 void Host_Credits( void );
 
@@ -769,13 +769,25 @@ void UI_ShowConnectionWarning( void );
 void Cmd_Null_f( void );
 void Rcon_Print( host_redirect_t *rd, const char *pMsg );
 qboolean COM_ParseVector( char **pfile, float *v, size_t size );
-void COM_NormalizeAngles( vec3_t angles );
 int COM_FileSize( const char *filename );
 void COM_FreeFile( void *buffer );
 int COM_CompareFileTime( const char *filename1, const char *filename2, int *iCompare );
 char *va( const char *format, ... ) _format( 1 );
 qboolean CRC32_MapFile( dword *crcvalue, const char *filename, qboolean multiplayer );
 
+static inline void COM_NormalizeAngles( vec3_t angles )
+{
+	int i;
+
+	for( i = 0; i < 3; i++ )
+	{
+		if( angles[i] > 180.0f )
+			angles[i] -= 360.0f;
+		else if( angles[i] < -180.0f )
+			angles[i] += 360.0f;
+	}
+}
+
 #if !XASH_DEDICATED
 connprotocol_t CL_Protocol( void );
 #else

engine/common/con_utils.c

@@ -18,8 +18,6 @@ GNU General Public License for more details.
 #include "const.h"
 #include "kbutton.h"
 
-extern convar_t	con_gamemaps;
-
 #define CON_MAXCMDS		4096	// auto-complete intermediate list
 
 typedef struct autocomplete_list_s
@@ -1012,7 +1010,7 @@ int GAME_EXPORT Cmd_CheckMapsList( int fRefresh )
 	return Cmd_CheckMapsList_R( fRefresh, true );
 }
 
-autocomplete_list_t cmd_list[] =
+static const autocomplete_list_t cmd_list[] =
 {
 { "map_background", 1, Cmd_GetMapList },
 { "changelevel2", 1, Cmd_GetMapList },
@@ -1075,7 +1073,7 @@ for various cmds
 */
 static qboolean Cmd_AutocompleteName( const char *source, int arg, char *buffer, size_t bufsize )
 {
-	autocomplete_list_t	*list;
+	const autocomplete_list_t	*list;
 
 	for( list = cmd_list; list->name; list++ )
 	{

engine/common/cvar.c

@@ -18,17 +18,17 @@ GNU General Public License for more details.
 #include "base_cmd.h"
 #include "eiface.h" // ARRAYSIZE
 
-convar_t	*cvar_vars = NULL; // head of list
+static convar_t	*cvar_vars = NULL; // head of list
 CVAR_DEFINE_AUTO( cmd_scripting, "0", FCVAR_ARCHIVE|FCVAR_PRIVILEGED, "enable simple condition checking and variable operations" );
 
-#ifdef HACKS_RELATED_HLMODS
 typedef struct cvar_filter_quirks_s
 {
 	const char *gamedir; // gamedir to enable for
 	const char *cvars; // list of cvars should be excluded from filter
 } cvar_filter_quirks_t;
 
-static cvar_filter_quirks_t cvar_filter_quirks[] =
+#ifdef HACKS_RELATED_HLMODS
+static const cvar_filter_quirks_t cvar_filter_quirks[] =
 {
 	// EXAMPLE:
 	//{
@@ -44,10 +44,10 @@ static cvar_filter_quirks_t cvar_filter_quirks[] =
 		"cl_dodmusic" // Day of Defeat Beta 1.3 cvar
 	},
 };
-
-static cvar_filter_quirks_t *cvar_active_filter_quirks = NULL;
 #endif
 
+static const cvar_filter_quirks_t *cvar_active_filter_quirks = NULL;
+
 CVAR_DEFINE_AUTO( cl_filterstuffcmd, "1", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "filter commands coming from server" );
 
 /*
@@ -618,7 +618,7 @@ static convar_t *Cvar_Set2( const char *var_name, const char *value )
 		return Cvar_Get( var_name, value, FCVAR_USER_CREATED, NULL );
 	}
 	else
-	{	
+	{
 		if( !Cmd_CurrentCommandIsPrivileged( ))
 		{
 			if( FBitSet( var->flags, FCVAR_PRIVILEGED ))
@@ -974,7 +974,6 @@ static qboolean Cvar_ShouldSetCvar( convar_t *v, qboolean isPrivileged )
 	if( cl_filterstuffcmd.value <= 0.0f )
 		return true;
 
-#ifdef HACKS_RELATED_HLMODS
 	// check if game-specific filter exceptions should be applied
 	// TODO: for cmd exceptions, make generic function
 	if( cvar_active_filter_quirks )
@@ -1005,7 +1004,6 @@ static qboolean Cvar_ShouldSetCvar( convar_t *v, qboolean isPrivileged )
 			}
 		}
 	}
-#endif
 
 	if( FBitSet( v->flags, FCVAR_FILTERABLE ))
 		return false;

engine/common/dedicated.c

@@ -16,12 +16,37 @@ GNU General Public License for more details.
 #include "common.h"
 #include "xash3d_mathlib.h"
 #include "ref_api.h"
+#include "server.h"
 
 ref_globals_t refState;
 
-void CL_ProcessFile( qboolean successfully_received, const char *filename )
+const char *CL_MsgInfo( int cmd )
 {
+	static string	sz;
 
+	Q_strncpy( sz, "???", sizeof( sz ));
+
+	if( cmd >= 0 && cmd <= svc_lastmsg )
+	{
+		// get engine message name
+		const char *svc_string = svc_strings[cmd];
+
+		Q_strncpy( sz, svc_string, sizeof( sz ));
+	}
+	else if( cmd > svc_lastmsg && cmd <= ( svc_lastmsg + MAX_USER_MESSAGES ))
+	{
+		int	i;
+
+		for( i = 0; i < MAX_USER_MESSAGES; i++ )
+		{
+			if( svgame.msg[i].number == cmd )
+			{
+				Q_strncpy( sz, svgame.msg[i].name, sizeof( sz ));
+				break;
+			}
+		}
+	}
+	return sz;
 }
 
 int GAME_EXPORT CL_Active( void )

engine/common/host.c

@@ -40,7 +40,7 @@ GNU General Public License for more details.
 #include "render_api.h"	// decallist_t
 #include "tests.h"
 
-pfnChangeGame	pChangeGame = NULL;
+static pfnChangeGame	pChangeGame = NULL;
 host_parm_t		host;	// host parms
 
 #ifdef XASH_ENGINE_TESTS
@@ -49,8 +49,8 @@ struct tests_stats_s tests_stats;
 
 CVAR_DEFINE( host_developer, "developer", "0", FCVAR_FILTERABLE, "engine is in development-mode" );
 CVAR_DEFINE_AUTO( sys_timescale, "1.0", FCVAR_FILTERABLE, "scale frame time" );
-CVAR_DEFINE_AUTO( sys_ticrate, "100", FCVAR_SERVER, "framerate in dedicated mode" );
 
+static CVAR_DEFINE_AUTO( sys_ticrate, "100", FCVAR_SERVER, "framerate in dedicated mode" );
 static CVAR_DEFINE_AUTO( host_serverstate, "0", FCVAR_READ_ONLY, "displays current server state" );
 static CVAR_DEFINE_AUTO( host_gameloaded, "0", FCVAR_READ_ONLY, "inidcates a loaded game.dll" );
 static CVAR_DEFINE_AUTO( host_clientloaded, "0", FCVAR_READ_ONLY, "inidcates a loaded client.dll" );
@@ -69,14 +69,14 @@ typedef struct feature_message_s
 	const char *arg;
 } feature_message_t;
 
-static feature_message_t bugcomp_features[] =
+static const feature_message_t bugcomp_features[] =
 {
 { BUGCOMP_PENTITYOFENTINDEX_FLAG, "pfnPEntityOfEntIndex bugfix revert", "peoei" },
 { BUGCOMP_MESSAGE_REWRITE_FACILITY_FLAG, "GoldSrc Message Rewrite Facility", "gsmrf" },
 { BUGCOMP_SPATIALIZE_SOUND_WITH_ATTN_NONE, "spatialize sounds with zero attenuation", "sp_attn_none" },
 };
 
-static feature_message_t engine_features[] =
+static const feature_message_t engine_features[] =
 {
 { ENGINE_WRITE_LARGE_COORD, "Big World Support" },
 { ENGINE_QUAKE_COMPATIBLE, "Quake Compatibility" },
@@ -200,19 +200,6 @@ static void Sys_PrintUsage( const char *exename )
 	Sys_Quit();
 }
 
-int Host_CompareFileTime( int ft1, int ft2 )
-{
-	if( ft1 < ft2 )
-	{
-		return -1;
-	}
-	else if( ft1 > ft2 )
-	{
-		return 1;
-	}
-	return 0;
-}
-
 void Host_ShutdownServer( void )
 {
 	SV_Shutdown( "Server was killed\n" );
@@ -223,7 +210,7 @@ void Host_ShutdownServer( void )
 Host_PrintEngineFeatures
 ================
 */
-static void Host_PrintFeatures( uint32_t flags,	const char *s, feature_message_t *features, size_t size )
+static void Host_PrintFeatures( uint32_t flags, const char *s, const feature_message_t *features, size_t size )
 {
 	size_t i;
 
@@ -241,15 +228,8 @@ Host_ValidateEngineFeatures
 validate features bits and set host.features
 ==============
 */
-void Host_ValidateEngineFeatures( uint32_t features )
+void Host_ValidateEngineFeatures( uint32_t mask, uint32_t features )
 {
-	uint32_t mask = ENGINE_FEATURES_MASK;
-
-#if !XASH_DEDICATED
-	if( !Host_IsDedicated( ) && cls.legacymode )
-		mask = ENGINE_LEGACY_FEATURES_MASK;
-#endif
-
 	// don't allow unsupported bits
 	features &= mask;
 
@@ -1072,6 +1052,9 @@ static void Host_InitCommon( int argc, char **argv, const char *progname, qboole
 		Host_RunTests( 0 );
 #endif
 
+#if XASH_DEDICATED
+	Platform_SetupSigtermHandling();
+#endif
 	Platform_Init( Host_IsDedicated( ) || developer >= DEV_EXTENDED );
 	FS_Init( basedir );
 

engine/common/hpak.c

@@ -1055,7 +1055,7 @@ static void HPAK_Extract_f( void )
 		FS_Seek( f, entry->filepos, SEEK_SET );
 		FS_Read( f, pData, nDataSize );
 
-		Q_snprintf( szFileOut, sizeof( szFileOut ), "hpklmps\\lmp%04i.bmp", nCurrent );
+		Q_snprintf( szFileOut, sizeof( szFileOut ), "hpklmps/lmp%04i.bmp", nCurrent );
 		FS_WriteFile( szFileOut, pData, nDataSize );
 		if( pData ) Mem_Free( pData );
 	}

engine/common/mod_bmodel.c

@@ -198,7 +198,7 @@ static mlumpinfo_t		srclumps[HEADER_LUMPS] =
 { LUMP_MODELS, 1, MAX_MAP_MODELS, sizeof( dmodel_t ), -1, "models", CHECK_OVERFLOW, (const void **)&srcmodel.submodels, &srcmodel.numsubmodels },
 };
 
-static mlumpinfo_t		extlumps[EXTRA_LUMPS] =
+static const mlumpinfo_t		extlumps[EXTRA_LUMPS] =
 {
 { LUMP_LIGHTVECS, 0, MAX_MAP_LIGHTING, sizeof( byte ), -1, "deluxmaps", USE_EXTRAHEADER, (const void **)&srcmodel.deluxdata, &srcmodel.deluxdatasize },
 { LUMP_FACEINFO,  0, MAX_MAP_FACEINFO, sizeof( dfaceinfo_t ), -1, "faceinfos", CHECK_OVERFLOW|USE_EXTRAHEADER, (const void **)&srcmodel.faceinfo, &srcmodel.numfaceinfo },
@@ -347,7 +347,7 @@ Mod_LoadLump
 generic loader
 =================
 */
-static void Mod_LoadLump( const byte *in, mlumpinfo_t *info, mlumpstat_t *stat, int flags )
+static void Mod_LoadLump( const byte *in, const mlumpinfo_t *info, mlumpstat_t *stat, int flags )
 {
 	int	version = ((dheader_t *)in)->version;
 	size_t	numelems, real_entrysize;

engine/common/munge.c

@@ -33,7 +33,7 @@ static const byte mungify_table3[] =
 	0x0A, 0x2D, 0x48, 0x0C,	0x4A, 0x12, 0xA9, 0xB5,
 };
 
-static int COM_SwapLong( int c )
+static uint COM_SwapLong( uint c )
 {
 	return ((( c >> 0  ) & 0xFF) << 24 ) +
 		   ((( c >> 8  ) & 0xFF) << 16 ) +
@@ -48,12 +48,12 @@ static void COM_GenericMunge( byte *data, const size_t len, const int seq, const
 
 	for( i = 0; i < mungelen; i++ )
 	{
-		uint *pc, c;
+		uint32_t c;
+		void *pc = &data[i * 4];
 		byte *p;
 		int j;
 
-		pc = (uint *)&data[i * 4];
-		c = *pc;
+		memcpy( &c, pc, sizeof( c ));
 		c ^= seq;
 		if( !reverse )
 			c = COM_SwapLong( c );
@@ -65,7 +65,7 @@ static void COM_GenericMunge( byte *data, const size_t len, const int seq, const
 		if( reverse )
 			c = COM_SwapLong( c );
 		c ^= ~seq;
-		*pc = c;
+		memcpy( pc, &c, sizeof( c ));
 	}
 }
 

engine/common/net_buffer.c

@@ -17,15 +17,13 @@ GNU General Public License for more details.
 #include "protocol.h"
 #include "net_buffer.h"
 #include "xash3d_mathlib.h"
-//#define DEBUG_NET_MESSAGES_SEND
-//#define DEBUG_NET_MESSAGES_READ
 
 // precalculated bit masks for WriteUBitLong.
 // Using these tables instead of doing the calculations
 // gives a 33% speedup in WriteUBitLong.
 static uint32_t	BitWriteMasks[32][33];
 static uint32_t	ExtraMasks[32];
-const char *svc_strings[svc_lastmsg+1] =
+const char *const svc_strings[svc_lastmsg+1] =
 {
 	"svc_bad",
 	"svc_nop",
@@ -89,7 +87,7 @@ const char *svc_strings[svc_lastmsg+1] =
 	"svc_exec",
 };
 
-const char *svc_legacy_strings[svc_lastmsg+1] =
+const char *const svc_legacy_strings[svc_lastmsg+1] =
 {
 	[svc_legacy_changing] = "svc_legacy_changing",
 	[svc_legacy_ambientsound] = "svc_legacy_ambientsound",
@@ -100,7 +98,7 @@ const char *svc_legacy_strings[svc_lastmsg+1] =
 	[svc_legacy_chokecount] = "svc_legacy_chokecount",
 };
 
-const char *svc_goldsrc_strings[svc_lastmsg+1] =
+const char *const svc_goldsrc_strings[svc_lastmsg+1] =
 {
 	[svc_goldsrc_version] = "svc_goldsrc_version",
 	[svc_goldsrc_serverinfo] = "svc_goldsrc_serverinfo",
@@ -119,7 +117,7 @@ const char *svc_goldsrc_strings[svc_lastmsg+1] =
 	[svc_goldsrc_sendcvarvalue2] = "svc_goldsrc_sendcvarvalue2",
 };
 
-const char *svc_quake_strings[svc_lastmsg+1] =
+const char *const svc_quake_strings[svc_lastmsg+1] =
 {
 	[svc_updatestat] = "svc_quake_updatestat",
 	[svc_version] = "svc_quake_version",
@@ -213,25 +211,23 @@ void MSG_WriteSBitLong( sizebuf_t *sb, int data, int numbits )
 	// do we have a valid # of bits to encode with?
 	Assert( numbits >= 1 && numbits <= 32 );
 
-	if( data < 0 )
+	if( sb->iAlternateSign )
 	{
-		if( sb->iAlternateSign )
-			MSG_WriteOneBit( sb, 1 );
-
-		MSG_WriteUBitLong( sb, (uint)( 0x80000000 + data ), numbits - 1 );
-
-		if( !sb->iAlternateSign )
-			MSG_WriteOneBit( sb, 1 );
+		MSG_WriteOneBit( sb, data < 0 ? 1 : 0 );
+		MSG_WriteUBitLong( sb, (uint)abs( data ), numbits - 1 );
 	}
 	else
 	{
-		if( sb->iAlternateSign )
-			MSG_WriteOneBit( sb, 0 );
-
-		MSG_WriteUBitLong( sb, (uint)data, numbits - 1 );
-
-		if( !sb->iAlternateSign )
+		if( data < 0 )
+		{
+			MSG_WriteUBitLong( sb, (uint)( 0x80000000 + data ), numbits - 1 );
+			MSG_WriteOneBit( sb, 1 );
+		}
+		else
+		{
+			MSG_WriteUBitLong( sb, (uint)data, numbits - 1 );
 			MSG_WriteOneBit( sb, 0 );
+		}
 	}
 }
 
@@ -325,28 +321,30 @@ void MSG_WriteVec3Angles( sizebuf_t *sb, const float *fa )
 
 void MSG_WriteCmdExt( sizebuf_t *sb, int cmd, netsrc_t type, const char *name )
 {
-#ifdef DEBUG_NET_MESSAGES_SEND
-	if( name != NULL )
+	if( unlikely( net_send_debug.value ))
 	{
-		// get custom name
-		Con_Printf( "^1sv^7 write: %s\n", name );
-	}
-	else if( type == NS_SERVER )
-	{
-		if( cmd >= 0 && cmd <= svc_lastmsg )
+		if( name != NULL )
 		{
-			// get engine message name
-			Con_Printf( "^1sv^7 write: %s\n", svc_strings[cmd] );
+			// get custom name
+			Con_Printf( "^1sv^7 (%d) write: %s\n", sb->iCurBit, name );
+		}
+		else if( type == NS_SERVER )
+		{
+			if( cmd >= 0 && cmd <= svc_lastmsg )
+			{
+				// get engine message name
+				Con_Printf( "^1sv^7 (%d) write: %s\n", sb->iCurBit, svc_strings[cmd] );
+			}
+		}
+		else if( type == NS_CLIENT )
+		{
+			if( cmd >= 0 && cmd <= clc_lastmsg && cmd != clc_nop )
+			{
+				Con_Printf( "^1cl^7 (%d) write: %s\n", sb->iCurBit, clc_strings[cmd] );
+			}
 		}
 	}
-	else if( type == NS_CLIENT )
-	{
-		if( cmd >= 0 && cmd <= clc_lastmsg )
-		{
-			Con_Printf( "^1cl^7 write: %s\n", clc_strings[cmd] );
-		}
-	}
-#endif
+
 	MSG_WriteUBitLong( sb, cmd, sizeof( uint8_t ) << 3 );
 }
 
@@ -572,16 +570,19 @@ int MSG_ReadCmd( sizebuf_t *sb, netsrc_t type )
 {
 	int	cmd = MSG_ReadUBitLong( sb, sizeof( uint8_t ) << 3 );
 
-#ifdef DEBUG_NET_MESSAGES_READ
-	if( type == NS_SERVER )
+	if( unlikely( net_recv_debug.value ))
 	{
-		Con_Printf( "^1cl^7 read: %s\n", CL_MsgInfo( cmd ));
+		if( type == NS_SERVER )
+		{
+			if( cmd != svc_nop )
+				Con_Printf( "^1cl^7 read: %s\n", CL_MsgInfo( cmd ));
+		}
+		else if( cmd >= 0 && cmd <= clc_lastmsg )
+		{
+			Con_Printf( "^1sv^7 read: %s\n", clc_strings[cmd] );
+		}
 	}
-	else if( cmd >= 0 && cmd <= clc_lastmsg )
-	{
-		Con_Printf( "^1sv^7 read: %s\n", clc_strings[cmd] );
-	}
-#endif
+
 	return cmd;
 }
 

engine/common/net_buffer.h

@@ -184,7 +184,8 @@ static inline void MSG_EndBitWriting( sizebuf_t *sb )
 	}
 
 	// we have native bit ops here, just pad to closest byte
-	MSG_SeekToBit( sb, MSG_GetNumBytesWritten( sb ) << 3, SEEK_SET );
+	if(( sb->iCurBit & 7 ) != 0 )
+		MSG_SeekToBit( sb, 8 - ( sb->iCurBit & 7 ), SEEK_CUR );
 }
 
 static inline void MSG_StartBitWriting( sizebuf_t *sb )

engine/common/net_chan.c

@@ -87,10 +87,12 @@ such as during the connection stage while waiting for the client to load,
 then a packet only needs to be delivered if there is something in the
 unacknowledged reliable
 */
-CVAR_DEFINE_AUTO( net_showpackets, "0", 0, "show network packets" );
+CVAR_DEFINE_AUTO( net_showpackets, "0", FCVAR_PRIVILEGED, "show network packets" );
 static CVAR_DEFINE_AUTO( net_chokeloop, "0", 0, "apply bandwidth choke to loopback packets" );
 static CVAR_DEFINE_AUTO( net_showdrop, "0", 0, "show packets that are dropped" );
 static CVAR_DEFINE_AUTO( net_qport, "0", FCVAR_READ_ONLY, "current quake netport" );
+CVAR_DEFINE_AUTO( net_send_debug, "0", FCVAR_PRIVILEGED, "enable debugging output for outgoing messages" );
+CVAR_DEFINE_AUTO( net_recv_debug, "0", FCVAR_PRIVILEGED, "enable debugging output for incoming messages" );
 
 int	net_drop;
 netadr_t	net_from;
@@ -98,12 +100,58 @@ sizebuf_t	net_message;
 static poolhandle_t net_mempool;
 byte	net_message_buffer[NET_MAX_MESSAGE];
 
-const char *ns_strings[NS_COUNT] =
+static const char *const ns_strings[NS_COUNT] =
 {
 	"Client",
 	"Server",
 };
 
+#if !XASH_DEDICATED
+void bz_internal_error( int errcode );
+void bz_internal_error( int errcode )
+{
+	Con_Printf( S_ERROR "bzip2/libbzip2: internal error number %d.\n"
+			"This is a bug in bzip2/libbzip2, %s.\n"
+			"Please report it at: https://gitlab.com/bzip2/bzip2/-/issues\n"
+			"If this happened when you were using some program which uses\n"
+			"libbzip2 as a component, you should also report this bug to\n"
+			"the author(s) of that program.\n"
+			"Please make an effort to report this bug;\n"
+			"timely and accurate bug reports eventually lead to higher\n"
+			"quality software.  Thanks.\n\n",
+			errcode, BZ2_bzlibVersion( ));
+
+	if (errcode == 1007) {
+		Con_Printf(
+			"\n*** A special note about internal error number 1007 ***\n"
+			"\n"
+			"Experience suggests that a common cause of i.e. 1007\n"
+			"is unreliable memory or other hardware.  The 1007 assertion\n"
+			"just happens to cross-check the results of huge numbers of\n"
+			"memory reads/writes, and so acts (unintendedly) as a stress\n"
+			"test of your memory system.\n"
+			"\n"
+			"I suggest the following: try compressing the file again,\n"
+			"possibly monitoring progress in detail with the -vv flag.\n"
+			"\n"
+			"* If the error cannot be reproduced, and/or happens at different\n"
+			"  points in compression, you may have a flaky memory system.\n"
+			"  Try a memory-test program.  I have used Memtest86\n"
+			"  (www.memtest86.com).  At the time of writing it is free (GPLd).\n"
+			"  Memtest86 tests memory much more thorougly than your BIOSs\n"
+			"  power-on test, and may find failures that the BIOS doesn't.\n"
+			"\n"
+			"* If the error can be repeatably reproduced, this is a bug in\n"
+			"  bzip2, and I would very much like to hear about it.  Please\n"
+			"  let me know, and, ideally, save a copy of the file causing the\n"
+			"  problem -- without which I will be unable to investigate it.\n"
+			"\n"
+		);
+	}
+
+	Sys_Error( "bzip2/libbzip2: internal error number %d\n", errcode );
+}
+#endif // XASH_DEDICATED
 
 /*
 =================================
@@ -219,6 +267,8 @@ void Netchan_Init( void )
 	Cvar_RegisterVariable( &net_chokeloop );
 	Cvar_RegisterVariable( &net_showdrop );
 	Cvar_RegisterVariable( &net_qport );
+	Cvar_RegisterVariable( &net_send_debug );
+	Cvar_RegisterVariable( &net_recv_debug );
 	Cvar_FullSet( net_qport.name, buf, net_qport.flags );
 
 	net_mempool = Mem_AllocPool( "Network Pool" );
@@ -274,6 +324,12 @@ void Netchan_Setup( netsrc_t sock, netchan_t *chan, netadr_t adr, int qport, voi
 
 	memset( chan, 0, sizeof( *chan ));
 
+	if( pfnBlockSize == NULL )
+	{
+		Host_Error( "%s: pfnBlockSize == NULL", __func__ );
+		return;
+	}
+
 	chan->sock = sock;
 	chan->remote_address = adr;
 	chan->last_received = host.realtime;
@@ -464,7 +520,7 @@ Netchan_OutOfBand
 Sends an out-of-band datagram
 ================
 */
-void Netchan_OutOfBand( int net_socket, netadr_t adr, int len, byte *data )
+void Netchan_OutOfBand( int net_socket, netadr_t adr, int len, const byte *data )
 {
 	byte buf[MAX_PRINT_MSG + 4] = { 0xff, 0xff, 0xff, 0xff };
 
@@ -688,29 +744,35 @@ static void Netchan_CreateFragments_( netchan_t *chan, sizebuf_t *msg )
 	if( MSG_GetNumBytesWritten( msg ) == 0 )
 		return;
 
-	if( chan->pfnBlockSize != NULL )
-		chunksize = chan->pfnBlockSize( chan->client, FRAGSIZE_FRAG );
-	else chunksize = FRAGMENT_MAX_SIZE; // fallback
+	chunksize = chan->pfnBlockSize( chan->client, FRAGSIZE_FRAG );
 
 	wait = (fragbufwaiting_t *)Mem_Calloc( net_mempool, sizeof( fragbufwaiting_t ));
 
 	if( chan->use_bz2 && memcmp( MSG_GetData( msg ), "BZ2", 4 ))
 	{
+#if !XASH_DEDICATED
 		byte pbOut[0x10000];
+		uint uSourceSize = MSG_GetNumBytesWritten( msg );
 		uint uCompressedSize = MSG_GetNumBytesWritten( msg ) - 4;
-		if( !BZ2_bzBuffToBuffCompress( pbOut, &uCompressedSize, MSG_GetData( msg ), MSG_GetNumBytesWritten( msg ), 9, 0, 30 ))
+		if( !BZ2_bzBuffToBuffCompress( pbOut, &uCompressedSize, MSG_GetData( msg ), uSourceSize, 9, 0, 30 ))
 		{
-			Con_Reportf( "Compressing split packet with BZip2 (%d -> %d bytes)\n", MSG_GetNumBytesWritten( msg ), uCompressedSize );
-			memcpy( msg->pData, "BZ2", 4 );
-			memcpy( msg->pData + 4, pbOut, uCompressedSize );
-			MSG_SeekToBit( msg, uCompressedSize << 3, SEEK_SET );
+			if( uCompressedSize < uSourceSize )
+			{
+				Con_Reportf( "Compressing split packet with BZip2 (%d -> %d bytes)\n", uSourceSize, uCompressedSize );
+				memcpy( msg->pData, "BZ2", 4 );
+				memcpy( msg->pData + 4, pbOut, uCompressedSize );
+				MSG_SeekToBit( msg, uCompressedSize << 3, SEEK_SET );
+			}
 		}
+#else
+		Host_Error( "%s: BZ2 compression is not supported for server", __func__ );
+#endif
 	}
 	else if( !chan->use_bz2 && !LZSS_IsCompressed( MSG_GetData( msg )))
 	{
-		uint	uCompressedSize = 0;
-		uint	uSourceSize = MSG_GetNumBytesWritten( msg );
-		byte	*pbOut = LZSS_Compress( msg->pData, uSourceSize, &uCompressedSize );
+		uint uCompressedSize = 0;
+		uint uSourceSize = MSG_GetNumBytesWritten( msg );
+		byte *pbOut = LZSS_Compress( msg->pData, uSourceSize, &uCompressedSize );
 
 		if( pbOut && uCompressedSize > 0 && uCompressedSize < uSourceSize )
 		{
@@ -861,9 +923,7 @@ void Netchan_CreateFileFragmentsFromBuffer( netchan_t *chan, const char *filenam
 
 	if( !size ) return;
 
-	if( chan->pfnBlockSize != NULL )
-		chunksize = chan->pfnBlockSize( chan->client, FRAGSIZE_FRAG );
-	else chunksize = FRAGMENT_MAX_SIZE; // fallback
+	chunksize = chan->pfnBlockSize( chan->client, FRAGSIZE_FRAG );
 
 	if( !LZSS_IsCompressed( pbuf ))
 	{
@@ -959,16 +1019,14 @@ int Netchan_CreateFileFragments( netchan_t *chan, const char *filename )
 		Con_Printf( S_WARN "Unable to transfer %s due to path length overflow\n", filename );
 		return 0;
 	}
-	
+
 	if(( filesize = FS_FileSize( filename, false )) <= 0 )
 	{
 		Con_Printf( S_WARN "Unable to open %s for transfer\n", filename );
 		return 0;
 	}
 
-	if( chan->pfnBlockSize != NULL )
-		chunksize = chan->pfnBlockSize( chan->client, FRAGSIZE_FRAG );
-	else chunksize = FRAGMENT_MAX_SIZE; // fallback
+	chunksize = chan->pfnBlockSize( chan->client, FRAGSIZE_FRAG );
 
 	Q_snprintf( compressedfilename, sizeof( compressedfilename ), "%s.ztmp", filename );
 	compressedFileTime = FS_FileTime( compressedfilename, false );
@@ -1119,12 +1177,16 @@ qboolean Netchan_CopyNormalFragments( netchan_t *chan, sizebuf_t *msg, size_t *l
 
 	if( chan->use_bz2 && !memcmp( MSG_GetData( msg ), "BZ2", 4 ) )
 	{
+#if !XASH_DEDICATED
 		byte buf[0x10000];
 		uint uDecompressedLen = sizeof( buf );
 
 		BZ2_bzBuffToBuffDecompress( buf, &uDecompressedLen, MSG_GetData( msg ) + 4, MSG_GetNumBytesWritten( msg ) - 4, 1, 0 );
 		memcpy( msg->pData, buf, uDecompressedLen );
 		size = uDecompressedLen;
+#else
+		Host_Error( "%s: BZ2 compression is not supported for server", __func__ );
+#endif
 	}
 	else if( !chan->use_bz2 && LZSS_IsCompressed( MSG_GetData( msg )))
 	{
@@ -1263,18 +1325,19 @@ qboolean Netchan_CopyFileFragments( netchan_t *chan, sizebuf_t *msg )
 		p = n;
 	}
 
-	if( chan->gs_netchan && chan->use_bz2 )
+	if( chan->gs_netchan && chan->use_bz2 && !Q_stricmp( compressor, "bz2" ))
 	{
-		if( !Q_stricmp( compressor, "bz2" ))
-		{
-			byte *uncompressedBuffer = Mem_Calloc( net_mempool, uncompressedSize );
+#if !XASH_DEDICATED
+		byte *uncompressedBuffer = Mem_Calloc( net_mempool, uncompressedSize );
 
-			Con_DPrintf( "Decompressing file %s (%d -> %d bytes)\n", filename, nsize, uncompressedSize );
-			BZ2_bzBuffToBuffDecompress( uncompressedBuffer, &uncompressedSize, buffer, nsize, 1, 0 );
-			Mem_Free( buffer );
-			nsize = uncompressedSize;
-			buffer = uncompressedBuffer;
-		}
+		Con_DPrintf( "Decompressing file %s (%d -> %d bytes)\n", filename, nsize, uncompressedSize );
+		BZ2_bzBuffToBuffDecompress( uncompressedBuffer, &uncompressedSize, buffer, nsize, 1, 0 );
+		Mem_Free( buffer );
+		nsize = uncompressedSize;
+		buffer = uncompressedBuffer;
+#else
+		Host_Error( "%s: BZ2 compression is not supported for server", __func__ );
+#endif
 	}
 	else if( LZSS_IsCompressed( buffer ))
 	{
@@ -1441,7 +1504,7 @@ transmition / retransmition of the reliable messages.
 A 0 length will still generate a packet and deal with the reliable messages.
 ================
 */
-void Netchan_TransmitBits( netchan_t *chan, int length, byte *data )
+void Netchan_TransmitBits( netchan_t *chan, int length, const byte *data )
 {
 	byte	send_buf[NET_MAX_MESSAGE];
 	qboolean	send_reliable_fragment;
@@ -1458,6 +1521,9 @@ void Netchan_TransmitBits( netchan_t *chan, int length, byte *data )
 		return;
 	}
 
+	if( chan->pfnBlockSize == NULL ) // not initialized
+		return;
+
 	// if the remote side dropped the last reliable message, resend it
 	send_reliable = false;
 
@@ -1496,12 +1562,9 @@ void Netchan_TransmitBits( netchan_t *chan, int length, byte *data )
 		// stall reliable payloads if sending from frag buffer
 		if( send_from_regular && ( send_from_frag[FRAG_NORMAL_STREAM] ))
 		{
-			int maxsize = MAX_RELIABLE_PAYLOAD;
+			int maxsize = chan->pfnBlockSize( chan->client, FRAGSIZE_SPLIT );
 			send_from_regular = false;
 
-
-			if( chan->pfnBlockSize )
-				maxsize = chan->pfnBlockSize( chan->client, FRAGSIZE_SPLIT );
 			if( maxsize == 0 )
 				maxsize = MAX_RELIABLE_PAYLOAD;
 
@@ -1683,9 +1746,7 @@ void Netchan_TransmitBits( netchan_t *chan, int length, byte *data )
 
 	if( length )
 	{
-		int maxsize = NET_MAX_MESSAGE;
-		if( chan->pfnBlockSize )
-			maxsize = chan->pfnBlockSize( chan->client, FRAGSIZE_UNRELIABLE );
+		int maxsize = chan->pfnBlockSize( chan->client, FRAGSIZE_UNRELIABLE );
 
 		if( (( MSG_GetNumBytesWritten( &send ) + length ) >> 3) <= maxsize )
 			MSG_WriteBits( &send, data, length );
@@ -1719,9 +1780,7 @@ void Netchan_TransmitBits( netchan_t *chan, int length, byte *data )
 	// send the datagram
 	if( !CL_IsPlaybackDemo( ))
 	{
-		int splitsize = 0;
-		if( chan->pfnBlockSize )
-			splitsize = chan->pfnBlockSize( chan->client, FRAGSIZE_SPLIT );
+		int splitsize = chan->pfnBlockSize( chan->client, FRAGSIZE_SPLIT );
 
 		if( chan->use_munge )
 			COM_Munge2( send.pData + 8, MSG_GetNumBytesWritten( &send ) - 8, (byte)( chan->outgoing_sequence - 1 ));

engine/common/net_encode.c

@@ -376,13 +376,74 @@ static delta_info_t dt_info[] =
 [DT_ENTITY_STATE_T]        = { "entity_state_t", ent_fields, NUM_FIELDS( ent_fields ) },
 [DT_ENTITY_STATE_PLAYER_T] = { "entity_state_player_t", ent_fields, NUM_FIELDS( ent_fields ) },
 [DT_CUSTOM_ENTITY_STATE_T] = { "custom_entity_state_t", ent_fields, NUM_FIELDS( ent_fields ) },
-[DT_GOLDSRC_DELTA_T]       = { "goldsrc_delta_t", meta_fields, NUM_FIELDS( meta_fields ) },
 #if XASH_ENGINE_TESTS
 [DT_DELTA_TEST_STRUCT_T]   = { "delta_test_struct_t", test_fields, NUM_FIELDS( test_fields ) },
 #endif
 [DT_STRUCT_COUNT]          = { NULL },
 };
 
+// meta description is special, it cannot be overriden
+static const delta_info_t dt_goldsrc_meta =
+{
+	.pName = "goldsrc_delta_t",
+	.pInfo = meta_fields,
+	.maxFields = NUM_FIELDS( meta_fields ),
+	.numFields = NUM_FIELDS( meta_fields ),
+	.pFields = (delta_t[NUM_FIELDS( meta_fields )])
+	{
+		{
+			DESC_DEF( fieldType ),
+			.flags = DT_INTEGER,
+			.multiplier = 1.0f,
+			.post_multiplier = 1.0f,
+			.bits = 32,
+		},
+		{
+			DESC_DEF( fieldName ),
+			.flags = DT_STRING,
+			.multiplier = 1.0f,
+			.post_multiplier = 1.0f,
+			.bits = 1,
+		},
+		{
+			DESC_DEF( fieldOffset ),
+			.flags = DT_INTEGER,
+			.multiplier = 1.0f,
+			.post_multiplier = 1.0f,
+			.bits = 16,
+		},
+		{
+			DESC_DEF( fieldSize ),
+			.flags = DT_INTEGER,
+			.multiplier = 1.0f,
+			.post_multiplier = 1.0f,
+			.bits = 8,
+		},
+		{
+			DESC_DEF( significant_bits ),
+			.flags = DT_INTEGER,
+			.multiplier = 1.0f,
+			.post_multiplier = 1.0f,
+			.bits = 8,
+		},
+		{
+			DESC_DEF( premultiply ),
+			.flags = DT_FLOAT,
+			.multiplier = 4000.0f,
+			.post_multiplier = 1.0f,
+			.bits = 32,
+		},
+		{
+			DESC_DEF( postmultiply ),
+			.flags = DT_FLOAT,
+			.multiplier = 4000.0f,
+			.post_multiplier = 1.0f,
+			.bits = 32,
+		},
+	},
+	.bInitialized = true
+};
+
 static delta_info_t *Delta_FindStruct( const char *name )
 {
 	int	i;
@@ -620,64 +681,6 @@ void Delta_ParseTableField( sizebuf_t *msg )
 	Delta_AddField( dt, pName, flags, bits, mul, post_mul );
 }
 
-void Delta_InitMeta( void )
-{
-	delta_info_t *dt = Delta_FindStructByIndex( DT_GOLDSRC_DELTA_T );
-
-	if( dt->bInitialized )
-		return;
-
-	Delta_AddField( dt, "fieldType",        DT_INTEGER, 32, 1.0f, 1.0f );
-	Delta_AddField( dt, "fieldName",        DT_STRING,   1, 1.0f, 1.0f );
-	Delta_AddField( dt, "fieldOffset",      DT_INTEGER, 16, 1.0f, 1.0f );
-	Delta_AddField( dt, "fieldSize",        DT_INTEGER,  8, 1.0f, 1.0f );
-	Delta_AddField( dt, "significant_bits", DT_INTEGER,  8, 1.0f, 1.0f );
-	Delta_AddField( dt, "premultiply",      DT_FLOAT,   32, 4000.0f, 1.0f );
-	Delta_AddField( dt, "postmultiply",     DT_FLOAT,   32, 4000.0f, 1.0f );
-	dt->numFields = dt->maxFields;
-	dt->bInitialized = true;
-}
-
-void Delta_ParseTableField_GS( sizebuf_t *msg )
-{
-	const char *s = MSG_ReadString( msg );
-	delta_info_t *dt = Delta_FindStruct( s );
-	goldsrc_delta_t null = { 0 };
-	int i, num_fields;
-
-
-	// delta encoders it's already initialized on this machine (local game)
-	if( delta_init )
-	{
-		Delta_Shutdown();
-		Delta_InitMeta();
-	}
-
-	if( !dt )
-		Host_Error( "%s: not initialized", __func__ );
-
-	num_fields = MSG_ReadShort( msg );
-	if( num_fields > dt->maxFields )
-		Host_Error( "%s: numFields > maxFields", __func__ );
-
-	MSG_StartBitWriting( msg );
-
-	for( i = 0; i < num_fields; i++ )
-	{
-		goldsrc_delta_t to;
-
-		Delta_ReadGSFields( msg, DT_GOLDSRC_DELTA_T, &null, &to, 0.0f );
-
-		// patch our DT_SIGNED flag
-		if( FBitSet( to.fieldType, DT_SIGNED_GS ))
-			SetBits( to.fieldType, DT_SIGNED );
-
-		Delta_AddField( dt, to.fieldName, to.fieldType, to.significant_bits, to.premultiply, to.postmultiply );
-	}
-
-	MSG_EndBitWriting( msg );
-}
-
 static qboolean Delta_ParseField( char **delta_script, const delta_field_t *pInfo, delta_t *pField, qboolean bPost )
 {
 	string		token;
@@ -1319,7 +1322,6 @@ static qboolean Delta_WriteField( sizebuf_t *msg, delta_t *pField, const void *f
 	Delta_WriteField_( msg, pField, from, to, timebase );
 
 	return true;
-	return true;
 }
 
 /*
@@ -1482,9 +1484,8 @@ static qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, const void *fr
 	return true;
 }
 
-void Delta_ReadGSFields( sizebuf_t *msg, int index, void *from, void *to, double timebase )
+static void Delta_ParseGSFields( sizebuf_t *msg, const delta_info_t *dt, const void *from, void *to, double timebase )
 {
-	delta_info_t *dt = Delta_FindStructByIndex( index );
 	uint8_t bits[8] = { 0 };
 	delta_t *pField;
 	byte c;
@@ -1506,7 +1507,13 @@ void Delta_ReadGSFields( sizebuf_t *msg, int index, void *from, void *to, double
 	}
 }
 
-void Delta_WriteGSFields( sizebuf_t *msg, int index, void *from, void *to, double timebase )
+void Delta_ReadGSFields( sizebuf_t *msg, int index, const void *from, void *to, double timebase )
+{
+	const delta_info_t *dt = Delta_FindStructByIndex( index );
+	Delta_ParseGSFields( msg, dt, from, to, timebase );
+}
+
+void Delta_WriteGSFields( sizebuf_t *msg, int index, const void *from, const void *to, double timebase )
 {
 	delta_info_t *dt = Delta_FindStructByIndex( index );
 	delta_t *pField;
@@ -2104,6 +2111,44 @@ qboolean MSG_ReadDeltaEntity( sizebuf_t *msg, const entity_state_t *from, entity
 	return true;
 }
 
+void Delta_ParseTableField_GS( sizebuf_t *msg )
+{
+	const char *s = MSG_ReadString( msg );
+	delta_info_t *dt = Delta_FindStruct( s );
+	goldsrc_delta_t null = { 0 };
+	int i, num_fields;
+
+	// delta encoders it's already initialized on this machine (local game)
+	if( delta_init )
+		Delta_Shutdown();
+
+	if( !dt )
+		Host_Error( "%s: not initialized", __func__ );
+
+	num_fields = MSG_ReadShort( msg );
+	if( num_fields > dt->maxFields )
+		Host_Error( "%s: numFields > maxFields", __func__ );
+
+	MSG_StartBitWriting( msg );
+
+	for( i = 0; i < num_fields; i++ )
+	{
+		goldsrc_delta_t to;
+
+		Delta_ParseGSFields( msg, &dt_goldsrc_meta, &null, &to, 0.0f );
+
+		// patch our DT_SIGNED flag
+		if( FBitSet( to.fieldType, DT_SIGNED_GS ))
+		{
+			ClearBits( to.fieldType, DT_SIGNED_GS );
+			SetBits( to.fieldType, DT_SIGNED );
+		}
+		Delta_AddField( dt, to.fieldName, to.fieldType, to.significant_bits, to.premultiply, to.postmultiply );
+	}
+
+	MSG_EndBitWriting( msg );
+}
+
 /*
 ==================
 Delta_WriteDescriptionToClient

engine/common/net_encode.h

@@ -43,7 +43,6 @@ enum
 	DT_ENTITY_STATE_T,
 	DT_ENTITY_STATE_PLAYER_T,
 	DT_CUSTOM_ENTITY_STATE_T,
-	DT_GOLDSRC_DELTA_T,
 #if XASH_ENGINE_TESTS
 	DT_DELTA_TEST_STRUCT_T,
 #endif
@@ -104,7 +103,6 @@ typedef struct
 //
 void Delta_Init( void );
 void Delta_InitClient( void );
-void Delta_InitMeta( void );
 void Delta_Shutdown( void );
 void Delta_AddEncoder( char *name, pfnDeltaEncode encodeFunc );
 int Delta_FindField( delta_t *pFields, const char *fieldname );
@@ -139,7 +137,7 @@ void MSG_ReadWeaponData( sizebuf_t *msg, const struct weapon_data_s *from, struc
 void MSG_WriteDeltaEntity( const struct entity_state_s *from, const struct entity_state_s *to, sizebuf_t *msg, qboolean force, int type, double timebase, int ofs );
 qboolean MSG_ReadDeltaEntity( sizebuf_t *msg, const struct entity_state_s *from, struct entity_state_s *to, int num, int type, double timebase );
 int Delta_TestBaseline( const struct entity_state_s *from, const struct entity_state_s *to, qboolean player, double timebase );
-void Delta_ReadGSFields( sizebuf_t *msg, int index, void *from, void *to, double timebase );
-void Delta_WriteGSFields( sizebuf_t *msg, int index, void *from, void *to, double timebase );
+void Delta_ReadGSFields( sizebuf_t *msg, int index, const void *from, void *to, double timebase );
+void Delta_WriteGSFields( sizebuf_t *msg, int index, const void *from, const void *to, double timebase );
 
 #endif//NET_ENCODE_H

engine/common/net_ws.h

@@ -50,8 +50,10 @@ typedef enum
 
 #include "netadr.h"
 
-extern convar_t	net_showpackets;
-extern convar_t	net_clockwindow;
+extern convar_t net_showpackets;
+extern convar_t net_clockwindow;
+extern convar_t net_send_debug;
+extern convar_t net_recv_debug;
 
 void NET_Init( void );
 void NET_Shutdown( void );
@@ -59,7 +61,6 @@ void NET_Sleep( int msec );
 qboolean NET_IsActive( void );
 qboolean NET_IsConfigured( void );
 void NET_Config( qboolean net_enable, qboolean changeport );
-qboolean NET_IsLocalAddress( netadr_t adr );
 const char *NET_AdrToString( const netadr_t a );
 const char *NET_BaseAdrToString( const netadr_t a );
 qboolean NET_IsReservedAdr( netadr_t a );
@@ -77,12 +78,17 @@ void NET_SendPacketEx( netsrc_t sock, size_t length, const void *data, netadr_t
 void NET_IP6BytesToNetadr( netadr_t *adr, const uint8_t *ip6 );
 void NET_NetadrToIP6Bytes( uint8_t *ip6, const netadr_t *adr );
 
+static inline qboolean NET_IsLocalAddress( netadr_t adr )
+{
+	return adr.type == NA_LOOPBACK ? true : false;
+}
+
 #if !XASH_DEDICATED
 int CL_GetSplitSize( void );
 #endif
 
 void HTTP_AddCustomServer( const char *url );
-void HTTP_AddDownload( const char *path, int size, qboolean process );
+void HTTP_AddDownload( const char *path, int size, qboolean process, resource_t *res );
 void HTTP_ClearCustomServers( void );
 void HTTP_Shutdown( void );
 void HTTP_ResetProcessState( void );

engine/common/net_ws_private.h

@@ -0,0 +1,103 @@
+/*
+net_ws_private.h - networking private definitions
+Copyright (C) 2024 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 "net_ws.h"
+#if XASH_NO_NETWORK
+#include "platform/stub/net_stub.h"
+#elif XASH_WIN32
+#include "platform/win32/net.h"
+#elif XASH_PSVITA
+#include "platform/psvita/net_psvita.h"
+static const struct in6_addr in6addr_any;
+#else
+#include "platform/posix/net.h"
+#endif
+
+
+//
+// net_ws.c
+//
+static inline const char *NET_ErrorString( void )
+{
+#if XASH_WIN32
+	int err = WSAGetLastError();
+	switch( err )
+	{
+	case WSAEINTR: return "WSAEINTR";
+	case WSAEBADF: return "WSAEBADF";
+	case WSAEACCES: return "WSAEACCES";
+	case WSAEFAULT: return "WSAEFAULT";
+	case WSAEINVAL: return "WSAEINVAL";
+	case WSAEMFILE: return "WSAEMFILE";
+	case WSAEWOULDBLOCK: return "WSAEWOULDBLOCK";
+	case WSAEINPROGRESS: return "WSAEINPROGRESS";
+	case WSAEALREADY: return "WSAEALREADY";
+	case WSAENOTSOCK: return "WSAENOTSOCK";
+	case WSAEDESTADDRREQ: return "WSAEDESTADDRREQ";
+	case WSAEMSGSIZE: return "WSAEMSGSIZE";
+	case WSAEPROTOTYPE: return "WSAEPROTOTYPE";
+	case WSAENOPROTOOPT: return "WSAENOPROTOOPT";
+	case WSAEPROTONOSUPPORT: return "WSAEPROTONOSUPPORT";
+	case WSAESOCKTNOSUPPORT: return "WSAESOCKTNOSUPPORT";
+	case WSAEOPNOTSUPP: return "WSAEOPNOTSUPP";
+	case WSAEPFNOSUPPORT: return "WSAEPFNOSUPPORT";
+	case WSAEAFNOSUPPORT: return "WSAEAFNOSUPPORT";
+	case WSAEADDRINUSE: return "WSAEADDRINUSE";
+	case WSAEADDRNOTAVAIL: return "WSAEADDRNOTAVAIL";
+	case WSAENETDOWN: return "WSAENETDOWN";
+	case WSAENETUNREACH: return "WSAENETUNREACH";
+	case WSAENETRESET: return "WSAENETRESET";
+	case WSAECONNABORTED: return "WSWSAECONNABORTEDAEINTR";
+	case WSAECONNRESET: return "WSAECONNRESET";
+	case WSAENOBUFS: return "WSAENOBUFS";
+	case WSAEISCONN: return "WSAEISCONN";
+	case WSAENOTCONN: return "WSAENOTCONN";
+	case WSAESHUTDOWN: return "WSAESHUTDOWN";
+	case WSAETOOMANYREFS: return "WSAETOOMANYREFS";
+	case WSAETIMEDOUT: return "WSAETIMEDOUT";
+	case WSAECONNREFUSED: return "WSAECONNREFUSED";
+	case WSAELOOP: return "WSAELOOP";
+	case WSAENAMETOOLONG: return "WSAENAMETOOLONG";
+	case WSAEHOSTDOWN: return "WSAEHOSTDOWN";
+	case WSAEDISCON: return "WSAEDISCON";
+	case WSASYSNOTREADY: return "WSASYSNOTREADY";
+	case WSAVERNOTSUPPORTED: return "WSAVERNOTSUPPORTED";
+	case WSANOTINITIALISED: return "WSANOTINITIALISED";
+	case WSAHOST_NOT_FOUND: return "WSAHOST_NOT_FOUND";
+	case WSATRY_AGAIN: return "WSATRY_AGAIN";
+	case WSANO_RECOVERY: return "WSANO_RECOVERY";
+	case WSANO_DATA: return "WSANO_DATA";
+	}
+
+	return "NO ERROR";
+#else
+	return strerror( errno );
+#endif
+}
+
+static inline socklen_t NET_SockAddrLen( const struct sockaddr_storage *addr )
+{
+	switch ( addr->ss_family )
+	{
+	case AF_INET:
+		return sizeof( struct sockaddr_in );
+	case AF_INET6:
+		return sizeof( struct sockaddr_in6 );
+	default:
+		return sizeof( *addr ); // what the fuck is this?
+	}
+}
+
+net_gai_state_t NET_StringToSockaddr( const char *s, struct sockaddr_storage *sadr, qboolean nonblocking, int family );

engine/common/netchan.h

@@ -305,8 +305,8 @@ qboolean Netchan_CopyNormalFragments( netchan_t *chan, sizebuf_t *msg, size_t *l
 qboolean Netchan_CopyFileFragments( netchan_t *chan, sizebuf_t *msg );
 void Netchan_CreateFragments( netchan_t *chan, sizebuf_t *msg );
 int Netchan_CreateFileFragments( netchan_t *chan, const char *filename );
-void Netchan_TransmitBits( netchan_t *chan, int lengthInBits, byte *data );
-void Netchan_OutOfBand( int net_socket, netadr_t adr, int length, byte *data );
+void Netchan_TransmitBits( netchan_t *chan, int lengthInBits, const byte *data );
+void Netchan_OutOfBand( int net_socket, netadr_t adr, int length, const byte *data );
 void Netchan_OutOfBandPrint( int net_socket, netadr_t adr, const char *format, ... ) _format( 3 );
 qboolean Netchan_Process( netchan_t *chan, sizebuf_t *msg );
 void Netchan_UpdateProgress( netchan_t *chan );

engine/common/pm_debug.c

@@ -1,95 +0,0 @@
-/*
-pm_debug.c - player move debugging code
-Copyright (C) 2017 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"
-#include "xash3d_mathlib.h"
-#include "pm_local.h"
-#if !XASH_DEDICATED
-#include "client.h" // CL_Particle
-#endif
-
-// expand debugging BBOX particle hulls by this many units.
-#define BOX_GAP	0.0f
-
-/*
-===============
-PM_ParticleLine
-
-draw line from particles
-================
-*/
-void PM_ParticleLine( const vec3_t start, const vec3_t end, int pcolor, float life, float zvel )
-{
-#if !XASH_DEDICATED
-	float	len, curdist;
-	vec3_t	diff, pos;
-
-	// determine distance
-	VectorSubtract( end, start, diff );
-	len = VectorNormalizeLength( diff );
-	curdist = 0;
-
-	while( curdist <= len )
-	{
-		VectorMA( start, curdist, diff, pos );
-		CL_Particle( pos, pcolor, life, 0, zvel );
-		curdist += 2.0f;
-	}
-#endif // XASH_DEDICATED
-}
-
-/*
-================
-PM_DrawRectangle
-
-================
-*/
-static void PM_DrawRectangle( const vec3_t tl, const vec3_t bl, const vec3_t tr, const vec3_t br, int pcolor, float life )
-{
-	PM_ParticleLine( tl, bl, pcolor, life, 0 );
-	PM_ParticleLine( bl, br, pcolor, life, 0 );
-	PM_ParticleLine( br, tr, pcolor, life, 0 );
-	PM_ParticleLine( tr, tl, pcolor, life, 0 );
-}
-
-/*
-================
-PM_DrawBBox
-
-================
-*/
-void PM_DrawBBox( const vec3_t mins, const vec3_t maxs, const vec3_t origin, int pcolor, float life )
-{
-#if !XASH_DEDICATED
-	vec3_t	p[8], tmp;
-	float	gap = BOX_GAP;
-	int	i;
-
-	for( i = 0; i < 8; i++ )
-	{
-		tmp[0] = (i & 1) ? mins[0] - gap : maxs[0] + gap;
-		tmp[1] = (i & 2) ? mins[1] - gap : maxs[1] + gap ;
-		tmp[2] = (i & 4) ? mins[2] - gap : maxs[2] + gap ;
-
-		VectorAdd( tmp, origin, tmp );
-		VectorCopy( tmp, p[i] );
-	}
-
-	for( i = 0; i < 6; i++ )
-	{
-		PM_DrawRectangle( p[boxpnt[i][1]], p[boxpnt[i][0]], p[boxpnt[i][2]], p[boxpnt[i][3]], pcolor, life );
-	}
-#endif // XASH_DEDICATED
-}

engine/common/pm_local.h

@@ -20,17 +20,10 @@ GNU General Public License for more details.
 
 typedef int (*pfnIgnore)( physent_t *pe );	// custom trace filter
 
-//
-// pm_debug.c
-//
-void PM_ParticleLine( const vec3_t start, const vec3_t end, int pcolor, float life, float zvel );
-void PM_DrawBBox( const vec3_t mins, const vec3_t maxs, const vec3_t origin, int pcolor, float life );
-
 //
 // pm_trace.c
 //
 void Pmove_Init( void );
-void PM_ClearPhysEnts( playermove_t *pmove );
 void PM_InitBoxHull( void );
 hull_t *PM_HullForBsp( physent_t *pe, playermove_t *pmove, float *offset );
 qboolean PM_RecursiveHullCheck( hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, pmtrace_t *trace );
@@ -46,7 +39,29 @@ struct msurface_s *PM_TraceSurfacePmove( playermove_t *pmove, int ground, float
 const char *PM_TraceTexture( playermove_t *pmove, int ground, float *vstart, float *vend );
 int PM_PointContentsPmove( playermove_t *pmove, const float *p, int *truecontents );
 void PM_StuckTouch( playermove_t *pmove, int hitent, pmtrace_t *tr );
-void PM_ConvertTrace( trace_t *out, pmtrace_t *in, edict_t *ent );
+
+static inline void PM_ConvertTrace( trace_t *out, pmtrace_t *in, edict_t *ent )
+{
+	out->allsolid = in->allsolid;
+	out->startsolid = in->startsolid;
+	out->inopen = in->inopen;
+	out->inwater = in->inwater;
+	out->fraction = in->fraction;
+	out->plane.dist = in->plane.dist;
+	out->hitgroup = in->hitgroup;
+	out->ent = ent;
+
+	VectorCopy( in->endpos, out->endpos );
+	VectorCopy( in->plane.normal, out->plane.normal );
+}
+
+static inline void PM_ClearPhysEnts( playermove_t *pmove )
+{
+	pmove->nummoveent = 0;
+	pmove->numphysent = 0;
+	pmove->numvisent = 0;
+	pmove->numtouch = 0;
+}
 
 static inline void PM_InitTrace( trace_t *trace, const vec3_t end )
 {

engine/common/pm_trace.c

@@ -55,14 +55,6 @@ void Pmove_Init( void )
 	memcpy( host.player_maxs, pm_hullmaxs, sizeof( pm_hullmaxs ));
 }
 
-void PM_ClearPhysEnts( playermove_t *pmove )
-{
-	pmove->nummoveent = 0;
-	pmove->numphysent = 0;
-	pmove->numvisent = 0;
-	pmove->numtouch = 0;
-}
-
 /*
 ===================
 PM_InitBoxHull
@@ -117,21 +109,6 @@ static hull_t *PM_HullForBox( const vec3_t mins, const vec3_t maxs )
 	return &pm_boxhull;
 }
 
-void PM_ConvertTrace( trace_t *out, pmtrace_t *in, edict_t *ent )
-{
-	out->allsolid = in->allsolid;
-	out->startsolid = in->startsolid;
-	out->inopen = in->inopen;
-	out->inwater = in->inwater;
-	out->fraction = in->fraction;
-	out->plane.dist = in->plane.dist;
-	out->hitgroup = in->hitgroup;
-	out->ent = ent;
-
-	VectorCopy( in->endpos, out->endpos );
-	VectorCopy( in->plane.normal, out->plane.normal );
-}
-
 /*
 ==================
 PM_HullPointContents

engine/common/protocol.h

@@ -93,7 +93,7 @@ GNU General Public License for more details.
 #define clc_voicedata		8
 #define clc_requestcvarvalue		9
 #define clc_requestcvarvalue2		10
-#define clc_lastmsg			10	// end client messages
+#define clc_lastmsg			11	// end client messages (11 is GoldSrc message)
 
 #define MAX_VISIBLE_PACKET_BITS	11	// 2048 visible entities per frame (hl1 has 256)
 #define MAX_VISIBLE_PACKET		(1<<MAX_VISIBLE_PACKET_BITS)
@@ -277,11 +277,11 @@ GNU General Public License for more details.
 #define SU_ARMOR		(1<<13)
 #define SU_WEAPON		(1<<14)
 
-extern const char	*svc_strings[svc_lastmsg+1];
-extern const char	*svc_legacy_strings[svc_lastmsg+1];
-extern const char	*svc_quake_strings[svc_lastmsg+1];
-extern const char	*svc_goldsrc_strings[svc_lastmsg+1];
-extern const char	*clc_strings[clc_lastmsg+1];
+extern const char *const svc_strings[svc_lastmsg+1];
+extern const char *const svc_legacy_strings[svc_lastmsg+1];
+extern const char *const svc_quake_strings[svc_lastmsg+1];
+extern const char *const svc_goldsrc_strings[svc_lastmsg+1];
+extern const char *const clc_strings[clc_lastmsg+1];
 
 // FWGS extensions
 #define NET_EXT_SPLITSIZE (1U<<0) // set splitsize by cl_dlmax
@@ -341,13 +341,10 @@ extern const char	*clc_strings[clc_lastmsg+1];
 #define clc_goldsrc_hltv              clc_requestcvarvalue  // 9
 #define clc_goldsrc_requestcvarvalue  clc_requestcvarvalue2 // 10
 #define clc_goldsrc_requestcvarvalue2 11
-#define clc_goldsrc_lastmsg           12
-
-#define S2C_REJECT_BADPASSWORD '8'
-#define S2C_REJECT             '9'
-#define S2C_CHALLENGE          "A00000000"
-#define S2C_CONNECTION         "B"
+#define clc_goldsrc_lastmsg           11
 
+#define MAX_GOLDSRC_BACKUP_CMDS   8
+#define MAX_GOLDSRC_TOTAL_CMDS    16
 #define MAX_GOLDSRC_MODEL_BITS    10
 #define MAX_GOLDSRC_RESOURCE_BITS 12
 #define MAX_GOLDSRC_ENTITY_BITS   11
@@ -355,4 +352,55 @@ extern const char	*clc_strings[clc_lastmsg+1];
 #define MAX_GOLDSRC_EDICTS        ( BIT( MAX_ENTITY_BITS ) + ( MAX_CLIENTS * 15 ))
 #define LAST_GOLDSRC_EDICT        ( BIT( MAX_ENTITY_BITS ) - 1 )
 
+
+// from any to any (must be handled on both server and client)
+
+#define A2A_PING         "ping" // reply with A2A_ACK
+#define A2A_ACK          "ack" // no-op
+#define A2A_INFO         "info" // different format for client and server, see code
+#define A2A_NETINFO      "netinfo" // different format for client and server, see code
+#define A2A_GOLDSRC_PING "i" // reply with A2A_GOLDSRC_ACK
+#define A2A_GOLDSRC_ACK  "j" // no-op
+
+// from any to server
+#define A2S_GOLDSRC_INFO    "TSource Engine Query"
+#define A2S_GOLDSRC_RULES   'V'
+#define A2S_GOLDSRC_PLAYERS 'U'
+
+// from server to any
+#define S2A_GOLDSRC_INFO    'I'
+#define S2A_GOLDSRC_RULES   'E'
+#define S2A_GOLDSRC_PLAYERS 'D'
+
+// from master to server
+#define M2S_CHALLENGE     "s"
+#define M2S_NAT_CONNECT   "c"
+
+// from server to master
+#define S2M_INFO          "0\n"
+
+// from client to server
+#define C2S_BANDWIDTHTEST "bandwidth"
+#define C2S_GETCHALLENGE  "getchallenge"
+#define C2S_CONNECT       "connect"
+#define C2S_RCON          "rcon"
+
+// from server to client
+#define S2C_BANDWIDTHTEST              "testpacket"
+#define S2C_CHALLENGE                  "challenge"
+#define S2C_CONNECTION                 "client_connect"
+#define S2C_ERRORMSG                   "errormsg"
+#define S2C_REJECT                     "disconnect"
+#define S2C_GOLDSRC_REJECT_BADPASSWORD '8'
+#define S2C_GOLDSRC_REJECT             '9'
+#define S2C_GOLDSRC_CHALLENGE          "A00000000"
+#define S2C_GOLDSRC_CONNECTION         "B"
+
+// from any to client
+#define A2C_PRINT           "print"
+#define A2C_GOLDSRC_PRINT   'l'
+
+// from master to client
+#define M2A_SERVERSLIST "f"
+
 #endif//NET_PROTOCOL_H

engine/common/sounds.c

@@ -21,7 +21,7 @@ enum soundlst_type_e
 	SoundList_List
 };
 
-static const char *soundlst_groups[SoundList_Groups] =
+static const char *const soundlst_groups[SoundList_Groups] =
 {
 	"BouncePlayerShell",
 	"BounceWeaponShell",
@@ -46,7 +46,7 @@ typedef struct soundlst_s
 	int max; // the string count if type is group
 } soundlst_t;
 
-soundlst_t soundlst[SoundList_Groups];
+static soundlst_t soundlst[SoundList_Groups];
 
 static void SoundList_Print_f( void );
 static void SoundList_Free( soundlst_t *lst )

engine/common/tests.h

@@ -41,6 +41,7 @@ void Test_RunIPFilter( void );
 void Test_RunGamma( void );
 void Test_RunDelta( void );
 void Test_RunBuffer( void );
+void Test_RunMunge( void );
 
 #define TEST_LIST_0 \
 	Test_RunLibCommon(); \

engine/common/world.c

@@ -20,47 +20,6 @@ GNU General Public License for more details.
 #include "xash3d_mathlib.h"
 #include "studio.h"
 
-/*
-==================
-World_MoveBounds
-==================
-*/
-void World_MoveBounds( const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, vec3_t boxmins, vec3_t boxmaxs )
-{
-	int	i;
-
-	for( i = 0; i < 3; i++ )
-	{
-		if( end[i] > start[i] )
-		{
-			boxmins[i] = start[i] + mins[i] - 1.0f;
-			boxmaxs[i] = end[i] + maxs[i] + 1.0f;
-		}
-		else
-		{
-			boxmins[i] = end[i] + mins[i] - 1.0f;
-			boxmaxs[i] = start[i] + maxs[i] + 1.0f;
-		}
-	}
-}
-
-trace_t World_CombineTraces( trace_t *cliptrace, trace_t *trace, edict_t *touch )
-{
-	if( trace->allsolid || trace->startsolid || trace->fraction < cliptrace->fraction )
-	{
-		trace->ent = touch;
-
-		if( cliptrace->startsolid )
-		{
-			*cliptrace = *trace;
-			cliptrace->startsolid = true;
-		}
-		else *cliptrace = *trace;
-	}
-
-	return *cliptrace;
-}
-
 /*
 ==================
 World_TransformAABB
@@ -107,31 +66,3 @@ void World_TransformAABB( matrix4x4 transform, const vec3_t mins, const vec3_t m
 		}
 	}
 }
-
-/*
-==================
-RankForContents
-
-Used for determine contents priority
-==================
-*/
-int RankForContents( int contents )
-{
-	switch( contents )
-	{
-	case CONTENTS_EMPTY:	return 0;
-	case CONTENTS_WATER:	return 1;
-	case CONTENTS_TRANSLUCENT:	return 2;
-	case CONTENTS_CURRENT_0:	return 3;
-	case CONTENTS_CURRENT_90:	return 4;
-	case CONTENTS_CURRENT_180:	return 5;
-	case CONTENTS_CURRENT_270:	return 6;
-	case CONTENTS_CURRENT_UP:	return 7;
-	case CONTENTS_CURRENT_DOWN:	return 8;
-	case CONTENTS_SLIME:	return 9;
-	case CONTENTS_LAVA:		return 10;
-	case CONTENTS_SKY:		return 11;
-	case CONTENTS_SOLID:	return 12;
-	default:			return 13; // any user contents has more priority than default
-	}
-}

engine/common/world.h

@@ -36,10 +36,71 @@ ENTITY AREA CHECKING
 #include "lightstyle.h"
 
 // trace common
-void World_MoveBounds( const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, vec3_t boxmins, vec3_t boxmaxs );
+static inline void World_MoveBounds( const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, vec3_t boxmins, vec3_t boxmaxs )
+{
+	int	i;
+
+	for( i = 0; i < 3; i++ )
+	{
+		if( end[i] > start[i] )
+		{
+			boxmins[i] = start[i] + mins[i] - 1.0f;
+			boxmaxs[i] = end[i] + maxs[i] + 1.0f;
+		}
+		else
+		{
+			boxmins[i] = end[i] + mins[i] - 1.0f;
+			boxmaxs[i] = start[i] + maxs[i] + 1.0f;
+		}
+	}
+}
+
+static inline trace_t World_CombineTraces( trace_t *cliptrace, trace_t *trace, edict_t *touch )
+{
+	if( trace->allsolid || trace->startsolid || trace->fraction < cliptrace->fraction )
+	{
+		trace->ent = touch;
+
+		if( cliptrace->startsolid )
+		{
+			*cliptrace = *trace;
+			cliptrace->startsolid = true;
+		}
+		else *cliptrace = *trace;
+	}
+
+	return *cliptrace;
+}
+
+/*
+==================
+RankForContents
+
+Used for determine contents priority
+==================
+*/
+static inline int RankForContents( int contents )
+{
+	switch( contents )
+	{
+	case CONTENTS_EMPTY:	return 0;
+	case CONTENTS_WATER:	return 1;
+	case CONTENTS_TRANSLUCENT:	return 2;
+	case CONTENTS_CURRENT_0:	return 3;
+	case CONTENTS_CURRENT_90:	return 4;
+	case CONTENTS_CURRENT_180:	return 5;
+	case CONTENTS_CURRENT_270:	return 6;
+	case CONTENTS_CURRENT_UP:	return 7;
+	case CONTENTS_CURRENT_DOWN:	return 8;
+	case CONTENTS_SLIME:	return 9;
+	case CONTENTS_LAVA:		return 10;
+	case CONTENTS_SKY:		return 11;
+	case CONTENTS_SOLID:	return 12;
+	default:			return 13; // any user contents has more priority than default
+	}
+}
+
 void World_TransformAABB( matrix4x4 transform, const vec3_t mins, const vec3_t maxs, vec3_t outmins, vec3_t outmaxs );
-trace_t World_CombineTraces( trace_t *cliptrace, trace_t *trace, edict_t *touch );
-int RankForContents( int contents );
 
 #define check_angles( x )	( (int)x == 90 || (int)x == 180 || (int)x == 270 || (int)x == -90 || (int)x == -180 || (int)x == -270 )
 

engine/eiface.h

@@ -64,6 +64,7 @@ typedef enum
 	force_exactfile,			// File on client must exactly match server's file
 	force_model_samebounds,		// For model files only, the geometry must fit in the same bbox
 	force_model_specifybounds,		// For model files only, the geometry must fit in the specified bbox
+	force_model_specifybounds_if_avail,
 } FORCE_TYPE;
 
 // Returned by TraceLine

engine/menu_int.h

@@ -222,6 +222,10 @@ typedef struct ui_extendedfuncs_s {
 	// new mods info
 	gameinfo2_t *(*pfnGetGameInfo)( int gi_version ); // might return NULL if gi_version is unsupported
 	gameinfo2_t *(*pfnGetModInfo)( int gi_version, int mod_index ); // continiously call it until it returns null
+
+	// returns 1 if cvar has read-only flag
+	// or -1 if cvar not found
+	int (*pfnIsCvarReadOnly)( const char *name );
 } ui_extendedfuncs_t;
 
 // deprecated export from old engine

engine/platform/android/dlsym-weak.cpp

@@ -26,47 +26,56 @@
  * SUCH DAMAGE.
  */
 
-#if defined __ANDROID__ && !defined XASH_64BIT
+#include "build.h"
+#if XASH_ANDROID && !XASH_64BIT
 #include <string.h>
 #include <android/log.h>
 #include "linker.h"
 
-static Elf_Sym* soinfo_elf_lookup(soinfo* si, unsigned hash, const char* name) {
-    Elf_Sym* symtab = si->symtab;
-    const char* strtab = si->strtab;
+static Elf_Sym *soinfo_elf_lookup( const soinfo *si, unsigned hash, const char *name )
+{
+	const Elf_Sym *symtab = si->symtab;
+	const char    *strtab = si->strtab;
+	unsigned      n;
 
 	if( si->nbucket == 0 )
 		return NULL;
 
-    for (unsigned n = si->bucket[hash % si->nbucket]; n != 0; n = si->chain[n]) {
-        Elf_Sym* s = symtab + n;
-        if (strcmp(strtab + s->st_name, name)) continue;
+	for( n = si->bucket[hash % si->nbucket]; n != 0; n = si->chain[n] )
+	{
+		const Elf_Sym *s = symtab + n;
 
-            /* only concern ourselves with global and weak symbol definitions */
-        switch (ELF_ST_BIND(s->st_info)) {
-        case STB_GLOBAL:
-        case STB_WEAK:
-            if (s->st_shndx == SHN_UNDEF) {
-                continue;
-            }
-            return s;
-        }
-    }
+		if( strcmp( strtab + s->st_name, name ))
+			continue;
 
-    return NULL;
+		/* only concern ourselves with global and weak symbol definitions */
+		switch( ELF_ST_BIND( s->st_info ))
+		{
+		case STB_GLOBAL:
+		case STB_WEAK:
+			if( s->st_shndx == SHN_UNDEF )
+				continue;
+			return s;
+		}
+	}
+
+	return NULL;
 }
 
-static unsigned elfhash(const char* _name) {
-    const unsigned char* name = (const unsigned char*) _name;
-    unsigned h = 0, g;
+static unsigned elfhash( const unsigned char *name )
+{
+	unsigned h = 0;
 
-    while(*name) {
-        h = (h << 4) + *name++;
-        g = h & 0xf0000000;
-        h ^= g;
-        h ^= g >> 24;
-    }
-    return h;
+	while( *name )
+	{
+		unsigned g;
+
+		h = ( h << 4 ) + *name++;
+		g = h & 0xf0000000;
+		h ^= g;
+		h ^= g >> 24;
+	}
+	return h;
 }
 
 /* This is used by dlsym(3).  It performs symbol lookup only within the
@@ -78,21 +87,20 @@ static unsigned elfhash(const char* _name) {
    Binary Interface) where in Chapter 5 it discuss resolving "Shared
    Object Dependencies" in breadth first search order.
  */
-static Elf_Sym* dlsym_handle_lookup(soinfo* si, const char* name) {
-    return soinfo_elf_lookup(si, elfhash(name), name);
+static Elf_Sym *dlsym_handle_lookup( const soinfo *si, const char *name )
+{
+	return soinfo_elf_lookup( si, elfhash((const unsigned char *)name ), name );
 }
 
-extern "C" void* dlsym_weak(void* handle, const char* symbol) {
+extern "C" void *dlsym_weak( void *handle, const char *symbol )
+{
+	soinfo  *found = (soinfo *)handle;
+	Elf_Sym *sym = dlsym_handle_lookup( found, symbol );
 
-  soinfo* found = NULL;
-  Elf_Sym* sym = NULL;
-  found = reinterpret_cast<soinfo*>(handle);
-  sym = dlsym_handle_lookup(found, symbol);
+	if( sym != NULL )
+		return (void *)( sym->st_value + found->base /*load_bias*/ );
 
-  if (sym != NULL) {
-    return reinterpret_cast<void*>(sym->st_value + found->base/*load_bias*/);
-  }
-  __android_log_print(ANDROID_LOG_ERROR, "dlsym-weak", "Failed when looking up %s\n", symbol);
-  return NULL;
+	__android_log_print( ANDROID_LOG_ERROR, "dlsym-weak", "Failed when looking up %s\n", symbol );
+	return NULL;
 }
-#endif
+#endif // XASH_ANDROID && !XASH_64BIT

engine/platform/android/linker.h

@@ -28,7 +28,6 @@
 
 #ifndef _LINKER_H_
 #define _LINKER_H_
-#ifdef __ANDROID__
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -39,163 +38,153 @@
 
 // a1ba: we don't really need custom linker on Android 64, because
 // it's only intended to workaround bug which persist on Android < 4.4
-#define Elf_Ehdr	Elf32_Ehdr
-#define Elf_Phdr	Elf32_Phdr
-#define Elf_Shdr	Elf32_Shdr
-#define Elf_Sym		Elf32_Sym
-#define Elf_Rel		Elf32_Rel
-#define Elf_RelA	Elf32_Rela
-#define Elf_Dyn		Elf32_Dyn
-#define Elf_Half	Elf32_Half
-#define Elf_Word	Elf32_Word
-#define Elf_Sword	Elf32_Sword
-#define Elf_Addr	Elf32_Addr
-#define Elf_Off		Elf32_Off
-#define Elf_Nhdr	Elf32_Nhdr
-#define Elf_Note	Elf32_Note
+#define Elf_Ehdr  Elf32_Ehdr
+#define Elf_Phdr  Elf32_Phdr
+#define Elf_Shdr  Elf32_Shdr
+#define Elf_Sym   Elf32_Sym
+#define Elf_Rel   Elf32_Rel
+#define Elf_RelA  Elf32_Rela
+#define Elf_Dyn   Elf32_Dyn
+#define Elf_Half  Elf32_Half
+#define Elf_Word  Elf32_Word
+#define Elf_Sword Elf32_Sword
+#define Elf_Addr  Elf32_Addr
+#define Elf_Off   Elf32_Off
+#define Elf_Nhdr  Elf32_Nhdr
+#define Elf_Note  Elf32_Note
 
 // Returns the address of the page containing address 'x'.
-#define PAGE_START(x)  ((x) & PAGE_MASK)
+#define PAGE_START( x ) (( x )&PAGE_MASK )
 
 // Returns the offset of address 'x' in its page.
-#define PAGE_OFFSET(x) ((x) & ~PAGE_MASK)
+#define PAGE_OFFSET( x ) (( x ) & ~PAGE_MASK )
 
 // Returns the address of the next page after address 'x', unless 'x' is
 // itself at the start of a page.
-#define PAGE_END(x)    PAGE_START((x) + (PAGE_SIZE-1))
+#define PAGE_END( x ) PAGE_START(( x ) + ( PAGE_SIZE - 1 ))
 
 // Magic shared structures that GDB knows about.
 
 struct link_map_t {
-  uintptr_t l_addr;
-  char*  l_name;
-  uintptr_t l_ld;
-  link_map_t* l_next;
-  link_map_t* l_prev;
+	uintptr_t  l_addr;
+	char       *l_name;
+	uintptr_t  l_ld;
+	link_map_t *l_next;
+	link_map_t *l_prev;
 };
 
 // Values for r_debug->state
 enum {
-  RT_CONSISTENT,
-  RT_ADD,
-  RT_DELETE
+	RT_CONSISTENT,
+	RT_ADD,
+	RT_DELETE
 };
-#if 0
-struct r_debug {
-  int32_t r_version;
-  link_map_t* r_map;
-  void (*r_brk)(void);
-  int32_t r_state;
-  uintptr_t r_ldbase;
-};
-#endif
-#define FLAG_LINKED     0x00000001
-#define FLAG_EXE        0x00000004 // The main executable
-#define FLAG_LINKER     0x00000010 // The linker itself
+#define FLAG_LINKED 0x00000001
+#define FLAG_EXE    0x00000004     // The main executable
+#define FLAG_LINKER 0x00000010     // The linker itself
 
 #define SOINFO_NAME_LEN 128
 
 typedef void (*linker_function_t)();
 
 // Android uses REL for 32-bit but only uses RELA for 64-bit.
-#if defined(__LP64__)
+#if defined( __LP64__ )
 #define USE_RELA 1
 #endif
 
 struct soinfo {
- public:
-  char name[SOINFO_NAME_LEN];
-  const Elf_Phdr* phdr;
-  size_t phnum;
-  Elf_Addr entry;
-  Elf_Addr base;
-  unsigned size;
+public:
+	char           name[SOINFO_NAME_LEN];
+	const Elf_Phdr *phdr;
+	size_t         phnum;
+	Elf_Addr       entry;
+	Elf_Addr       base;
+	unsigned       size;
 
 #ifndef __LP64__
-  uint32_t unused1;  // DO NOT USE, maintained for compatibility.
+	uint32_t       unused1; // DO NOT USE, maintained for compatibility.
 #endif
 
-  Elf_Dyn* dynamic;
+	Elf_Dyn        *dynamic;
 
 #ifndef __LP64__
-  uint32_t unused2; // DO NOT USE, maintained for compatibility
-  uint32_t unused3; // DO NOT USE, maintained for compatibility
+	uint32_t       unused2; // DO NOT USE, maintained for compatibility
+	uint32_t       unused3; // DO NOT USE, maintained for compatibility
 #endif
 
-  soinfo* next;
-  unsigned flags;
+	soinfo         *next;
+	unsigned       flags;
 
-  const char* strtab;
-  Elf_Sym* symtab;
+	const char     *strtab;
+	Elf_Sym        *symtab;
 
-  size_t nbucket;
-  size_t nchain;
-  unsigned* bucket;
-  unsigned* chain;
+	size_t         nbucket;
+	size_t         nchain;
+	unsigned       *bucket;
+	unsigned       *chain;
 
-#if !defined(__LP64__)
-  // This is only used by 32-bit MIPS, but needs to be here for
-  // all 32-bit architectures to preserve binary compatibility.
-  unsigned* plt_got;
+#if !defined( __LP64__ )
+	// This is only used by 32-bit MIPS, but needs to be here for
+	// all 32-bit architectures to preserve binary compatibility.
+	unsigned *plt_got;
 #endif
 
-#if defined(USE_RELA)
-  Elf_RelA* plt_rela;
-  size_t plt_rela_count;
+#if defined( USE_RELA )
+	Elf_RelA          *plt_rela;
+	size_t            plt_rela_count;
 
-  Elf_RelA* rela;
-  size_t rela_count;
+	Elf_RelA          *rela;
+	size_t            rela_count;
 #else
-  Elf_Rel* plt_rel;
-  size_t plt_rel_count;
+	Elf_Rel           *plt_rel;
+	size_t            plt_rel_count;
 
-  Elf_Rel* rel;
-  size_t rel_count;
+	Elf_Rel           *rel;
+	size_t            rel_count;
 #endif
 
-  linker_function_t* preinit_array;
-  size_t preinit_array_count;
+	linker_function_t *preinit_array;
+	size_t            preinit_array_count;
 
-  linker_function_t* init_array;
-  size_t init_array_count;
-  linker_function_t* fini_array;
-  size_t fini_array_count;
+	linker_function_t *init_array;
+	size_t            init_array_count;
+	linker_function_t *fini_array;
+	size_t            fini_array_count;
 
-  linker_function_t init_func;
-  linker_function_t fini_func;
+	linker_function_t init_func;
+	linker_function_t fini_func;
 
-#if defined(__arm__)
-  // ARM EABI section used for stack unwinding.
-  unsigned* ARM_exidx;
-  size_t ARM_exidx_count;
-#elif defined(__mips__)
-  unsigned mips_symtabno;
-  unsigned mips_local_gotno;
-  unsigned mips_gotsym;
+#if defined( __arm__ )
+	// ARM EABI section used for stack unwinding.
+	unsigned   *ARM_exidx;
+	size_t     ARM_exidx_count;
+#elif defined( __mips__ )
+	unsigned   mips_symtabno;
+	unsigned   mips_local_gotno;
+	unsigned   mips_gotsym;
 #endif
 
-  size_t ref_count;
-  link_map_t link_map;
+	size_t     ref_count;
+	link_map_t link_map;
 
-  bool constructors_called;
+	bool       constructors_called;
 
-  // When you read a virtual address from the ELF file, add this
-  // value to get the corresponding address in the process' address space.
-  Elf_Addr load_bias;
+	// When you read a virtual address from the ELF file, add this
+	// value to get the corresponding address in the process' address space.
+	Elf_Addr load_bias;
 
-#if !defined(__LP64__)
-  bool has_text_relocations;
+#if !defined( __LP64__ )
+	bool     has_text_relocations;
 #endif
-  bool has_DT_SYMBOLIC;
+	bool     has_DT_SYMBOLIC;
 
-  void CallConstructors();
-  void CallDestructors();
-  void CallPreInitConstructors();
+	void CallConstructors();
+	void CallDestructors();
+	void CallPreInitConstructors();
 
- private:
-  void CallArray(const char* array_name, linker_function_t* functions, size_t count, bool reverse);
-  void CallFunction(const char* function_name, linker_function_t function);
+private:
+	void CallArray( const char *array_name, linker_function_t *functions, size_t count, bool reverse );
+	void CallFunction( const char *function_name, linker_function_t function );
 };
 
 #endif
-#endif

engine/platform/platform.h

@@ -51,6 +51,7 @@ void IOS_LaunchDialog( void );
 
 #if XASH_POSIX
 void Posix_Daemonize( void );
+void Posix_SetupSigtermHandling( void );
 #endif
 
 #if XASH_SDL
@@ -156,6 +157,13 @@ static inline qboolean Sys_DebuggerPresent( void )
 #endif
 }
 
+static inline void Platform_SetupSigtermHandling( void )
+{
+#if XASH_POSIX
+	Posix_SetupSigtermHandling( );
+#endif
+}
+
 /*
 ==============================================================================
 

engine/platform/posix/sys_posix.c

@@ -18,6 +18,7 @@ GNU General Public License for more details.
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <signal.h>
 #include "platform/platform.h"
 #include "menu_int.h"
 
@@ -145,6 +146,21 @@ void Posix_Daemonize( void )
 
 }
 
+static void Posix_SigtermCallback( int signal )
+{
+	Sys_Quit();
+}
+
+void Posix_SetupSigtermHandling( void )
+{
+#if !XASH_PSVITA 
+	struct sigaction act = { 0 };
+	act.sa_handler = Posix_SigtermCallback;
+	act.sa_flags = 0;
+	sigaction( SIGTERM, &act, NULL );
+#endif
+}
+
 #if XASH_TIMER == TIMER_POSIX
 double Platform_DoubleTime( void )
 {

engine/platform/sdl/vid_sdl.c

@@ -674,7 +674,7 @@ static void VID_SetWindowIcon( SDL_Window *hWnd )
 		if( ico && WIN_SetWindowIcon( ico ))
 			return;
 	}
-#endif // _WIN32 && !XASH_64BIT
+#endif // XASH_WIN32
 
 	Q_strncpy( iconpath, GI->iconpath, sizeof( iconpath ));
 	COM_ReplaceExtension( iconpath, ".tga", sizeof( iconpath ));

engine/ref_api.h

@@ -61,8 +61,6 @@ GNU General Public License for more details.
 #define FCONTEXT_CORE_PROFILE		BIT( 0 )
 #define FCONTEXT_DEBUG_ARB		BIT( 1 )
 
-#define FCVAR_READ_ONLY		(1<<17)	// cannot be set by user at all, and can't be requested by CvarGetPointer from game dlls
-
 // screenshot types
 #define VID_SCREENSHOT	0
 #define VID_LEVELSHOT	1

engine/server/server.h

@@ -683,6 +683,6 @@ int SV_LightForEntity( edict_t *pEdict );
 //
 // sv_query.c
 //
-qboolean SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from );
+void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from );
 
 #endif//SERVER_H

engine/server/sv_client.c

@@ -19,7 +19,7 @@ GNU General Public License for more details.
 #include "net_encode.h"
 #include "net_api.h"
 
-const char *clc_strings[clc_lastmsg+1] =
+const char *const clc_strings[clc_lastmsg+1] =
 {
 	"clc_bad",
 	"clc_nop",
@@ -27,11 +27,12 @@ const char *clc_strings[clc_lastmsg+1] =
 	"clc_stringcmd",
 	"clc_delta",
 	"clc_resourcelist",
-	"clc_unused6",
+	"clc_legacy_userinfo",
 	"clc_fileconsistency",
 	"clc_voicedata",
-	"clc_cvarvalue",
-	"clc_cvarvalue2",
+	"clc_cvarvalue/clc_goldsrc_hltv",
+	"clc_cvarvalue2/clc_goldsrc_requestcvarvalue",
+	"clc_goldsrc_requestcvarvalue2",
 };
 
 typedef struct ucmd_s
@@ -130,7 +131,7 @@ static void SV_GetChallenge( netadr_t from )
 	}
 
 	// send it back
-	Netchan_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "challenge %i", svs.challenges[i].challenge );
+	Netchan_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, S2C_CHALLENGE" %i", svs.challenges[i].challenge );
 }
 
 static int SV_GetFragmentSize( void *pcl, fragsize_t mode )
@@ -193,9 +194,9 @@ void SV_RejectConnection( netadr_t from, const char *fmt, ... )
 	va_end( argptr );
 
 	Con_Reportf( "%s connection refused. Reason: %s\n", NET_AdrToString( from ), text );
-	Netchan_OutOfBandPrint( NS_SERVER, from, "errormsg\n^1Server was reject the connection:^7 %s", text );
-	Netchan_OutOfBandPrint( NS_SERVER, from, "print\n^1Server was reject the connection:^7 %s", text );
-	Netchan_OutOfBandPrint( NS_SERVER, from, "disconnect\n" );
+	Netchan_OutOfBandPrint( NS_SERVER, from, S2C_ERRORMSG"\n^1Server was reject the connection:^7 %s", text );
+	Netchan_OutOfBandPrint( NS_SERVER, from, A2C_PRINT"\n^1Server was reject the connection:^7 %s", text );
+	Netchan_OutOfBandPrint( NS_SERVER, from, S2C_REJECT"\n" );
 }
 
 /*
@@ -455,7 +456,7 @@ static void SV_ConnectClient( netadr_t from )
 	Info_SetValueForKeyf( protinfo, "ext", sizeof( protinfo ), "%d", newcl->extensions );
 
 	// send the connect packet to the client
-	Netchan_OutOfBandPrint( NS_SERVER, from, "client_connect %s", protinfo );
+	Netchan_OutOfBandPrint( NS_SERVER, from, S2C_CONNECTION" %s", protinfo );
 
 	newcl->upstate = us_inactive;
 	newcl->connection_started = host.realtime;
@@ -603,7 +604,7 @@ void SV_KickPlayer( sv_client_t *cl, const char *fmt, ... )
 		SV_BroadcastPrintf( cl, "%s was kicked with message: \"%s\"\n", cl->name, buf );
 		SV_ClientPrintf( cl, "You were kicked from the game with message: \"%s\"\n", buf );
 		if( cl->useragent[0] )
-			Netchan_OutOfBandPrint( NS_SERVER, cl->netchan.remote_address, "errormsg\nKicked with message:\n%s\n", buf );
+			Netchan_OutOfBandPrint( NS_SERVER, cl->netchan.remote_address, S2C_ERRORMSG"\nKicked with message:\n%s\n", buf );
 	}
 	else
 	{
@@ -611,7 +612,7 @@ void SV_KickPlayer( sv_client_t *cl, const char *fmt, ... )
 		SV_BroadcastPrintf( cl, "%s was kicked\n", cl->name );
 		SV_ClientPrintf( cl, "You were kicked from the game\n" );
 		if( cl->useragent[0] )
-			Netchan_OutOfBandPrint( NS_SERVER, cl->netchan.remote_address, "errormsg\nYou were kicked from the game\n" );
+			Netchan_OutOfBandPrint( NS_SERVER, cl->netchan.remote_address, S2C_ERRORMSG"\nYou were kicked from the game\n" );
 	}
 
 	SV_DropClient( cl, false );
@@ -713,20 +714,18 @@ static void SV_BeginRedirect( host_redirect_t *rd, netadr_t adr, rdtype_t target
 
 static void SV_FlushRedirect( netadr_t adr, int dest, char *buf )
 {
-	if( sv.current_client && FBitSet( sv.current_client->flags, FCL_FAKECLIENT ))
-		return;
-
 	switch( dest )
 	{
 	case RD_PACKET:
-		Netchan_OutOfBandPrint( NS_SERVER, adr, "print\n%s", buf );
+		Netchan_OutOfBandPrint( NS_SERVER, adr, A2C_PRINT"\n%s", buf );
 		break;
 	case RD_CLIENT:
-		if( !sv.current_client ) return; // client not set
+		if( !sv.current_client || !FBitSet( sv.current_client->flags, FCL_FAKECLIENT ))
+			return; // client not set
 		MSG_BeginServerCmd( &sv.current_client->netchan.message, svc_print );
 		MSG_WriteString( &sv.current_client->netchan.message, buf );
 		break;
-	case RD_NONE:
+	default:
 		Con_Printf( S_ERROR "%s: %s: invalid destination\n", __func__, NET_AdrToString( adr ));
 		break;
 	}
@@ -952,14 +951,30 @@ static void SV_Info( netadr_t from, int protocolVersion )
 		if( remaining < 0 )
 		{
 			// should never happen?
-			Con_Printf( S_ERROR "SV_Info: infostring overflow!\n" );
+			Con_Printf( S_ERROR "%s: infostring overflow!\n", __func__ );
 			return;
 		}
 		Q_strncpy( temp, hostname.string, remaining );
 		Info_SetValueForKey( s, "host", temp, sizeof( s ));
 	}
 
-	Netchan_OutOfBandPrint( NS_SERVER, from, "info\n%s", s );
+	Netchan_OutOfBandPrint( NS_SERVER, from, A2A_INFO"\n%s", s );
+}
+
+static void SV_ConnectNatClient( netadr_t from )
+{
+	netadr_t to;
+
+	if( !sv_nat.value || !NET_IsMasterAdr( from ))
+		return;
+
+	if( !NET_StringToAdr( Cmd_Argv( 1 ), &to ))
+		return;
+
+	if( NET_IsReservedAdr( to ))
+		return;
+
+	SV_Info( to, PROTOCOL_VERSION );
 }
 
 /*
@@ -993,7 +1008,7 @@ static void SV_BuildNetAnswer( netadr_t from )
 	{
 		// send error unsupported protocol
 		Info_SetValueForKey( string, "neterror", "protocol", sizeof( string ));
-		Netchan_OutOfBandPrint( NS_SERVER, from, "netinfo %i %i %s\n", context, type, string );
+		Netchan_OutOfBandPrint( NS_SERVER, from, A2A_NETINFO" %i %i %s\n", context, type, string );
 		return;
 	}
 
@@ -1064,19 +1079,7 @@ static void SV_BuildNetAnswer( netadr_t from )
 		break;
 	}
 
-	Netchan_OutOfBandPrint( NS_SERVER, from, "netinfo %i %i %s\n", context, type, string );
-}
-
-/*
-================
-SV_Ping
-
-Just responds with an acknowledgement
-================
-*/
-static void SV_Ping( netadr_t from )
-{
-	Netchan_OutOfBandPrint( NS_SERVER, from, "ack" );
+	Netchan_OutOfBandPrint( NS_SERVER, from, A2A_NETINFO" %i %i %s\n", context, type, string );
 }
 
 /*
@@ -1104,10 +1107,7 @@ Redirect all printfs
 */
 void SV_RemoteCommand( netadr_t from, sizebuf_t *msg )
 {
-	static char	outputbuf[2048];
 	const char	*adr;
-	char		remaining[1024];
-	char		*p = remaining;
 	int		i;
 
 	if( !rcon_enable.value || !COM_CheckStringEmpty( rcon_password.string ))
@@ -1120,7 +1120,9 @@ void SV_RemoteCommand( netadr_t from, sizebuf_t *msg )
 
 	if( Rcon_Validate( ))
 	{
-		SV_BeginRedirect( &host.rd, from, RD_PACKET, outputbuf, sizeof( outputbuf ) - 16, SV_FlushRedirect );
+		static char	outputbuf[2048];
+		char remaining[1024];
+		char *p = remaining;
 
 		remaining[0] = 0;
 		for( i = 2; i < Cmd_Argc(); i++ )
@@ -1129,8 +1131,9 @@ void SV_RemoteCommand( netadr_t from, sizebuf_t *msg )
 			p += Q_strncpy( p, Cmd_Argv( i ), sizeof( remaining ) - ( p - remaining ));
 			p += Q_strncpy( p, "\" ", sizeof( remaining ) - ( p - remaining ));
 		}
-		Cmd_ExecuteString( remaining );
 
+		SV_BeginRedirect( &host.rd, from, RD_PACKET, outputbuf, sizeof( outputbuf ) - 16, SV_FlushRedirect );
+		Cmd_ExecuteString( remaining );
 		SV_EndRedirect( &host.rd );
 	}
 	else Con_Printf( S_ERROR "Bad rcon_password.\n" );
@@ -1342,9 +1345,8 @@ otherwise see code SV_UpdateMovevars()
 */
 void SV_FullUpdateMovevars( sv_client_t *cl, sizebuf_t *msg )
 {
-	movevars_t	nullmovevars;
+	const movevars_t nullmovevars = { 0 };
 
-	memset( &nullmovevars, 0, sizeof( nullmovevars ));
 	MSG_WriteDeltaMovevars( msg, &nullmovevars, &svgame.movevars );
 }
 
@@ -1992,7 +1994,7 @@ static qboolean SV_Noclip_f( sv_client_t *cl )
 {
 	edict_t	*pEntity = cl->edict;
 
-	if( !Cvar_VariableInteger( "sv_cheats" ) || sv.background )
+	if( sv.background || !Cvar_VariableInteger( "sv_cheats" ))
 		return true;
 
 	if( pEntity->v.movetype != MOVETYPE_NOCLIP )
@@ -2018,7 +2020,7 @@ static qboolean SV_Godmode_f( sv_client_t *cl )
 {
 	edict_t	*pEntity = cl->edict;
 
-	if( !Cvar_VariableInteger( "sv_cheats" ) || sv.background )
+	if( sv.background || !Cvar_VariableInteger( "sv_cheats" ))
 		return true;
 
 	pEntity->v.flags = pEntity->v.flags ^ FL_GODMODE;
@@ -2039,7 +2041,7 @@ static qboolean SV_Notarget_f( sv_client_t *cl )
 {
 	edict_t	*pEntity = cl->edict;
 
-	if( !Cvar_VariableInteger( "sv_cheats" ) || sv.background )
+	if( sv.background || !Cvar_VariableInteger( "sv_cheats" ))
 		return true;
 
 	pEntity->v.flags = pEntity->v.flags ^ FL_NOTARGET;
@@ -3036,7 +3038,7 @@ static qboolean SV_EntGetVars_f( sv_client_t *cl )
 	return true;
 }
 
-ucmd_t ucmds[] =
+static const ucmd_t ucmds[] =
 {
 { "new", SV_New_f },
 { "god", SV_Godmode_f },
@@ -3056,7 +3058,7 @@ ucmd_t ucmds[] =
 { NULL, NULL }
 };
 
-ucmd_t enttoolscmds[] =
+static const ucmd_t enttoolscmds[] =
 {
 { "ent_list", SV_EntList_f },
 { "ent_info", SV_EntInfo_f },
@@ -3073,7 +3075,7 @@ SV_ExecuteUserCommand
 */
 static void SV_ExecuteClientCommand( sv_client_t *cl, const char *s )
 {
-	ucmd_t	*u;
+	const ucmd_t	*u;
 
 	Cmd_TokenizeString( s );
 
@@ -3148,17 +3150,14 @@ connectionless packets.
 */
 void SV_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 {
-	char	*args;
-	const char	*pcmd;
-	char buf[MAX_SYSPATH];
-	int	len = sizeof( buf );
+	const char *pcmd, *args;
 
 	// prevent flooding from banned address
-	if( SV_CheckIP( &from ) )
+	if( SV_CheckIP( &from ))
 		return;
 
 	MSG_Clear( msg );
-	MSG_ReadLong( msg );// skip the -1 marker
+	MSG_SeekToBit( msg, sizeof( uint32_t ) << 3, SEEK_CUR ); // skip the -1 marker
 
 	args = MSG_ReadStringLine( msg );
 	Cmd_TokenizeString( args );
@@ -3168,29 +3167,79 @@ void SV_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 	if( sv_log_outofband.value )
 		Con_Reportf( "%s: %s : %s\n", __func__, NET_AdrToString( from ), pcmd );
 
-	if( !Q_strcmp( pcmd, "ping" )) SV_Ping( from );
-	else if( !Q_strcmp( pcmd, "ack" )) SV_Ack( from );
-	else if( !Q_strcmp( pcmd, "info" )) SV_Info( from, Q_atoi( Cmd_Argv( 1 )));
-	else if( !Q_strcmp( pcmd, "bandwidth" )) SV_TestBandWidth( from );
-	else if( !Q_strcmp( pcmd, "getchallenge" )) SV_GetChallenge( from );
-	else if( !Q_strcmp( pcmd, "connect" )) SV_ConnectClient( from );
-	else if( !Q_strcmp( pcmd, "rcon" )) SV_RemoteCommand( from, msg );
-	else if( !Q_strcmp( pcmd, "netinfo" )) SV_BuildNetAnswer( from );
-	else if( !Q_strcmp( pcmd, "s" )) SV_AddToMaster( from, msg );
-	else if( !Q_strcmp( pcmd, "i" )) NET_SendPacket( NS_SERVER, 5, "\xFF\xFF\xFF\xFFj", from ); // A2A_PING
-	else if( SV_SourceQuery_HandleConnnectionlessPacket( pcmd, from )) { } // function handles replies
-	else if( !Q_strcmp( pcmd, "c" ) && sv_nat.value && NET_IsMasterAdr( from ))
+	if( !svs.initialized )
 	{
-		netadr_t to;
-		if( NET_StringToAdr( Cmd_Argv( 1 ), &to ) && !NET_IsReservedAdr( to ))
-			SV_Info( to, PROTOCOL_VERSION );
+		// only process rcon if server not initialized
+		if( !Q_strcmp( pcmd, C2S_RCON ))
+			SV_RemoteCommand( net_from, &net_message );
+
+		return;
 	}
-	else if( svgame.dllFuncs.pfnConnectionlessPacket( &from, args, buf, &len ))
+
+	if( !Q_strcmp( pcmd, A2S_GOLDSRC_INFO ) || pcmd[0] == A2S_GOLDSRC_PLAYERS || pcmd[0] == A2S_GOLDSRC_RULES )
 	{
-		// user out of band message (must be handled in CL_ConnectionlessPacket)
-		if( len > 0 ) Netchan_OutOfBand( NS_SERVER, from, len, (byte*)buf );
+		SV_SourceQuery_HandleConnnectionlessPacket( pcmd, from );
+	}
+	else if( !Q_strcmp( pcmd, A2A_NETINFO ))
+	{
+		SV_BuildNetAnswer( from );
+	}
+	else if( !Q_strcmp( pcmd, A2A_INFO ))
+	{
+		SV_Info( from, Q_atoi( Cmd_Argv( 1 )));
+	}
+	else if( !Q_strcmp( pcmd, M2S_CHALLENGE ))
+	{
+		SV_AddToMaster( from, msg );
+	}
+	else if( !Q_strcmp( pcmd, M2S_NAT_CONNECT ))
+	{
+		SV_ConnectNatClient( from );
+	}
+	else if( !Q_strcmp( pcmd, C2S_BANDWIDTHTEST ))
+	{
+		SV_TestBandWidth( from );
+	}
+	else if( !Q_strcmp( pcmd, C2S_GETCHALLENGE ))
+	{
+		SV_GetChallenge( from );
+	}
+	else if( !Q_strcmp( pcmd, C2S_CONNECT ))
+	{
+		SV_ConnectClient( from );
+	}
+	else if( !Q_strcmp( pcmd, A2A_PING ))
+	{
+		Netchan_OutOfBandPrint( NS_SERVER, from, A2A_ACK );
+	}
+	else if( !Q_strcmp( pcmd, A2A_GOLDSRC_PING ))
+	{
+		Netchan_OutOfBandPrint( NS_SERVER, from, A2A_GOLDSRC_ACK );
+	}
+	else if( !Q_strcmp( pcmd, C2S_RCON ))
+	{
+		SV_RemoteCommand( from, msg );
+	}
+	else if( !Q_strcmp( pcmd, A2A_ACK ) || !Q_strcmp( pcmd, A2A_GOLDSRC_ACK ))
+	{
+		SV_Ack( from );
+	}
+	else
+	{
+		char buf[MAX_SYSPATH];
+		int	len = sizeof( buf );
+
+		if( svgame.dllFuncs.pfnConnectionlessPacket( &from, args, buf, &len ))
+		{
+			// user out of band message (must be handled in CL_ConnectionlessPacket)
+			if( len > 0 )
+				Netchan_OutOfBand( NS_SERVER, from, len, (byte*)buf );
+		}
+		else
+		{
+			Con_DPrintf( S_ERROR "bad connectionless packet from %s:\n%s\n", NET_AdrToString( from ), args );
+		}
 	}
-	else Con_DPrintf( S_ERROR "bad connectionless packet from %s:\n%s\n", NET_AdrToString( from ), args );
 }
 
 /*

engine/server/sv_cmds.c

@@ -16,8 +16,6 @@ GNU General Public License for more details.
 #include "common.h"
 #include "server.h"
 
-extern convar_t	con_gamemaps;
-
 /*
 =================
 SV_ClientPrintf

engine/server/sv_frame.c

@@ -25,8 +25,8 @@ typedef struct
 	byte		sended[MAX_EDICTS_BYTES];
 } sv_ents_t;
 
-int	c_fullsend;	// just a debug counter
-int	c_notsend;
+static int	c_fullsend;	// just a debug counter
+static int	c_notsend;
 
 /*
 =======================

engine/server/sv_game.c

@@ -24,8 +24,6 @@ GNU General Public License for more details.
 #include "render_api.h"	// modelstate_t
 #include "ref_common.h" // decals
 
-#define ENTVARS_COUNT	ARRAYSIZE( gEntvarsDescription )
-
 // GameAPI functions declarations
 static int GAME_EXPORT pfnModelIndex( const char *m );
 
@@ -83,7 +81,7 @@ EntvarsDescription
 entavrs table for FindEntityByString
 =============
 */
-static TYPEDESCRIPTION gEntvarsDescription[] =
+static const TYPEDESCRIPTION gEntvarsDescription[] =
 {
 	DEFINE_ENTITY_FIELD( classname, FIELD_STRING ),
 	DEFINE_ENTITY_FIELD( globalname, FIELD_STRING ),
@@ -100,20 +98,6 @@ static TYPEDESCRIPTION gEntvarsDescription[] =
 	DEFINE_ENTITY_FIELD( noise3, FIELD_SOUNDNAME ),
 };
 
-/*
-=============
-SV_GetEntvarsDescription
-
-entavrs table for FindEntityByString
-=============
-*/
-static TYPEDESCRIPTION *SV_GetEntvarsDescirption( int number )
-{
-	if( number < 0 || number >= ENTVARS_COUNT )
-		return NULL;
-	return &gEntvarsDescription[number];
-}
-
 /*
 =============
 SV_SysError
@@ -1506,8 +1490,8 @@ SV_FindEntityByString
 */
 static edict_t *GAME_EXPORT SV_FindEntityByString( edict_t *pStartEdict, const char *pszField, const char *pszValue )
 {
-	int		index = 0, e = 0;
-	TYPEDESCRIPTION	*desc = NULL;
+	int		i = 0, e = 0;
+	const TYPEDESCRIPTION	*desc = NULL;
 	edict_t		*ed;
 	const char	*t;
 
@@ -1516,10 +1500,13 @@ static edict_t *GAME_EXPORT SV_FindEntityByString( edict_t *pStartEdict, const c
 
 	if( pStartEdict ) e = NUM_FOR_EDICT( pStartEdict );
 
-	while(( desc = SV_GetEntvarsDescirption( index++ )) != NULL )
+	for( i = 0; i < ARRAYSIZE( gEntvarsDescription ); i++ )
 	{
-		if( !Q_strcmp( pszField, desc->fieldName ))
+		if( !Q_strcmp( pszField, gEntvarsDescription[i].fieldName ))
+		{
+			desc = &gEntvarsDescription[i];
 			break;
+		}
 	}
 
 	if( desc == NULL )
@@ -2998,24 +2985,22 @@ static void *GAME_EXPORT pfnPvEntPrivateData( edict_t *pEdict )
 }
 
 
-#ifdef XASH_64BIT
 static struct str64_s
 {
 	size_t maxstringarray;
 	qboolean allowdup;
+	qboolean dynamic;
 	char *staticstringarray;
 	char *pstringarray;
 	char *pstringarraystatic;
 	char *pstringbase;
 	char *poldstringbase;
 	char *plast;
-	qboolean dynamic;
 	size_t maxalloc;
 	size_t numdups;
 	size_t numoverflows;
 	size_t totalalloc;
 } str64;
-#endif
 
 /*
 ==================
@@ -3026,7 +3011,7 @@ Free strings on server stop. Reset string pointer on 64 bits
 */
 void SV_EmptyStringPool( void )
 {
-#ifdef XASH_64BIT
+#if XASH_64BIT
 	if( str64.dynamic ) // switch only after array fill (more space for multiplayer games)
 		str64.pstringbase = str64.pstringarray;
 	else
@@ -3034,9 +3019,9 @@ void SV_EmptyStringPool( void )
 		str64.pstringbase = str64.poldstringbase = str64.pstringarraystatic;
 		str64.plast = str64.pstringbase + 1;
 	}
-#else
+#else // !XASH_64BIT
 	Mem_EmptyPool( svgame.stringspool );
-#endif
+#endif // !XASH_64BIT
 }
 
 /*
@@ -3050,7 +3035,7 @@ this helps not to lose strings that belongs to static game part
 */
 void SV_SetStringArrayMode( qboolean dynamic )
 {
-#ifdef XASH_64BIT
+#if XASH_64BIT
 	Con_Reportf( "%s(%d) %d\n", __func__, dynamic, str64.dynamic );
 
 	if( dynamic == str64.dynamic )
@@ -3059,11 +3044,11 @@ void SV_SetStringArrayMode( qboolean dynamic )
 	str64.dynamic = dynamic;
 
 	SV_EmptyStringPool();
-#endif
+#endif // !XASH_64BIT
 }
 
 #if XASH_AMD64 && XASH_LINUX && !XASH_ANDROID
-#define USE_MMAP
+#define USE_MMAP 1
 #include <sys/mman.h>
 #endif
 
@@ -3079,7 +3064,7 @@ this case need patched game dll with MAKE_STRING checking ptrdiff size
 */
 static void SV_AllocStringPool( void )
 {
-#ifdef XASH_64BIT
+#if XASH_64BIT
 	void *ptr = NULL;
 	string lenstr;
 
@@ -3094,7 +3079,7 @@ static void SV_AllocStringPool( void )
 	if( Sys_CheckParm( "-str64dup" ) )
 		str64.allowdup = true;
 
-#ifdef USE_MMAP
+#if USE_MMAP
 	{
 		uint flags;
 		size_t pagesize = sysconf( _SC_PAGESIZE );
@@ -3148,35 +3133,37 @@ static void SV_AllocStringPool( void )
 			ptr = str64.staticstringarray = Mem_Calloc( host.mempool, str64.maxstringarray * 2 );
 		}
 	}
-#else
+#else // !USE_MMAP
 	ptr = str64.staticstringarray = Mem_Calloc( host.mempool, str64.maxstringarray * 2 );
-#endif
+#endif // !USE_MMAP
 
 	str64.pstringarray = ptr;
 	str64.pstringarraystatic = (byte*)ptr + str64.maxstringarray;
 	str64.pstringbase = str64.poldstringbase = ptr;
 	str64.plast = (byte*)ptr + 1;
 	svgame.globals->pStringBase = ptr;
-#else
+#else // !XASH_64BIT
 	svgame.stringspool = Mem_AllocPool( "Server Strings" );
 	svgame.globals->pStringBase = "";
-#endif
+#endif // !XASH_64BIT
 }
 
 static void SV_FreeStringPool( void )
 {
-#ifdef XASH_64BIT
+#if XASH_64BIT
 	Con_Reportf( "%s()\n", __func__ );
 
-#ifdef USE_MMAP
+#if USE_MMAP
 	if( str64.pstringarray != str64.staticstringarray )
 		munmap( str64.pstringarray, (str64.maxstringarray * 2) & ~(sysconf( _SC_PAGESIZE ) - 1) );
 	else
-#endif
+#endif // USE_MMAP
+	{
 		Mem_Free( str64.staticstringarray );
-#else
+	}
+#else // !XASH_64BIT
 	Mem_FreePool( &svgame.stringspool );
-#endif
+#endif // !XASH_64BIT
 }
 
 /*
@@ -3247,9 +3234,7 @@ string_t GAME_EXPORT SV_AllocString( const char *szValue )
 {
 	char *newString = NULL;
 	uint len;
-#ifdef XASH_64BIT
 	int cmp;
-#endif
 
 	if( svgame.physFuncs.pfnAllocString != NULL )
 	{
@@ -3265,7 +3250,7 @@ string_t GAME_EXPORT SV_AllocString( const char *szValue )
 		return i;
 	}
 
-#ifdef XASH_64BIT
+#if XASH_64BIT
 	cmp = 1;
 
 	if( !str64.allowdup )
@@ -3303,18 +3288,18 @@ string_t GAME_EXPORT SV_AllocString( const char *szValue )
 		str64.maxalloc = newString - str64.pstringarray;
 
 	return newString - svgame.globals->pStringBase;
-#else
+#else // !XASH_64BIT
 	len = SV_ProcessString( NULL, szValue );
 	newString = Mem_Malloc( svgame.stringspool, len );
 	SV_ProcessString( newString, szValue );
 
 	return newString - svgame.globals->pStringBase;
-#endif
+#endif // !XASH_64BIT
 }
 
 void SV_PrintStr64Stats_f( void )
 {
-#ifdef XASH_64BIT
+#if XASH_64BIT
 	Con_Printf( "====================\n" );
 	Con_Printf( "64 bit string pool statistics\n" );
 	Con_Printf( "====================\n" );
@@ -3323,9 +3308,9 @@ void SV_PrintStr64Stats_f( void )
 	Con_Printf( "maximum array usage: %lu\n", str64.maxalloc );
 	Con_Printf( "overflow counter: %lu\n", str64.numoverflows );
 	Con_Printf( "dup string counter: %lu\n", str64.numdups );
-#else
+#else // !XASH_64BIT
 	Con_Printf( "Not implemented\n" );
-#endif
+#endif // !XASH_64BIT
 }
 
 /*
@@ -3339,7 +3324,7 @@ string_t SV_MakeString( const char *szValue )
 {
 	if( svgame.physFuncs.pfnMakeString != NULL )
 		return svgame.physFuncs.pfnMakeString( szValue );
-#ifdef XASH_64BIT
+#if XASH_64BIT
 	{
 		long long ptrdiff = szValue - svgame.globals->pStringBase;
 		if( ptrdiff > INT_MAX || ptrdiff < INT_MIN )
@@ -3347,9 +3332,9 @@ string_t SV_MakeString( const char *szValue )
 		else
 			return (int)ptrdiff;
 	}
-#else
+#else // !XASH_64BIT
 	return szValue - svgame.globals->pStringBase;
-#endif
+#endif // !XASH_64BIT
 }
 
 /*

engine/server/sv_init.c

@@ -973,7 +973,7 @@ static void SV_GenerateTestPacket( void )
 	// write packet base data
 	MSG_Init( &svs.testpacket, "BandWidthTest", svs.testpacket_buf, maxsize );
 	MSG_WriteLong( &svs.testpacket, -1 );
-	MSG_WriteString( &svs.testpacket, "testpacket" );
+	MSG_WriteString( &svs.testpacket, S2C_BANDWIDTHTEST );
 	svs.testpacket_crcpos = svs.testpacket.pData + MSG_GetNumBytesWritten( &svs.testpacket );
 	MSG_WriteDword( &svs.testpacket, 0 ); // to be changed by crc
 
@@ -1028,6 +1028,8 @@ qboolean SV_SpawnServer( const char *mapname, const char *startspot, qboolean ba
 	if( !SV_InitGame( ))
 		return false;
 
+	Delta_Init(); // re-initialize delta
+
 	// unlock sv_cheats in local game
 	ClearBits( sv_cheats.flags, FCVAR_READ_ONLY );
 

engine/server/sv_main.c

@@ -389,23 +389,7 @@ static void SV_ReadPackets( void )
 		// check for connectionless packet (0xffffffff) first
 		if( MSG_GetMaxBytes( &net_message ) >= 4 && *(int *)net_message.pData == -1 )
 		{
-			if( !svs.initialized )
-			{
-				char	*args;
-				const char *c;
-
-				MSG_Clear( &net_message  );
-				MSG_ReadLong( &net_message  );// skip the -1 marker
-
-				args = MSG_ReadStringLine( &net_message  );
-				Cmd_TokenizeString( args );
-				c = Cmd_Argv( 0 );
-
-				if( !Q_strcmp( c, "rcon" ))
-					SV_RemoteCommand( net_from, &net_message );
-			}
-			else SV_ConnectionlessPacket( net_from, &net_message );
-
+			SV_ConnectionlessPacket( net_from, &net_message );
 			continue;
 		}
 
@@ -730,7 +714,7 @@ Master will validate challenge and this server to public list
 void SV_AddToMaster( netadr_t from, sizebuf_t *msg )
 {
 	uint	challenge, challenge2, heartbeat_challenge;
-	char	s[MAX_INFO_STRING] = "0\n"; // skip 2 bytes of header
+	char	s[MAX_INFO_STRING] = S2M_INFO; // skip 2 bytes of header
 	int	clients, bots;
 	double last_heartbeat;
 	const int len = sizeof( s );

engine/server/sv_phys.c

@@ -2146,18 +2146,18 @@ qboolean SV_InitPhysicsAPI( void )
 			if( svgame.physFuncs.SV_CheckFeatures != NULL )
 			{
 				// grab common engine features (it will be shared across the network)
-				Host_ValidateEngineFeatures( svgame.physFuncs.SV_CheckFeatures( ));
+				Host_ValidateEngineFeatures( ENGINE_FEATURES_MASK, svgame.physFuncs.SV_CheckFeatures( ));
 			}
 			return true;
 		}
 
 		// make sure what physic functions is cleared
 		memset( &svgame.physFuncs, 0, sizeof( svgame.physFuncs ));
-		Host_ValidateEngineFeatures( 0 );
+		Host_ValidateEngineFeatures( ENGINE_FEATURES_MASK, 0 );
 		return false; // just tell user about problems
 	}
 
 	// physic interface is missed
-	Host_ValidateEngineFeatures( 0 );
+	Host_ValidateEngineFeatures( ENGINE_FEATURES_MASK, 0 );
 	return true;
 }

engine/server/sv_query.c

@@ -16,15 +16,6 @@ GNU General Public License for more details.
 #include "common.h"
 #include "server.h"
 
-#define SOURCE_QUERY_DETAILS 'T'
-#define SOURCE_QUERY_DETAILS_RESPONSE 'I'
-
-#define SOURCE_QUERY_RULES 'V'
-#define SOURCE_QUERY_RULES_RESPONSE 'E'
-
-#define SOURCE_QUERY_PLAYERS 'U'
-#define SOURCE_QUERY_PLAYERS_RESPONSE 'D'
-
 /*
 ==================
 SV_SourceQuery_Details
@@ -41,7 +32,8 @@ static void SV_SourceQuery_Details( netadr_t from )
 
 	MSG_Init( &buf, "TSourceEngineQuery", answer, sizeof( answer ));
 
-	MSG_WriteByte( &buf, SOURCE_QUERY_DETAILS_RESPONSE );
+	MSG_WriteDword( &buf, 0xFFFFFFFFU );
+	MSG_WriteByte( &buf, S2A_GOLDSRC_INFO );
 	MSG_WriteByte( &buf, PROTOCOL_VERSION );
 
 	MSG_WriteString( &buf, hostname.string );
@@ -69,7 +61,7 @@ static void SV_SourceQuery_Details( netadr_t from )
 	MSG_WriteByte( &buf, GI->secure );
 	MSG_WriteString( &buf, XASH_VERSION );
 
-	Netchan_OutOfBand( NS_SERVER, from, MSG_GetNumBytesWritten( &buf ), MSG_GetData( &buf ));
+	NET_SendPacket( NS_SERVER, MSG_GetNumBytesWritten( &buf ), MSG_GetData( &buf ), from );
 }
 
 /*
@@ -87,7 +79,8 @@ static void SV_SourceQuery_Rules( netadr_t from )
 
 	MSG_Init( &buf, "TSourceEngineQueryRules", answer, sizeof( answer ));
 
-	MSG_WriteByte( &buf, SOURCE_QUERY_RULES_RESPONSE );
+	MSG_WriteDword( &buf, 0xFFFFFFFFU );
+	MSG_WriteByte( &buf, S2A_GOLDSRC_RULES );
 
 	pos = MSG_GetNumBitsWritten( &buf );
 	MSG_WriteShort( &buf, 0 );
@@ -117,7 +110,7 @@ static void SV_SourceQuery_Rules( netadr_t from )
 		MSG_SeekToBit( &buf, pos, SEEK_SET );
 		MSG_WriteShort( &buf, cvar_count );
 
-		Netchan_OutOfBand( NS_SERVER, from, total, MSG_GetData( &buf ));
+		NET_SendPacket( NS_SERVER, total, MSG_GetData( &buf ), from );
 	}
 }
 
@@ -139,7 +132,8 @@ static void SV_SourceQuery_Players( netadr_t from )
 
 	MSG_Init( &buf, "TSourceEngineQueryPlayers", answer, sizeof( answer ));
 
-	MSG_WriteByte( &buf, SOURCE_QUERY_PLAYERS_RESPONSE );
+	MSG_WriteDword( &buf, 0xFFFFFFFFU );
+	MSG_WriteByte( &buf, S2A_GOLDSRC_PLAYERS );
 
 	pos = MSG_GetNumBitsWritten( &buf );
 	MSG_WriteByte( &buf, 0 );
@@ -168,7 +162,7 @@ static void SV_SourceQuery_Players( netadr_t from )
 		MSG_SeekToBit( &buf, pos, SEEK_SET );
 		MSG_WriteByte( &buf, count );
 
-		Netchan_OutOfBand( NS_SERVER, from, total, MSG_GetData( &buf ));
+		NET_SendPacket( NS_SERVER, total, MSG_GetData( &buf ), from );
 	}
 }
 
@@ -177,24 +171,19 @@ static void SV_SourceQuery_Players( netadr_t from )
 SV_SourceQuery_HandleConnnectionlessPacket
 ==================
 */
-qboolean SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from )
+void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from )
 {
-	switch( c[0] )
+	if( !Q_strcmp( c, A2S_GOLDSRC_INFO ))
 	{
-	case SOURCE_QUERY_DETAILS:
 		SV_SourceQuery_Details( from );
-		return true;
-
-	case SOURCE_QUERY_RULES:
-		SV_SourceQuery_Rules( from );
-		return true;
-
-	case SOURCE_QUERY_PLAYERS:
-		SV_SourceQuery_Players( from );
-		return true;
-
-	default:
-		return false;
 	}
-	return false;
+	else switch( c[0] )
+	{
+	case A2S_GOLDSRC_RULES:
+		SV_SourceQuery_Rules( from );
+		break;
+	case A2S_GOLDSRC_PLAYERS:
+		SV_SourceQuery_Players( from );
+		break;
+	}
 }

engine/server/sv_save.c

@@ -82,7 +82,7 @@ typedef struct
 	float	time;
 } SAVE_LIGHTSTYLE;
 
-void (__cdecl *pfnSaveGameComment)( char *buffer, int max_length ) = NULL;
+static void (__cdecl *pfnSaveGameComment)( char *buffer, int max_length ) = NULL;
 
 static TYPEDESCRIPTION gGameHeader[] =
 {
@@ -218,7 +218,7 @@ static TYPEDESCRIPTION gTempEntvars[] =
 	DEFINE_ENTITY_GLOBAL_FIELD( globalname, FIELD_STRING ),
 };
 
-struct
+static const struct
 {
 	const char *mapname;
 	const char *titlename;
@@ -2185,6 +2185,19 @@ qboolean SV_SaveGame( const char *pName )
 	return SaveGameSlot( savename, comment );
 }
 
+static int SV_CompareFileTime( int ft1, int ft2 )
+{
+	if( ft1 < ft2 )
+	{
+		return -1;
+	}
+	else if( ft1 > ft2 )
+	{
+		return 1;
+	}
+	return 0;
+}
+
 /*
 ==================
 SV_GetLatestSave
@@ -2210,7 +2223,7 @@ const char *SV_GetLatestSave( void )
 		if( ft > 0 )
 		{
 			// should we use the matched?
-			if( !found || Host_CompareFileTime( newest, ft ) < 0 )
+			if( !found || SV_CompareFileTime( newest, ft ) < 0 )
 			{
 				Q_strncpy( savename, t->filenames[i], sizeof( savename ));
 				newest = ft;

engine/wscript

@@ -80,14 +80,24 @@ def configure(conf):
 		conf.env.HAVE_SDL2 = True
 	else:
 		conf.load('sdl2')
-		if not conf.env.HAVE_SDL2:
-			conf.fatal('SDL2 not available! If you want to build dedicated server, specify --dedicated')
-		conf.define('XASH_SDL', 2)
+		if conf.options.SDL3:
+			if not conf.env.HAVE_SDL3:
+				conf.fatal('SDL3 not available! If you want to build dedicated server, specify --dedicated')
+			conf.define('XASH_SDL', 3)
+		else:
+			if not conf.env.HAVE_SDL2:
+				conf.fatal('SDL2 not available! If you want to build dedicated server, specify --dedicated')
+			conf.define('XASH_SDL', 2)
 
 	if conf.env.DEST_OS == 'haiku':
 		conf.env.LIB_HAIKU = ['network']
 		conf.env.LIBPATH_HAIKU = ['/boot/system/lib']
 
+	if conf.env.DEST_OS == 'wasi':
+		conf.options.NO_ASYNC_RESOLVE = True
+		conf.env.append_unique('CFLAGS', '-mllvm')
+		conf.env.append_unique('CFLAGS', '-wasm-enable-sjlj')
+
 	if conf.options.STATIC:
 		conf.env.STATIC = True
 		conf.define('XASH_NO_LIBDL',1)
@@ -118,7 +128,6 @@ def configure(conf):
 	conf.define_cond('XASH_ENABLE_MAIN', conf.env.DISABLE_LAUNCHER)
 	conf.define_cond('XASH_NO_ASYNC_NS_RESOLVE', conf.options.NO_ASYNC_RESOLVE)
 	conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT)
-	conf.define_cond('XASH_64BIT', conf.env.DEST_SIZEOF_VOID_P != 4)
 	conf.define_cond('DBGHELP', conf.env.DEST_OS == 'win32')
 	conf.define_cond('PSAPI_VERSION', conf.env.DEST_OS == 'win32') # will be defined as 1
 
@@ -172,13 +181,12 @@ def build(bld):
 		source += bld.path.ant_glob(['platform/misc/lib_static.c'])
 		is_cxx_link = True
 
-	if bld.env.HAVE_SDL2:
-		libs.append('SDL2')
+	if bld.env.HAVE_SDL2 or bld.env.HAVE_SDL3:
+		libs.append('SDL3' if bld.env.HAVE_SDL3 else 'SDL2')
 		source += bld.path.ant_glob(['platform/sdl/*.c'])
 
 	if bld.env.MAGX:
 		libs.append('MAGX')
-		source += bld.path.ant_glob(['platform/magx/*.cpp'])
 		is_cxx_link = True
 
 	if bld.env.DEST_OS == 'android':
@@ -222,43 +230,44 @@ def build(bld):
 			'client/*.c',
 			'client/vgui/*.c',
 			'client/avi/*.c'])
-		libs += ['opus', 'bzip2']
+		is_cxx_link = True
+		libs += ['opus', 'bzip2', 'MultiEmulator']
 
-	includes = ['server', 'client', 'client/vgui' ]
+	rpath = bld.env.DEFAULT_RPATH
 
 	# Switch and PSVita have custom parameters
 	if bld.env.DEST_OS in ['nswitch', 'psvita']:
-		bld(source = source,
-			target = 'xash',
-			features = 'c cxxprogram',
-			includes = includes,
-			use = libs,
-			install_path = None,
-			nro_install_path = bld.env.BINDIR,
-			nacp = 'platform/nswitch/xash3d-fwgs.nacp',
-			icon = 'platform/nswitch/icon.jpg',
-			sce_sys = 'platform/psvita/sce_sys',
-			title_id = 'XASH10000',
-			app_name = 'xash3d-fwgs'
-		)
-	else:
-		# always build as shared library on Android
-		if bld.env.DISABLE_LAUNCHER and bld.env.DEST_OS != "android":
-			install_path = bld.env.BINDIR
-			program = 'cxxprogram' if is_cxx_link else 'cprogram'
-			if bld.env.STATIC:
-				program += '_static'
-			features = ['c', program]
+		rpath = None
+		install_path = None
+		features = 'cxx c cxxprogram cprogram'
+	# Always build as shared library on Android
+	elif bld.env.DISABLE_LAUNCHER and bld.env.DEST_OS != 'android':
+		install_path = bld.env.BINDIR
+		if bld.env.STATIC:
+			features = 'cxx c cxxprogram_static cprogram_static'
+		elif is_cxx_link:
+			features = 'cxx c cxxprogram cprogram'
 		else:
-			install_path = bld.env.LIBDIR
-			features = ['c', 'cxxshlib' if is_cxx_link else 'cshlib']
+			features = 'c cprogram'
+	else:
+		install_path = bld.env.LIBDIR
+		if is_cxx_link:
+			features = 'cxx c cxxshlib cshlib'
+		else:
+			features = 'c cshlib'
 
-		bld(source   = source,
-			target   = 'xash',
-			features = features,
-			includes = includes,
-			use      = libs,
-			install_path = install_path,
-			subsystem = bld.env.MSVC_SUBSYSTEM,
-			rpath = bld.env.DEFAULT_RPATH,
-		)
+	bld(source = source,
+		target = 'xash',
+		features = features,
+		includes = 'server client client/vgui',
+		use = libs,
+		install_path = install_path,
+		nro_install_path = bld.env.BINDIR,
+		nacp = 'platform/nswitch/xash3d-fwgs.nacp',
+		icon = 'platform/nswitch/icon.jpg',
+		sce_sys = 'platform/psvita/sce_sys',
+		title_id = 'XASH10000',
+		app_name = 'xash3d-fwgs',
+		subsystem = bld.env.MSVC_SUBSYSTEM,
+		rpath = rpath,
+	)

filesystem/exports.txt

@@ -0,0 +1 @@
+GetFSAPI

filesystem/wscript

@@ -25,7 +25,7 @@ def build(bld):
 		libs += [ 'public', 'ANDROID' ]
 
 	bld.shlib(target = 'filesystem_stdio',
-		features = 'cxx seq',
+		features = 'seq',
 		source = bld.path.ant_glob(['*.c', '*.cpp']),
 		use = libs,
 		install_path = bld.env.LIBDIR,

game_launch/wscript

@@ -30,9 +30,8 @@ def build(bld):
 	if bld.env.DEST_OS == 'linux':
 		bld.env.LDFLAGS += ['-Wl,--no-as-needed', '-lm']
 
-	bld(source = source,
+	bld.program(source = source,
 		target   = 'xash3d', # hl.exe
-		features = 'c cxx cxxprogram',
 		use      = 'sdk_includes DL USER32 SHELL32 werror',
 		rpath    = bld.env.DEFAULT_RPATH,
 		install_path = bld.env.BINDIR,

pm_shared/pm_defs.h

@@ -216,6 +216,7 @@ typedef struct playermove_s
 	pmtrace_t		(*PM_PlayerTraceEx) (float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ));
 	int		(*PM_TestPlayerPositionEx) (float *pos, pmtrace_t *ptrace, int (*pfnIgnore)( physent_t *pe ));
 	struct pmtrace_s	*(*PM_TraceLineEx)( float *start, float *end, int flags, int usehulll, int (*pfnIgnore)( physent_t *pe ));
-	struct msurface_s	*(*PM_TraceSurface)( int ground, float *vstart, float *vend );
+
+	struct msurface_s	*(*PM_TraceSurface)( int ground, float *vstart, float *vend ); // Xash3D-specific
 } playermove_t;
 #endif//PM_DEFS_H

public/build.c

@@ -119,6 +119,8 @@ const char *Q_PlatformStringByID( const int platform )
 		return "nswitch";
 	case PLATFORM_PSVITA:
 		return "psvita";
+	case PLATFORM_WASI:
+		return "wasi";
 	}
 
 	assert( 0 );
@@ -204,6 +206,8 @@ const char *Q_ArchitectureStringByID( const int arch, const uint abi, const int
 			return is64 ? "riscv64d" : "riscv32d";
 		}
 		break;
+	case ARCHITECTURE_WASM:
+		return is64 ? "wasm64" : "wasm32";
 	}
 
 	assert( 0 );

public/build.h

@@ -85,6 +85,8 @@ Then you can use another oneliner to query all variables:
 #undef XASH_X86
 #undef XASH_NSWITCH
 #undef XASH_PSVITA
+#undef XASH_WASI
+#undef XASH_WASM
 
 //================================================================
 //
@@ -126,6 +128,8 @@ Then you can use another oneliner to query all variables:
 		#define XASH_NSWITCH 1
 	#elif defined __vita__
 		#define XASH_PSVITA 1
+	#elif defined __wasi__
+		#define XASH_WASI 1
 	#else
 		#error
 	#endif
@@ -234,10 +238,19 @@ Then you can use another oneliner to query all variables:
 	#else
 		#error "Unknown RISC-V float ABI"
 	#endif
+#elif defined __wasm__
+	#if defined __wasm64__
+		#define XASH_64BIT 1
+	#endif
+	#define XASH_WASM 1
 #else
 	#error "Place your architecture name here! If this is a mistake, try to fix conditions above and report a bug"
 #endif
 
+#if !XASH_64BIT && ( defined( __LP64__ ) || defined( _LP64 ))
+#define XASH_64BIT 1
+#endif
+
 #if XASH_ARM == 8
 	#define XASH_ARMv8 1
 #elif XASH_ARM == 7