engine: server: add challenge to A2S_GOLDSRC_RULES and A2S_GOLDSRC_PLAYERS

As Xash also supports GoldSrc like queries, it's netinfo is dropped.

.clang-format

@@ -0,0 +1,113 @@
+Language: Cpp
+Standard: c++17
+UseTab: ForContinuationAndIndentation
+TabWidth: 4
+IndentWidth: 4
+ContinuationIndentWidth: 4
+IndentCaseLabels: false
+IndentPPDirectives: None
+NamespaceIndentation: None
+AccessModifierOffset: -4
+IndentAccessModifiers: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: false
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeWhile: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+MaxEmptyLinesToKeep: 2
+KeepEmptyLinesAtTheStartOfBlocks: false
+KeepEmptyLinesAtEOF: false
+SeparateDefinitionBlocks: Always
+InsertNewlineAtEOF: true
+LineEnding: LF
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+BinPackArguments: true
+BinPackParameters: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakAfterDefinitionReturnType: None
+AllowShortFunctionsOnASingleLine: None
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+BreakBeforeBinaryOperators: All
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+PointerAlignment: Right
+DerivePointerAlignment: false
+ReferenceAlignment: Pointer
+SpaceAroundPointerQualifiers: Default
+SpacesInParens: Custom
+SpacesInParensOptions:
+  ExceptDoubleParentheses: true
+  InCStyleCasts: false
+  InConditionalStatements: true
+  InEmptyParentheses: false
+  Other: true
+# XashCollapseParens: true
+SpaceBeforeParens: Never
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpacesInAngles: Never
+SpacesInContainerLiterals: false
+SpacesInSquareBrackets: false
+Cpp11BracedListStyle: false
+SpacesBeforeTrailingComments: 1
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+AlignAfterOpenBracket: DontAlign
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+AlignConsecutiveBitFields:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+AlignConsecutiveDeclarations:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+AlignEscapedNewlines: Left
+AlignOperands: Align
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
+ColumnLimit: 0
+ReflowComments: false
+SortIncludes: Never
+SortUsingDeclarations: false
+InsertBraces: false
+RemoveBracesLLVM: false
+FixNamespaceComments: false

.github/workflows/c-cpp.yml

@@ -70,6 +70,7 @@ jobs:
     env:
       SDL_VERSION: 2.32.10
       FFMPEG_VERSION: 8.1
+      YY_THUNKS_VERSION: v1.2.1
       GH_CPU_ARCH: ${{ matrix.targetarch }}
       GH_CPU_OS: ${{ matrix.targetos }}
       GH_CROSSCOMPILING: ${{ matrix.cross }}

3rdparty/yy-thunks/wscript

@@ -0,0 +1,59 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+import hashlib
+from waflib import Task, TaskGen, Logs
+
+OBJ_NAME = 'YY_Thunks_for_WinXP.obj'
+OBJ_SHA256 = '51a13c4b667c82181d357e274a50308a273be63f5f85ae958465774857721573'
+DLL_LINKFLAGS = ['-ENTRY:DllMainCRTStartupForYY_Thunks', '-alternatename:_YY_ThunksOriginalDllMainCRTStartup@12=__DllMainCRTStartup@12']
+
+class copy_yy_thunks(Task.Task):
+	color = 'CYAN'
+	def run(self):
+		return self.outputs[0].write(self.inputs[0].read('rb'), 'wb')
+
+@TaskGen.feature('yy_thunks')
+def add_yy_thunks_obj(self):
+	src = self.path.find_node(OBJ_NAME)
+	out = self.path.find_or_declare(OBJ_NAME)
+	self.compiled_tasks = [self.create_task('copy_yy_thunks', src, out)]
+
+@TaskGen.feature('cshlib', 'cxxshlib')
+@TaskGen.after_method('process_use')
+def apply_yy_thunks_dll(self):
+	if 'yy_thunks' not in self.to_list(getattr(self, 'use', [])):
+		return
+
+	try:
+		self.bld.get_tgen_by_name('yy_thunks')
+	except Exception:
+		return
+	self.env.append_value('LINKFLAGS', DLL_LINKFLAGS)
+
+def options(opt):
+	pass
+
+def configure(conf):
+	if conf.env.DEST_OS != 'win32' or conf.env.COMPILER_CC != 'msvc':
+		return
+
+	if conf.env.MSVC_TARGETS[0] not in ['amd64_x86', 'x86']:
+		return
+
+	obj = conf.path.find_node(OBJ_NAME)
+	if not obj:
+		Logs.warn('YY-Thunks: %s not found, XP compatibility disabled' % OBJ_NAME)
+		return
+
+	with open(obj.abspath(), 'rb') as f:
+		digest = hashlib.sha256(f.read()).hexdigest()
+
+	if digest != OBJ_SHA256:
+		conf.fatal('%s checksum mismatch: expected %s, got %s' % (OBJ_NAME, OBJ_SHA256, digest))
+
+	conf.env.YY_THUNKS = True
+
+def build(bld):
+	if bld.env.YY_THUNKS:
+		bld(name='yy_thunks', features='yy_thunks')

Documentation/donate.md

@@ -29,9 +29,7 @@ Initial Xash3D SDL2/Linux port author, Xash3D FWGS engine maintainer, creator of
 
 ## [$_Vladislav](https://github.com/Vladislav4KZ)
 
-[YaPB Project](https://github.com/yapb) member, [Xash3D FWGS](https://github.com/FWGS/xash3d-fwgs) tester,
-editor of the [Official YaPB Documentation](https://github.com/yapb/docs) (in English and Russian), curator of the [YaPB Graph Database](https://github.com/yapb/graph) and author of [YaPB Waypoint/Graph Pack](https://gamebanana.com/mods/40087).
+[YaPB Project](https://github.com/yapb) member and [contributor](https://github.com/yapb/yapb/commits?author=Vladislav4KZ) ([Docs](https://github.com/yapb/docs), [Nav Graphs](https://github.com/yapb/graph), [RU translation](https://github.com/yapb/yapb/blob/master/cfg/addons/yapb/conf/lang/ru_lang.cfg)), Xash3D FWGS [tester](https://github.com/FWGS/xash3d-fwgs/issues?q=is%3Aissue%20state%3Aopen%20author%3AVladislav4KZ) and [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=Vladislav4KZ) (gyro-aim support, scr-parser, etc.), [CS16Client](https://github.com/Velaron/cs16-client) [contributor](https://github.com/Velaron/cs16-client/commits?author=Vladislav4KZ).
 
-Also does the Russian localization of text, images (gfx/shell), as well as additional menu buttons in English used in Xash3D FWGS for various mods.
-
-* [Boosty page](https://boosty.to/rasstaman1337)
+* [Boosty page](https://boosty.to/rasstaman1337)
+* [PayPal link](https://paypal.me/rasstaman1337)

Documentation/protocol/02-connectionless.md

@@ -12,14 +12,18 @@ All connectionless packets have `\xff\xff\xff\xff` (32-bit integer set to all on
 
 - [Any](#any)
   - [Any to Any](#any-to-any)
-    - [`A2A_NETINFO`](#a2a_netinfo)
-    - [`A2A_INFO`](#a2a_info)
     - [`A2A_PING` and `A2A_GOLDSRC_PING`](#a2a_ping-and-a2a_goldsrc_ping)
     - [`A2A_ACK` and `A2A_GOLDSRC_ACK`](#a2a_ack-and-a2a_goldsrc_ack)
+    - [Deprecated queries](#deprecated-queries)
+      - [`A2A_NETINFO`](#a2a_netinfo)
+      - [`A2A_INFO`](#a2a_info)
   - [Any to Client](#any-to-client)
     - [`A2C_PRINT` and `A2C_GOLDSRC_PRINT`](#a2c_print-and-a2c_goldsrc_print)
   - [Any to Server and Server to Any](#any-to-server-and-server-to-any)
-    - [`A2S_GOLDSRC_INFO`, `A2S_GOLDSRC_RULES` and `A2S_GOLDSRC_PLAYERS` and their responses](#a2s_goldsrc_info-a2s_goldsrc_rules-and-a2s_goldsrc_players-and-their-responses)
+    - [GoldSrc server queries](#goldsrc-server-queries)
+    - [`A2S_GOLDSRC_INFO`](#a2s_goldsrc_info)
+    - [`A2S_GOLDSRC_PLAYERS`](#a2s_goldsrc_players)
+    - [`A2S_GOLDSRC_RULES`](#a2s_goldsrc_rules)
   - [Any to Master](#any-to-master)
     - [`S2M_SCAN_REQUEST`](#s2m_scan_request)
   - [Master to Any](#master-to-any)
@@ -50,7 +54,23 @@ All connectionless packets have `\xff\xff\xff\xff` (32-bit integer set to all on
 
 ### Any to Any
 
-#### `A2A_NETINFO`
+#### `A2A_PING` and `A2A_GOLDSRC_PING`
+
+Simple ping message.
+* Request, in ASCII: `ping` or `i` in GoldSrc format
+* Response is always `A2A_ACK` or `A2A_GOLDSRC_ACK`
+
+#### `A2A_ACK` and `A2A_GOLDSRC_ACK`
+
+Simple ack message.
+* Request, in ASCII: `ack` or `j` in GoldSrc format
+* Response: none
+
+#### Deprecated queries
+
+These text-based Xash protocol queries are deprecated in favor of [GoldSrc server queries](#goldsrc-server-queries), which Xash3D FWGS servers implement as well. New implementations must not send them. The server still responds to `A2A_INFO` for compatibility with older clients, `A2A_NETINFO` is not handled anymore.
+
+##### `A2A_NETINFO`
 
 Used to implement Half-Life's NetAPI. 
 * Request message, in ASCII: `netinfo <version> <context> <request_id>`
@@ -81,7 +101,7 @@ Possible requests and response formats:
 * On any other server will respond with `neterror` set to `undefined`
 * If protocol version doesn't match, server responds with `neterror` set to `protocol`
 
-#### `A2A_INFO`
+##### `A2A_INFO`
 
 Used to request server's details.
 * Request message, in ASCII: `info <version>`
@@ -101,18 +121,6 @@ Used to request server's details.
   - `password` set to 1 if server is protected with password otherwise 0
   - `host` is server's name
 
-#### `A2A_PING` and `A2A_GOLDSRC_PING`
-
-Simple ping message.
-* Request, in ASCII: `ping` or `i` in GoldSrc format
-* Response is always `A2A_ACK` or `A2A_GOLDSRC_ACK`
-
-#### `A2A_ACK` and `A2A_GOLDSRC_ACK`
-
-Simple ack message.
-* Request, in ASCII: `ack` or `j` in GoldSrc format
-* Response: none
-
 ### Any to Client
 
 #### `A2C_PRINT` and `A2C_GOLDSRC_PRINT`
@@ -124,9 +132,62 @@ Simple print message.
 
 ### Any to Server and Server to Any
 
-#### `A2S_GOLDSRC_INFO`, `A2S_GOLDSRC_RULES` and `A2S_GOLDSRC_PLAYERS` and their responses
+#### GoldSrc server queries
 
-These match Source Engine Query messages used in GoldSrc and Source engine and implemented for compatibility with existing tools. Read documentation for them on VDC: https://developer.valvesoftware.com/wiki/Server_queries
+These match Source Engine Query messages used in GoldSrc and Source engine and implemented for compatibility with existing server browsers and monitoring tools. The client uses them to query GoldSrc servers in the server browser, and as text-based Xash protocol queries are [deprecated](#deprecated-queries), it will use them to query Xash servers as well. Read documentation for them on VDC: https://developer.valvesoftware.com/wiki/Server_queries
+
+Unlike other connectionless messages these are binary: integers are little-endian, floats are 32-bit IEEE 754 and strings are null-terminated.
+
+`A2S_GOLDSRC_PLAYERS` and `A2S_GOLDSRC_RULES` requests carry a 32-bit challenge, `A2S_GOLDSRC_INFO` may have one appended after the query string. When no challenge is known yet, `\xff\xff\xff\xff` is sent in it's place. The server may answer with a challenge instead of the data: byte `A` (`0x41`) followed by a 32-bit challenge value, 9 bytes total with the header. The request is then repeated with the received challenge. Don't confuse this message with textual `S2C_GOLDSRC_CHALLENGE` used during connection, they only share the first byte.
+
+Responses that don't fit into a single packet (usually rules) come from GoldSrc servers split into fragments. Such packets start with `\xfe\xff\xff\xff` instead of `\xff\xff\xff\xff`, followed by a 32-bit sequence number, same in all fragments of one response, and a byte with total fragment count in the lower 4 bits and this fragment's index in the upper 4 bits. Fragment payloads concatenated in index order form a normal `\xff\xff\xff\xff` message. Xash servers never split query responses and send them as single datagrams.
+
+#### `A2S_GOLDSRC_INFO`
+
+Used to request server's details.
+
+* Request: `TSource Engine Query\0`, optionally followed by a 32-bit challenge. Xash servers ignore it.
+* Response: byte `I` (`S2A_GOLDSRC_INFO`), followed by:
+  - byte: protocol version, 48 on GoldSrc, 49 on Xash3D FWGS
+  - string: server's name
+  - string: server's current level
+  - string: game directory name
+  - string: game description
+  - int16: Steam AppID, always 0 on Xash servers
+  - byte: total player count, bots included
+  - byte: max players limit
+  - byte: bot count
+  - byte: server type, `d` for dedicated or `l` for listen server
+  - byte: server's operating system, `w` for Windows, `l` for Linux, `m` for macOS
+  - byte: set to 1 if server is protected with password otherwise 0
+  - byte: set to 1 if server is VAC secured, Xash servers put the `secure` value from gameinfo here
+  - string: server's version
+
+Same as the Source engine response format but without the extra data flag and its fields.
+
+Legacy GoldSrc servers respond with the obsolete `m` format (`S2A_GOLDSRC_LEGACY_INFO`) instead, see VDC for its layout. Xash servers never send it but the client understands it and assumes protocol 48.
+
+#### `A2S_GOLDSRC_PLAYERS`
+
+Used to request server's player list.
+
+* Request: byte `U` (`0x55`), then a 32-bit challenge.
+* Response: byte `D` (`S2A_GOLDSRC_PLAYERS`), followed by a byte with total player count, then for each player:
+  - byte: player's index. Xash servers send sequential indexes starting from 0, GoldSrc servers always send 0 here.
+  - string: player's name
+  - int32: player's kill count
+  - float: time in seconds the player is connected, -1.0 for bots on Xash servers
+
+Xash server doesn't respond at all if the player list is empty, the server is protected with password or exposing the player list is disabled with `sv_expose_player_list` cvar.
+
+#### `A2S_GOLDSRC_RULES`
+
+Used to request server's game rules.
+
+* Request: byte `V` (`0x56`), then a 32-bit challenge.
+* Response: byte `E` (`S2A_GOLDSRC_RULES`), followed by an int16 with total rule count, then rule name and rule value strings for each.
+
+Only server cvars (`FCVAR_SERVER`) are sent. Values of protected cvars (`FCVAR_PROTECTED`) are replaced with `1` if the value is set otherwise `0`. If there are no cvars to expose, server doesn't respond at all.
 
 ### Any to Master
 
@@ -154,7 +215,7 @@ These match Source Engine Query messages used in GoldSrc and Source engine and i
   - `reserved` is single reserved 8-bit byte
   - Following is list of IP addresses in binary form: 6-bytes for IPv4 address + port and 18-bytes for IPv6 address + port
   - If port is 0, it means the end of list, otherwise it's the last IP used for pagination (not implemented in Xash3D)
-* Response: client doesn't make response to master server but might request `A2S_INFO` from servers
+* Response: client doesn't make response to master server but might request `A2S_GOLDSRC_INFO` from servers
 
 ## Master and game server
 

Documentation/protocol/http-server-list.md

@@ -28,17 +28,18 @@ used; servers register out of band.
 
 ## Response
 
-UTF-8 text, tokenized with `COM_ParseFileSafe` (whitespace separates,
-`//` and `#` start line comments, `"..."` quotes a token). One directive
-per record:
+UTF-8 text, parsed line by line. Each line is tokenized with
+`COM_ParseFileSafe` (whitespace separates, `//` and `#` start line
+comments, `"..."` quotes a token). Blank lines and comment-only lines
+are ignored. One directive per line:
 
 * `ip <address>` — Xash3D server (protocol 49).
 * `gs <address>` — GoldSrc server (protocol 48).
 
 `<address>` is parsed by `NET_StringToAdr` (`1.2.3.4:27015`,
-`[2001:db8::1]:27015`, hostnames). Port defaults to `27015`. Unknown
-directives are skipped together with one operand so new keywords can be
-added without breaking older clients.
+`[2001:db8::1]:27015`, hostnames). Port defaults to `27015`. Lines
+starting with an unknown directive are skipped entirely, so new keywords
+with any number of operands can be added without breaking older clients.
 
 `Content-Type` is not inspected, `text/plain; charset=utf-8` expected.
 

README.md

@@ -1,3 +1,6 @@
+> [!CAUTION]
+> **Only download Xash3D FWGS from official sources.** Third-party builds, "modded launchers", "optimized" repacks and random mirrors are frequently bundled with malware, miners, spyware and credential stealers. We cannot vouch for anything we did not build. Get official binaries only from the [releases page](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous).
+
 # Xash3D FWGS Engine <img align="right" width="128" height="128" src="https://github.com/FWGS/xash3d-fwgs/raw/master/game_launch/icon-xash-material.png" alt="Xash3D FWGS icon" />
 [![GitHub Actions Status](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [![FreeBSD Build Status](https://img.shields.io/cirrus/github/FWGS/xash3d-fwgs?label=freebsd%20build)](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) \
 [![Discord Server](https://img.shields.io/discord/355697768582610945?logo=Discord&label=International%20Discord%20chat)](http://xash.su/discord/) [![Russian speakers Telegram Chat](https://img.shields.io/badge/Russian_speakers_Telegram_chat-gray?logo=Telegram)](https://t.me/flyingwithgauss) \

common/q_client.h

@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef struct usercmd_s
 {
 	int16_t   lerp_msec; // added in HL
-	int8_t    msec;      // added in QW
+	uint8_t   msec;      // added in QW
 	uint8_t   pad1;
 	vec3_t    viewangles;
 

engine/client/cl_debug.c

@@ -50,7 +50,7 @@ const char *CL_MsgInfo( int cmd )
 		// get engine message name
 		const char *svc_string = NULL;
 
-		switch( cls.legacymode )
+		switch( cls.net_protocol )
 		{
 		case PROTO_CURRENT:
 			svc_string = svc_strings[cmd];
@@ -146,7 +146,7 @@ static void CL_WriteErrorMessage( int current_count, sizebuf_t *msg )
 
 	FS_Write( fp, &cls.starting_count, sizeof( int ));
 	FS_Write( fp, &current_count, sizeof( int ));
-	FS_Write( fp, &cls.legacymode, sizeof( cls.legacymode ));
+	FS_Write( fp, &cls.net_protocol, sizeof( cls.net_protocol ));
 	FS_Write( fp, MSG_GetData( msg ), MSG_GetMaxBytes( msg ));
 	FS_Close( fp );
 
@@ -207,7 +207,7 @@ void CL_ReplayBufferDat_f( void )
 	FS_Read( f, &current_count, sizeof( current_count ));
 	FS_Read( f, &protocol, sizeof( protocol ));
 
-	cls.legacymode = protocol;
+	cls.net_protocol = protocol;
 
 	len = FS_Read( f, buffer, sizeof( buffer ));
 	FS_Close( f );

engine/client/cl_demo.c

@@ -412,7 +412,7 @@ static void CL_WriteDemoHeader( const char *name )
 
 	demo.header.id = IDEMOHEADER;
 	demo.header.dem_protocol = DEMO_PROTOCOL;
-	demo.header.net_protocol = CL_GetDemoNetProtocol( cls.legacymode );
+	demo.header.net_protocol = CL_GetDemoNetProtocol( cls.net_protocol );
 	demo.header.host_fps = host_maxfps.value ? bound( MIN_FPS, host_maxfps.value, maxfps ) : maxfps;
 	Q_strncpy( demo.header.mapname, clgame.mapname, sizeof( demo.header.mapname ));
 	Q_strncpy( demo.header.comment, clgame.maptitle, sizeof( demo.header.comment ));
@@ -723,7 +723,7 @@ static void CL_DemoStartPlayback( int mode )
 
 	demo.starttime = CL_GetDemoPlaybackClock(); // for determining whether to read another message
 
-	CL_SetupNetchanForProtocol( cls.legacymode );
+	CL_SetupNetchanForProtocol( cls.net_protocol );
 
 	memset( demo.cmds, 0, sizeof( demo.cmds ));
 	demo.angle_position = 1;
@@ -1555,7 +1555,7 @@ void CL_PlayDemo_f( void )
 
 		if( neg ) cls.forcetrack = -cls.forcetrack;
 		CL_DemoStartPlayback( DEMO_QUAKE1 );
-		cls.legacymode = PROTO_QUAKE;
+		cls.net_protocol = PROTO_QUAKE;
 		return; // quake demo is started
 	}
 
@@ -1591,7 +1591,7 @@ void CL_PlayDemo_f( void )
 	CL_DemoStartPlayback( DEMO_XASH3D );
 
 	// must be after DemoStartPlayback, as CL_Disconnect_f resets the protocol
-	cls.legacymode = CL_GetProtocolFromDemo( demo.header.net_protocol );
+	cls.net_protocol = CL_GetProtocolFromDemo( demo.header.net_protocol );
 
 	// g-cont. is this need?
 	Q_strncpy( cls.servername, demoname, sizeof( cls.servername ));

engine/client/cl_main.c

@@ -42,6 +42,7 @@ static CVAR_DEFINE_AUTO( cl_logoext, "bmp", FCVAR_ARCHIVE, "temporary cvar to te
 static CVAR_DEFINE( cl_logoupdate, "@cl_logoupdate", "0", 0, "set by menu to trigger clan logo update" );
 CVAR_DEFINE_AUTO( cl_logomaxdim, "96", FCVAR_ARCHIVE, "maximum decal dimension" );
 static CVAR_DEFINE_AUTO( cl_test_bandwidth, "1", FCVAR_ARCHIVE, "test network bandwith before connection" );
+static CVAR_DEFINE_AUTO( cl_require_challenge_echo, "-1", FCVAR_ARCHIVE, "reject connect packets that don't echo challenge, protects against spoofed servers but breaks connection to old servers (-1 = engine default)" );
 
 CVAR_DEFINE( cl_draw_particles, "r_drawparticles", "1", FCVAR_CHEAT, "render particles" );
 CVAR_DEFINE( cl_draw_tracers, "r_drawtracers", "1", FCVAR_CHEAT, "render tracers" );
@@ -171,7 +172,7 @@ int CL_IsDevOverviewMode( void )
 
 connprotocol_t CL_Protocol( void )
 {
-	return cls.legacymode;
+	return cls.net_protocol;
 }
 
 void CL_SetCheatState( qboolean multiplayer, qboolean allow_cheats )
@@ -235,7 +236,7 @@ static void CL_CreateResourceList( void )
 		Cvar_DirectSet( &cl_logoext, "bmp" );
 
 	Q_snprintf( szFileName, sizeof( szFileName ), "logos/remapped.%s", cl_logoext.string );
-	if( cls.legacymode == PROTO_GOLDSRC )
+	if( cls.net_protocol == PROTO_GOLDSRC )
 	{
 		CL_ConvertImageToWAD3( szFileName );
 		Q_strncpy( szFileName, "tempdecal.wad", sizeof( szFileName ));
@@ -335,7 +336,7 @@ static void CL_CheckClientState( void )
 		Cvar_SetValue( "scr_loading", 0.0f );	// reset progress bar
 		Netchan_ReportFlow( &cls.netchan );
 
-		if( cls.legacymode == PROTO_GOLDSRC )
+		if( cls.net_protocol == PROTO_GOLDSRC )
 		{
 			CL_ServerCommand(true, "specmode 4\n");
 			CL_ServerCommand(true, "specmode 4\n");
@@ -868,7 +869,7 @@ static void CL_WritePacket( void )
 	byte data[MAX_CMD_BUFFER] = { 0 };
 	runcmd_t *pcmd;
 	int numbackup, maxbackup, maxcmds;
-	const connprotocol_t proto = cls.legacymode;
+	const connprotocol_t proto = cls.net_protocol;
 
 	// FIXME: on Xash protocol we don't send move commands until ca_active
 	// to prevent outgoing_command outrun incoming_acknowledged
@@ -1374,7 +1375,7 @@ static void CL_CheckForResend( void )
 		cls.state = ca_connecting;
 		Q_strncpy( cls.servername, "localhost", sizeof( cls.servername ));
 		NET_NetadrSetType( &cls.serveradr, NA_LOOPBACK );
-		cls.legacymode = PROTO_CURRENT;
+		cls.net_protocol = PROTO_CURRENT;
 
 		// we don't need a challenge on the localhost
 		CL_SendConnectPacket( PROTO_CURRENT, 0 );
@@ -1449,7 +1450,7 @@ static void CL_CheckForResend( void )
 		// but tell us that test is allowed
 		// in this case, just send connect packet and hope for the best
 		if( cls.bandwidth_test.passed || cls.bandwidth_test.failed )
-			CL_SendConnectPacket( cls.legacymode, cls.bandwidth_test.challenge );
+			CL_SendConnectPacket( cls.net_protocol, cls.bandwidth_test.challenge );
 		else
 			CL_SendBandwidthTest( adr, false );
 	}
@@ -1512,7 +1513,7 @@ static void CL_Connect_f( void )
 	Key_SetKeyDest( key_console );
 
 	cls.state = ca_connecting;
-	cls.legacymode = proto;
+	cls.net_protocol = proto;
 	Q_strncpy( cls.servername, server, sizeof( cls.servername ));
 	cls.connect_time = MAX_HEARTBEAT; // CL_CheckForResend() will fire immediately
 	cls.max_fragment_size = FRAGMENT_MAX_SIZE; // guess a we can establish connection with maximum fragment size
@@ -1717,7 +1718,7 @@ static void CL_Reconnect( qboolean setup_netchan )
 {
 	if( setup_netchan )
 	{
-		CL_SetupNetchanForProtocol( cls.legacymode );
+		CL_SetupNetchanForProtocol( cls.net_protocol );
 	}
 	else
 	{
@@ -1762,7 +1763,7 @@ void CL_Disconnect( void )
 	CL_Stop_f();
 
 	// send a disconnect message to the server
-	CL_SendDisconnectMessage( cls.legacymode );
+	CL_SendDisconnectMessage( cls.net_protocol );
 	SteamBroker_TerminateGameConnection();
 	CL_ClearState ();
 
@@ -1780,7 +1781,7 @@ void CL_Disconnect( void )
 	cls.connect_retry = 0;
 	memset( &cls.bandwidth_test, 0, sizeof( cls.bandwidth_test ));
 	cls.signon = 0;
-	cls.legacymode = PROTO_CURRENT;
+	cls.net_protocol = PROTO_CURRENT;
 
 	// back to menu in non-developer mode
 	if( host_developer.value || cls.key_dest == key_menu )
@@ -1808,7 +1809,7 @@ void CL_Crashed( void )
 	CL_Stop_f(); // stop any demos
 
 	// send a disconnect message to the server
-	CL_SendDisconnectMessage( cls.legacymode );
+	CL_SendDisconnectMessage( cls.net_protocol );
 
 	Host_WriteOpenGLConfig();
 	Host_WriteConfig();	// write config
@@ -1914,7 +1915,7 @@ static void CL_Reconnect_f( void )
 
 	if( !COM_StringEmptyOrNULL( cls.servername ))
 	{
-		connprotocol_t proto = cls.legacymode;
+		connprotocol_t proto = cls.net_protocol;
 
 		if( cls.state >= ca_connected )
 			CL_Disconnect();
@@ -1923,7 +1924,7 @@ static void CL_Reconnect_f( void )
 		cls.demonum = cls.movienum = -1;	// not in the demo loop now
 		cls.state = ca_connecting;
 		cls.signon = 0;
-		cls.legacymode = proto; // don't change protocol
+		cls.net_protocol = proto; // don't change protocol
 
 		Con_Printf( "reconnecting...\n" );
 	}
@@ -2072,23 +2073,61 @@ static void CL_ParseStatusMessage( netadr_t from, sizebuf_t *msg )
 	UI_AddServerToList( from, infostring );
 }
 
+static net_request_t *CL_NetRequestFind( netadr_t from, int type )
+{
+	for( int i = 0; i < ARRAYSIZE( clgame.net_requests ); i++ )
+	{
+		net_request_t *nr = &clgame.net_requests[i];
+
+		if( !nr->pfnFunc || nr->resp.type != type )
+			continue;
+
+		if( NET_CompareAdr( nr->resp.remote_address, from ))
+			return nr;
+
+		// broadcast requests accept a response from anyone
+		if( NET_NetadrType( &nr->resp.remote_address ) == NA_BROADCAST )
+			return nr;
+	}
+
+	return NULL;
+}
+
+static void CL_NetRequestComplete( net_request_t *nr, netadr_t from, const char *response )
+{
+	netadr_t request_adr = nr->resp.remote_address;
+
+	nr->resp.response = (void *)response;
+	nr->resp.remote_address = from;
+	nr->resp.error = NET_SUCCESS;
+	nr->resp.ping = host.realtime - nr->timesend;
+
+	nr->pfnFunc( &nr->resp );
+
+	if( FBitSet( nr->flags, FNETAPI_MULTIPLE_RESPONSE ))
+		nr->resp.remote_address = request_adr;
+	else memset( nr, 0, sizeof( *nr )); // done
+}
+
 static void CL_ParseGoldSrcStatusMessage( netadr_t from, sizebuf_t *msg, qboolean legacy_format )
 {
 	static char	s[512+8];
-	int p, numcl, maxcl, password, remaining, bots;
+	int p, numcl, maxcl, password, bots;
 	string host, map, gamedir, version;
-	char *replace;
 
 	// set to beginning but skip header
 	MSG_SeekToBit( msg, (sizeof( uint32_t ) + sizeof( uint8_t )) << 3, SEEK_SET );
 
 	if( legacy_format )
 	{
-		string address;
 		int mod;
 
-		p = MSG_ReadByte( msg );
-		Q_strncpy( address, MSG_ReadString( msg ), sizeof( address ));
+		// FIXME: this is invalid, `m` servers might be geniune 47 proto servers
+		// but many servers that reply with legacy format are 47/48
+		// so at least let the user to connect them
+		p = PROTOCOL_GOLDSRC_VERSION;
+
+		MSG_ReadString( msg ); // address
 		Q_strncpy( host, MSG_ReadString( msg ), sizeof( host ));
 		Q_strncpy( map, MSG_ReadString( msg ), sizeof( map ));
 		Q_strncpy( gamedir, MSG_ReadString( msg ), sizeof( gamedir ));
@@ -2159,7 +2198,7 @@ static void CL_ParseGoldSrcStatusMessage( netadr_t from, sizebuf_t *msg, qboolea
 
 	// write host last so we can try to cut off too long hostnames
 	// TODO: value size limit for infostrings
-	remaining = sizeof( s ) - Q_strlen( s ) - sizeof( "\\host\\" ) - 1;
+	int remaining = sizeof( s ) - Q_strlen( s ) - sizeof( "\\host\\" ) - 1;
 	if( remaining < 0 )
 	{
 		// should never happen?
@@ -2167,103 +2206,205 @@ static void CL_ParseGoldSrcStatusMessage( netadr_t from, sizebuf_t *msg, qboolea
 		return;
 	}
 
+	char *replace;
 	while(( replace = Q_strpbrk( host, "\\\"" )))
-	{
 		*replace = ' '; // find a better replacement?
-	}
 
 	Info_SetValueForKey( s, "host", host, sizeof( s ));
 
+	// tell mainui about server
 	UI_AddServerToList( from, s );
+
+	// now process NetAPI requst
+	net_request_t *nr = CL_NetRequestFind( from, NETAPI_REQUEST_DETAILS );
+
+	if( !nr )
+		return;
+
+	s[0] = 0;
+	Info_SetValueForKey( s, "gamedir", gamedir, sizeof( s ));
+	Info_SetValueForKeyf( s, "current", sizeof( s ), "%i", numcl );
+	Info_SetValueForKeyf( s, "max", sizeof( s ), "%i", maxcl );
+	Info_SetValueForKey( s, "map", map, sizeof( s ));
+	Info_SetValueForKey( s, "hostname", host, sizeof( s ));
+
+	CL_NetRequestComplete( nr, from, s );
 }
 
 /*
 =================
-CL_ParseNETInfoMessage
-
-Handle a reply from a netinfo
+CL_NetRequestSend
 =================
 */
-static void CL_ParseNETInfoMessage( netadr_t from, const char *s )
+qboolean CL_NetRequestSend( net_request_t *nr )
 {
-	net_request_t	*nr = NULL;
-	static char	infostring[MAX_PRINT_MSG];
-	int		i, context, type;
-	int		errorBits = 0;
-	const char		*val;
+	byte buf[64];
+	sizebuf_t msg;
 
-	context = Q_atoi( Cmd_Argv( 1 ));
-	type = Q_atoi( Cmd_Argv( 2 ));
-
-	// find request with specified context and type
-	for( i = 0; i < MAX_REQUESTS; i++ )
+	if( nr->resp.type == NETAPI_REQUEST_PING )
 	{
-		if( clgame.net_requests[i].resp.context == context && clgame.net_requests[i].resp.type == type )
-		{
-			nr = &clgame.net_requests[i];
-			break;
-		}
+		Netchan_OutOfBandPrint( NS_CLIENT, nr->resp.remote_address, A2A_GOLDSRC_PING );
+		return true;
 	}
 
-	// not found, ignore
-	if( nr == NULL )
-		return;
+	MSG_Init( &msg, "NetRequest", buf, sizeof( buf ));
 
-	// find the payload
-	s = Q_strchr( s, ' ' ); // skip netinfo
-	if( !s )
-		return;
-
-	s = Q_strchr( s + 1, ' ' ); // skip challenge
-	if( !s )
-		return;
-
-	s = Q_strchr( s + 1, ' ' ); // skip type
-	if( s )
-		s++; // skip final whitespace
-	else if( type != NETAPI_REQUEST_PING ) // ping have no payload, and that's ok
-		return;
-
-	if( s )
+	switch( nr->resp.type )
 	{
-		if( s[0] == '\\' )
-		{
-			// check for errors
-			val = Info_ValueForKey( s, "neterror" );
-
-			if( !Q_stricmp( val, "protocol" ))
-				SetBits( errorBits, NET_ERROR_PROTO_UNSUPPORTED );
-			else if( !Q_stricmp( val, "undefined" ))
-				SetBits( errorBits, NET_ERROR_UNDEFINED );
-			else if( !Q_stricmp( val, "forbidden" ))
-				SetBits( errorBits, NET_ERROR_FORBIDDEN );
-
-			CL_FixupColorStringsForInfoString( s, infostring, sizeof( infostring ));
-		}
-		else
-		{
-			Q_strncpy( infostring, s, sizeof( infostring ));
-		}
-	}
-	else
-	{
-		infostring[0] = 0;
+	case NETAPI_REQUEST_DETAILS:
+		MSG_WriteString( &msg, A2S_GOLDSRC_INFO );
+		break;
+	case NETAPI_REQUEST_PLAYERS:
+		MSG_WriteByte( &msg, A2S_GOLDSRC_PLAYERS );
+		break;
+	case NETAPI_REQUEST_RULES:
+		MSG_WriteByte( &msg, A2S_GOLDSRC_RULES );
+		break;
+	default:
+		return false;
 	}
 
-	// setup the answer
-	nr->resp.response = infostring;
-	nr->resp.remote_address = from;
-	nr->resp.error = NET_SUCCESS;
-	nr->resp.ping = host.realtime - nr->timesend;
+	MSG_WriteLong( &msg, nr->challenge );
 
-	if( nr->timeout <= host.realtime )
-		SetBits( nr->resp.error, NET_ERROR_TIMEOUT );
-	SetBits( nr->resp.error, errorBits ); // misc error bits
+	Netchan_OutOfBand( NS_CLIENT, nr->resp.remote_address, MSG_GetNumBytesWritten( &msg ), MSG_GetData( &msg ));
 
-	nr->pfnFunc( &nr->resp );
+	return true;
+}
 
-	if( !FBitSet( nr->flags, FNETAPI_MULTIPLE_RESPONSE ))
-		memset( nr, 0, sizeof( *nr )); // done
+/*
+=================
+CL_HasActiveNetRequest
+=================
+*/
+qboolean CL_HasActiveNetRequest( netadr_t from )
+{
+	for( int i = 0; i < ARRAYSIZE( clgame.net_requests ); i++ )
+	{
+		const net_request_t *nr = &clgame.net_requests[i];
+
+		if( !nr->pfnFunc )
+			continue;
+
+		if( nr->resp.type != NETAPI_REQUEST_RULES && nr->resp.type != NETAPI_REQUEST_PLAYERS )
+			continue;
+
+		if( NET_CompareAdr( nr->resp.remote_address, from ))
+			return true;
+	}
+
+	return false;
+}
+
+/*
+=================
+CL_NetRequestChallenge
+=================
+*/
+static void CL_NetRequestChallenge( netadr_t from, sizebuf_t *msg )
+{
+	MSG_SeekToBit( msg, ( sizeof( uint32_t ) + sizeof( uint8_t )) << 3, SEEK_SET );
+	int challenge = MSG_ReadLong( msg );
+
+	// give the challenge to the first request without one,
+	// the server sends a challenge per received query
+	for( int i = 0; i < ARRAYSIZE( clgame.net_requests ); i++ )
+	{
+		net_request_t *nr = &clgame.net_requests[i];
+
+		if( !nr->pfnFunc || nr->resp.type == NETAPI_REQUEST_PING )
+			continue;
+
+		if( nr->challenge != -1 )
+			continue;
+
+		if( !NET_CompareAdr( nr->resp.remote_address, from ))
+			continue;
+
+		nr->challenge = challenge;
+		CL_NetRequestSend( nr );
+		break;
+	}
+}
+
+/*
+=================
+CL_NetRequestPing
+=================
+*/
+static void CL_NetRequestPing( netadr_t from )
+{
+	net_request_t *nr = CL_NetRequestFind( from, NETAPI_REQUEST_PING );
+
+	if( !nr )
+		return;
+
+	CL_NetRequestComplete( nr, from, "" );
+}
+
+/*
+=================
+CL_NetRequestPlayers
+=================
+*/
+static void CL_NetRequestPlayers( netadr_t from, sizebuf_t *msg )
+{
+	static char s[MAX_PRINT_MSG];
+	net_request_t *nr = CL_NetRequestFind( from, NETAPI_REQUEST_PLAYERS );
+
+	if( !nr )
+		return;
+
+	MSG_SeekToBit( msg, ( sizeof( uint32_t ) + sizeof( uint8_t )) << 3, SEEK_SET );
+
+	int count = MSG_ReadByte( msg );
+
+	s[0] = 0;
+	for( int i = 0; i < count && !MSG_CheckOverflow( msg ); i++ )
+	{
+		MSG_ReadByte( msg ); // index, GoldSrc servers always send 0 here
+		Info_SetValueForKey( s, va( "p%iname", i ), MSG_ReadString( msg ), sizeof( s ));
+		Info_SetValueForKeyf( s, va( "p%ifrags", i ), sizeof( s ), "%i", MSG_ReadLong( msg ));
+		Info_SetValueForKeyf( s, va( "p%itime", i ), sizeof( s ), "%f", MSG_ReadFloat( msg ));
+	}
+	Info_SetValueForKeyf( s, "players", sizeof( s ), "%i", count );
+
+	if( MSG_CheckOverflow( msg ))
+		return;
+
+	CL_NetRequestComplete( nr, from, s );
+}
+
+/*
+=================
+CL_NetRequestRules
+=================
+*/
+static void CL_NetRequestRules( netadr_t from, sizebuf_t *msg )
+{
+	static char s[MAX_PRINT_MSG];
+	net_request_t *nr = CL_NetRequestFind( from, NETAPI_REQUEST_RULES );
+
+	if( !nr )
+		return;
+
+	MSG_SeekToBit( msg, ( sizeof( uint32_t ) + sizeof( uint8_t )) << 3, SEEK_SET );
+
+	int count = MSG_ReadShort( msg );
+
+	s[0] = 0;
+	for( int i = 0; i < count && !MSG_CheckOverflow( msg ); i++ )
+	{
+		string key;
+
+		Q_strncpy( key, MSG_ReadString( msg ), sizeof( key ));
+		Info_SetValueForKey( s, key, MSG_ReadString( msg ), sizeof( s ));
+	}
+	Info_SetValueForKeyf( s, "rules", sizeof( s ), "%i", count );
+
+	if( MSG_CheckOverflow( msg ))
+		return;
+
+	CL_NetRequestComplete( nr, from, s );
 }
 
 /*
@@ -2275,14 +2416,13 @@ check for timeouts
 */
 static void CL_ProcessNetRequests( void )
 {
-	net_request_t	*nr;
-	int		i;
-
 	// find a request with specified context
-	for( i = 0; i < MAX_REQUESTS; i++ )
+	for( int i = 0; i < ARRAYSIZE( clgame.net_requests ); i++ )
 	{
-		nr = &clgame.net_requests[i];
-		if( !nr->pfnFunc ) continue;	// not used
+		net_request_t *nr = &clgame.net_requests[i];
+
+		if( !nr->pfnFunc )
+			continue; // not used
 
 		if( nr->timeout <= host.realtime )
 		{
@@ -2443,6 +2583,29 @@ static void CL_ClientConnect( connprotocol_t proto, const char *c, netadr_t from
 			return;
 		}
 
+		const char *challenge_str = Info_ValueForKey( Cmd_Argv( 1 ), "challenge" );
+
+		if( COM_StringEmpty( challenge_str ))
+		{
+			qboolean require_challenge;
+
+			if( cl_require_challenge_echo.value < 0 )
+				require_challenge = false; // FIXME: flip once most servers migrate to newer engine version
+			else
+				require_challenge = !!cl_require_challenge_echo.value;
+
+			if( require_challenge )
+			{
+				Con_Printf( S_WARN "%s: %s did not echo challenge, ignoring (possible spoof)\n", __func__, NET_AdrToString( from ));
+				return;
+			}
+		}
+		else if( Q_atoi( challenge_str ) != cls.bandwidth_test.challenge )
+		{
+			Con_Printf( S_WARN "%s: challenge mismatch from %s, ignoring (possible spoof)\n", __func__, NET_AdrToString( from ));
+			return;
+		}
+
 		if( cls.netchan_pending_cookie != 0 )
 		{
 			int server_extensions = Q_atoi( Info_ValueForKey( Cmd_Argv( 1 ), "ext" ));
@@ -2497,8 +2660,16 @@ static void CL_Print( const char *c, const char *args, netadr_t from, sizebuf_t
 	Con_Printf( "%s%c", s, s[Q_strlen( s ) - 1] != '\n' ? '\n' : '\0' );
 }
 
-static void CL_Challenge( const char *c, netadr_t from )
+static void CL_Challenge( const char *c, netadr_t from, sizebuf_t *msg )
 {
+	// connection challenge is text and always comes as literal A00000000,
+	// query challenge is binary: challenge type byte and the challenge value
+	if( c[0] == S2C_GOLDSRC_CHALLENGE[0] && Q_strcmp( c, S2C_GOLDSRC_CHALLENGE ))
+	{
+		CL_NetRequestChallenge( from, msg );
+		return;
+	}
+
 	if( cls.state != ca_connecting )
 		return;
 
@@ -2508,7 +2679,7 @@ static void CL_Challenge( const char *c, netadr_t from )
 	// try to autodetect protocol by challenge response
 	if( !Q_strcmp( c, S2C_GOLDSRC_CHALLENGE ))
 	{
-		cls.legacymode = PROTO_GOLDSRC;
+		cls.net_protocol = PROTO_GOLDSRC;
 
 		cls.steam_auth = Q_atoi( Cmd_Argv( 2 )) == 3;
 
@@ -2524,14 +2695,14 @@ static void CL_Challenge( const char *c, netadr_t from )
 
 	cls.bandwidth_test.challenge = Q_atoi( Cmd_Argv( 1 ));
 
-	if( cls.legacymode == PROTO_CURRENT && cl_test_bandwidth.value && !cls.bandwidth_test.passed )
+	if( cls.net_protocol == PROTO_CURRENT && cl_test_bandwidth.value && !cls.bandwidth_test.passed )
 	{
 		// when connecting to old server or server that has bandwidth test disabled
 		// it might be more preferrable to have some sane fragment size
 		if( !Q_atoi( Cmd_Argv( 2 )))
 		{
 			Cvar_SetValue( "cl_dlmax", FRAGMENT_DEFAULT_SIZE );
-			CL_SendConnectPacket( cls.legacymode, cls.bandwidth_test.challenge );
+			CL_SendConnectPacket( cls.net_protocol, cls.bandwidth_test.challenge );
 		}
 		else
 		{
@@ -2541,7 +2712,7 @@ static void CL_Challenge( const char *c, netadr_t from )
 	else
 	{
 		// challenge from the server we are connecting to
-		CL_SendConnectPacket( cls.legacymode, cls.bandwidth_test.challenge );
+		CL_SendConnectPacket( cls.net_protocol, cls.bandwidth_test.challenge );
 	}
 }
 
@@ -2686,7 +2857,7 @@ static void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 	// server connection
 	if( !Q_strcmp( c, S2C_GOLDSRC_CONNECTION ) || !Q_strcmp( c, S2C_CONNECTION ))
 	{
-		CL_ClientConnect( cls.legacymode, c, from );
+		CL_ClientConnect( cls.net_protocol, c, from );
 	}
 	else if( !Q_strcmp( c, A2A_INFO ))
 	{
@@ -2700,9 +2871,13 @@ static void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 	{
 		CL_ParseGoldSrcStatusMessage( from, msg, true );
 	}
-	else if( !Q_strcmp( c, A2A_NETINFO ))
+	else if( c[0] == S2A_GOLDSRC_PLAYERS )
 	{
-		CL_ParseNETInfoMessage( from, args ); // server responding to a status broadcast
+		CL_NetRequestPlayers( from, msg );
+	}
+	else if( c[0] == S2A_GOLDSRC_RULES )
+	{
+		CL_NetRequestRules( from, msg );
 	}
 	else if( c[0] == A2C_GOLDSRC_PRINT || !Q_strcmp( c, A2C_PRINT ))
 	{
@@ -2722,11 +2897,11 @@ static void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 	}
 	else if( !Q_strcmp( c, A2A_ACK ) || !Q_strcmp( c, A2A_GOLDSRC_ACK ))
 	{
-		// no-op
+		CL_NetRequestPing( from ); // server responding to a NetAPI ping
 	}
-	else if( !Q_strcmp( c, S2C_CHALLENGE ) || !Q_strcmp( c, S2C_GOLDSRC_CHALLENGE ))
+	else if( !Q_strcmp( c, S2C_CHALLENGE ) || c[0] == S2C_GOLDSRC_CHALLENGE[0] )
 	{
-		CL_Challenge( c, from );
+		CL_Challenge( c, from, msg );
 	}
 	else if( !Q_strcmp( c, S2C_REJECT ) || c[0] == S2C_GOLDSRC_REJECT || c[0] == S2C_GOLDSRC_REJECT_BADPASSWORD )
 	{
@@ -2806,7 +2981,7 @@ static void CL_ReadNetMessage( void )
 	size_t	curSize;
 	void (*parsefn)( sizebuf_t *msg );
 
-	switch( cls.legacymode )
+	switch( cls.net_protocol )
 	{
 	case PROTO_QUAKE:
 		parsefn = CL_ParseQuakeMessage;
@@ -3102,7 +3277,7 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename )
 			MSG_Init( &msg, "Resource Registration", msg_buf, sizeof( msg_buf ));
 
 			if( CL_PrecacheResources( ))
-				CL_RegisterResources( &msg, cls.legacymode );
+				CL_RegisterResources( &msg, cls.net_protocol );
 
 			if( MSG_GetNumBytesWritten( &msg ) > 0 )
 			{
@@ -3162,7 +3337,7 @@ tell server about changed userinfo
 */
 void CL_UpdateInfo( const char *key, const char *value )
 {
-	switch( cls.legacymode )
+	switch( cls.net_protocol )
 	{
 	case PROTO_GOLDSRC:
 		if( cl_advertise_engine_in_name.value && !Q_stricmp( key, "name" ) && Q_strnicmp( value, "[Xash3D]", 8 ))
@@ -3495,6 +3670,7 @@ static void CL_InitLocal( void )
 	Cvar_RegisterVariable( &cl_logoupdate );
 	Cvar_RegisterVariable( &cl_logomaxdim );
 	Cvar_RegisterVariable( &cl_test_bandwidth );
+	Cvar_RegisterVariable( &cl_require_challenge_echo );
 
 	Voice_RegisterCvars();
 	VGui_RegisterCvars();

engine/client/client.h

@@ -445,6 +445,7 @@ typedef struct
 	double			timeout;
 	double			timesend;	// time when request was sended
 	int			flags;	// FNETAPI_MULTIPLE_RESPONSE etc
+	int			challenge;	// GoldSrc query challenge, -1 until received
 } net_request_t;
 
 // new versions of client dlls have a single export with all callbacks
@@ -647,7 +648,7 @@ typedef struct
 	string   internetservers_customfilter;
 
 	// multiprotocol support
-	connprotocol_t legacymode;
+	connprotocol_t net_protocol;
 	int extensions;
 
 	netadr_t serveradr;
@@ -793,6 +794,7 @@ void CL_ClearState( void );
 void CL_SetCheatState( qboolean multiplayer, qboolean allow_cheats );
 void CL_SendGoldSrcConnectPacket( netadr_t adr, int challenge, const void *ticket, size_t ticketlen );
 void CL_NotifyServerListResponse( void );
+qboolean CL_NetRequestSend( net_request_t *nr );
 
 //
 // cl_demo.c

engine/client/dll_int/cl_game.c

@@ -3364,44 +3364,60 @@ NetAPI_SendRequest
 */
 static void GAME_EXPORT NetAPI_SendRequest( int context, int request, int flags, double timeout, netadr_t *remote_address, net_api_response_func_t response )
 {
-	net_request_t	*nr = NULL;
-	int		i;
-
 	if( !response )
 	{
-		Con_DPrintf( S_ERROR "%s: no callbcak specified for request with context %i!\n", __func__, context );
+		Con_DPrintf( S_ERROR "%s: no callback specified for request with context %i!\n", __func__, context );
 		return;
 	}
 
+	// FIXME: call pfnFunc and tell client.dll about errors?
+
 	if( NET_NetadrType( remote_address ) == NA_IPX || NET_NetadrType( remote_address ) == NA_BROADCAST_IPX )
 		return; // IPX no longer support
 
-	if( request == NETAPI_REQUEST_SERVERLIST )
+	switch( request )
+	{
+	case NETAPI_REQUEST_SERVERLIST:
 		return; // no support for server list requests
+	case NETAPI_REQUEST_PING:
+	case NETAPI_REQUEST_RULES:
+	case NETAPI_REQUEST_PLAYERS:
+	case NETAPI_REQUEST_DETAILS:
+		break;
+	default:
+		Con_Printf( S_ERROR "%s: unknown request type %d, context %i\n", __func__, request, context );
+		return;
+	}
 
 	// find a free request
-	for( i = 0; i < MAX_REQUESTS; i++ )
+	net_request_t *nr = NULL, *oldest_nr = NULL;
+	int i;
+	double max_timeout = 0;
+	for( i = 0; i < ARRAYSIZE( clgame.net_requests ); i++ )
 	{
 		nr = &clgame.net_requests[i];
-		if( !nr->pfnFunc ) break;
-	}
 
-	if( i == MAX_REQUESTS )
-	{
-		double	max_timeout = 0;
-
-		// no free requests? use oldest
-		for( i = 0, nr = NULL; i < MAX_REQUESTS; i++ )
+		if(( host.realtime - nr->timesend ) > max_timeout )
 		{
-			if(( host.realtime - clgame.net_requests[i].timesend ) > max_timeout )
-			{
-				max_timeout = host.realtime - clgame.net_requests[i].timesend;
-				nr = &clgame.net_requests[i];
-			}
+			max_timeout = host.realtime - nr->timesend;
+			oldest_nr = nr;
 		}
+
+		if( !nr->pfnFunc )
+			break;
 	}
 
-	Assert( nr != NULL );
+	if( i == ARRAYSIZE( clgame.net_requests ))
+	{
+		// no free requests? use oldest
+		nr = oldest_nr;
+	}
+
+	if( !nr )
+	{
+		Con_Printf( S_ERROR "%s: no free requests\n", __func__ );
+		return;
+	}
 
 	// clear slot
 	memset( nr, 0, sizeof( *nr ));
@@ -3414,9 +3430,10 @@ static void GAME_EXPORT NetAPI_SendRequest( int context, int request, int flags,
 	nr->resp.type = request;
 	nr->resp.remote_address = *remote_address;
 	nr->flags = flags;
+	nr->challenge = -1;
 
-	// local servers request
-	Netchan_OutOfBandPrint( NS_CLIENT, nr->resp.remote_address, A2A_NETINFO" %i %i %i", PROTOCOL_VERSION, context, request );
+	if( !CL_NetRequestSend( nr ))
+		Con_Printf( S_ERROR "%s: failed to send net request for type %d with context %i\n", __func__, request, context );
 }
 
 /*
@@ -3428,7 +3445,7 @@ NetAPI_CancelRequest
 static void GAME_EXPORT NetAPI_CancelRequest( int context )
 {
 	// find a specified request
-	for( int i = 0; i < MAX_REQUESTS; i++ )
+	for( int i = 0; i < ARRAYSIZE( clgame.net_requests ); i++ )
 	{
 		net_request_t *nr = &clgame.net_requests[i];
 
@@ -3456,7 +3473,7 @@ NetAPI_CancelAllRequests
 void GAME_EXPORT NetAPI_CancelAllRequests( void )
 {
 	// tell the user about cancel
-	for( int i = 0; i < MAX_REQUESTS; i++ )
+	for( int i = 0; i < ARRAYSIZE( clgame.net_requests ); i++ )
 	{
 		net_request_t *nr = &clgame.net_requests[i];
 		if( !nr->pfnFunc ) continue;	// not used

engine/client/parse/cl_parse.c

@@ -469,7 +469,7 @@ void CL_BatchResourceRequest( qboolean initialize )
 	{
 		if( done_downloading && CL_PrecacheResources( ))
 		{
-			CL_RegisterResources( &msg, cls.legacymode );
+			CL_RegisterResources( &msg, cls.net_protocol );
 		}
 
 		Netchan_CreateFragments( &cls.netchan, &msg );
@@ -1186,8 +1186,8 @@ void CL_ParseBaseline( sizebuf_t *msg, connprotocol_t proto )
 			int type = MSG_ReadUBitLong( msg, 2 );
 			int delta_type;
 
-			if( player ) delta_type = DT_ENTITY_STATE_PLAYER_T;
-			else if( type != ENTITY_NORMAL ) delta_type = DT_CUSTOM_ENTITY_STATE_T;
+			if( FBitSet( type, ENTITY_BEAM )) delta_type = DT_CUSTOM_ENTITY_STATE_T;
+			else if( player ) delta_type = DT_ENTITY_STATE_PLAYER_T;
 			else delta_type = DT_ENTITY_STATE_T;
 
 			Delta_ReadGSFields( msg, delta_type, &ent->prevstate, &ent->baseline, 1.0f );

engine/client/parse/cl_parse_gs.c

@@ -465,7 +465,7 @@ static void CL_ParseSoundPacketGS( sizebuf_t *msg )
 	float attn;
 	if( FBitSet( flags, SND_ATTENUATION ))
 		attn = (float)MSG_ReadByte( msg ) / 64.0f;
-	else attn = ATTN_NONE;
+	else attn = 1.0f;
 
 	int chan = MSG_ReadUBitLong( msg, 3 );
 	int entnum = MSG_ReadUBitLong( msg, MAX_GOLDSRC_ENTITY_BITS );

engine/client/soundlib/snd_main.c

@@ -274,7 +274,7 @@ void FS_FreeStream( stream_t *stream )
 	stream->format->freefunc( stream );
 }
 
-#if XASH_ENGINE_TESTS
+#if XASH_LLVM_LIBFUZZER
 #define IMPLEMENT_SOUNDLIB_FUZZ_TARGET( export, target ) \
 int EXPORT export( const uint8_t *Data, size_t Size ); \
 int EXPORT export( const uint8_t *Data, size_t Size ) \
@@ -294,4 +294,4 @@ int EXPORT export( const uint8_t *Data, size_t Size ) \
 
 IMPLEMENT_SOUNDLIB_FUZZ_TARGET( Fuzz_Sound_LoadMPG, Sound_LoadMPG )
 IMPLEMENT_SOUNDLIB_FUZZ_TARGET( Fuzz_Sound_LoadWAV, Sound_LoadWAV )
-#endif
+#endif // XASH_LLVM_LIBFUZZER

engine/client/soundlib/snd_mp3.c

@@ -185,7 +185,7 @@ static qboolean Sound_ParseID3Tag( const byte *buffer, fs_offset_t filesize )
 	return true;
 }
 
-#if XASH_ENGINE_TESTS
+#if XASH_LLVM_LIBFUZZER
 int EXPORT Fuzz_Sound_ParseID3Tag( const uint8_t *Data, size_t Size );
 int EXPORT Fuzz_Sound_ParseID3Tag( const uint8_t *Data, size_t Size )
 {
@@ -193,7 +193,7 @@ int EXPORT Fuzz_Sound_ParseID3Tag( const uint8_t *Data, size_t Size )
 	Sound_ParseID3Tag( Data, Size );
 	return 0;
 }
-#endif
+#endif // XASH_LLVM_LIBFUZZER
 
 /*
 =================================================================

engine/common/imagelib/img_main.c

@@ -701,6 +701,10 @@ void Test_RunImagelib( void )
 
 	Z_Free( rgb.buffer );
 }
+#endif // XASH_ENGINE_TESTS
+
+#if XASH_LLVM_LIBFUZZER
+#include "sprite.h"
 
 #define IMPLEMENT_IMAGELIB_FUZZ_TARGET( export, target ) \
 int EXPORT export( const uint8_t *Data, size_t Size ); \
@@ -724,4 +728,29 @@ IMPLEMENT_IMAGELIB_FUZZ_TARGET( Fuzz_Image_LoadPNG, Image_LoadPNG )
 IMPLEMENT_IMAGELIB_FUZZ_TARGET( Fuzz_Image_LoadDDS, Image_LoadDDS )
 IMPLEMENT_IMAGELIB_FUZZ_TARGET( Fuzz_Image_LoadTGA, Image_LoadTGA )
 
-#endif /* XASH_ENGINE_TESTS */
+int EXPORT Fuzz_Image_LoadSPR( const uint8_t *Data, size_t Size );
+int EXPORT Fuzz_Image_LoadSPR( const uint8_t *Data, size_t Size )
+{
+	rgbdata_t *rgb;
+
+	// the real caller passes only the pixel data size, the frame header is extra
+	if( Size < sizeof( dspriteframe_t ))
+		return 0;
+
+	host.type = HOST_NORMAL;
+	Memory_Init();
+	Image_Init();
+
+	image.hint = IL_HINT_Q1; // installs the Quake palette so the decoder runs
+
+	if( Image_LoadSPR( "#internal.spr", Data, Size - sizeof( dspriteframe_t )))
+	{
+		rgb = ImagePack( "#internal.spr" );
+		FS_FreeImage( rgb );
+	}
+
+	Image_Shutdown();
+	return 0;
+}
+
+#endif // XASH_LLVM_LIBFUZZER

engine/common/imagelib/img_wad.c

@@ -262,10 +262,10 @@ qboolean Image_LoadSPR( const char *name, const byte *buffer, fs_offset_t filesi
 	image.width = pin.width;
 	image.height = pin.height;
 
-	if( filesize < image.width * image.height )
+	if( filesize < (fs_offset_t)image.width * image.height )
 		return false;
 
-	if( filesize == ( image.width * image.height * 4 ))
+	if( filesize == (fs_offset_t)image.width * image.height * 4 )
 		truecolor = true;
 
 	// sorry, can't validate palette rendermode

engine/common/masterlist.c

@@ -225,33 +225,33 @@ void NET_QueryServerByAddress( netadr_t adr, connprotocol_t proto )
 		Netchan_OutOfBandPrint( NS_CLIENT, adr, A2A_INFO " %i", PROTOCOL_VERSION );
 }
 
-static int NET_ParseMasterStaticBody( char *body )
+static int NET_ParseMasterStaticBody( const byte *body, size_t size )
 {
-	char token[MAX_TOKEN];
-	char *pfile = body;
+	char line[1024];
+	int offset = 0;
 	int count = 0;
 
-	while(( pfile = COM_ParseFileSafe( pfile, token, sizeof( token ), PFILE_HASH_AS_COMMENT, NULL, NULL )))
+	while( Q_memfgets( (byte *)body, size, &offset, line, sizeof( line )) != NULL )
 	{
+		char token[MAX_TOKEN];
+		char *pfile = line;
 		qboolean gs;
+		netadr_t adr = { 0 };
+
+		pfile = COM_ParseFileSafe( pfile, token, sizeof( token ), PFILE_HASH_AS_COMMENT, NULL, NULL );
+		if( !pfile || token[0] == '\0' )
+			continue;
 
 		if( !Q_strcmp( token, "ip" ))
 			gs = false;
 		else if( !Q_strcmp( token, "gs" ))
 			gs = true;
 		else
-		{
-			pfile = COM_ParseFileSafe( pfile, token, sizeof( token ), PFILE_HASH_AS_COMMENT, NULL, NULL );
-			if( !pfile )
-				break;
 			continue;
-		}
 
 		pfile = COM_ParseFileSafe( pfile, token, sizeof( token ), PFILE_HASH_AS_COMMENT, NULL, NULL );
 		if( !pfile )
-			break;
-
-		netadr_t adr = { 0 };
+			continue;
 
 		if( !NET_StringToAdr( token, &adr ))
 		{
@@ -288,16 +288,9 @@ static void NET_MasterStaticResponse( const char *url, qboolean success, const b
 		return;
 	}
 
-	// HTTP buffer isn't NUL-terminated; COM_ParseFileSafe needs one.
-	char *body = Mem_Malloc( host.mempool, size + 1 );
-	memcpy( body, data, size );
-	body[size] = 0;
-
 	NET_Config( true, false ); // allow remote sends
 
-	int count = NET_ParseMasterStaticBody( body );
-
-	Mem_Free( body );
+	int count = NET_ParseMasterStaticBody( data, size );
 
 	Con_Reportf( "masterstatic: %s yielded %d server(s)\n", url, count );
 
@@ -516,7 +509,7 @@ static master_t *NET_AddMaster( const char *addr )
 
 static void NET_AddMaster_f( void )
 {
-	if( Cmd_Argc() != 2 )
+	if( Cmd_Argc() != 2 && Cmd_Argc() != 3 )
 	{
 		Msg( S_USAGE "addmaster <address> [gs]\n");
 		return;

engine/common/mod_sprite.c

@@ -62,14 +62,19 @@ static byte *Mod_SwapSpriteFrame( byte *p, byte *end, int bytes )
 	p += sizeof( frame );
 
 	// skip pixel data
-	if( p + frame.width * frame.height * bytes > end )
+	if( frame.width < 0 || frame.height < 0 )
 		return NULL;
 
-	p += frame.width * frame.height * bytes;
+	uint64_t pixels = (uint64_t)frame.width * frame.height * bytes;
+
+	if( pixels > (size_t)( end - p ))
+		return NULL;
+
+	p += pixels;
 	return p;
 }
 
-static byte *Mod_SwapSpriteGroup( byte *p, byte *end, int bytes )
+static byte *Mod_SwapSpriteGroup( byte *p, byte *end, int bytes, int min_frames )
 {
 	dspritegroup_t group;
 
@@ -84,7 +89,7 @@ static byte *Mod_SwapSpriteGroup( byte *p, byte *end, int bytes )
 	// swap intervals
 	int numframes = group.numframes;
 
-	if( p + numframes * sizeof( dspriteinterval_t ) > end )
+	if( numframes < min_frames || (size_t)numframes > (size_t)( end - p ) / sizeof( dspriteinterval_t ))
 		return NULL;
 
 	for( int i = 0; i < numframes; i++ )
@@ -144,18 +149,26 @@ static qboolean Mod_SwapSprite( void *buffer, size_t buffersize, int *out_versio
 
 		short numi = LittleShort( *(short *)p );
 		*(short *)p = numi;
-		p += sizeof( short ) + numi * 3;
+		p += sizeof( short );
+
+		if( numi < 0 || p + numi * 3 > end )
+			return false;
+
+		p += numi * 3;
 		break;
 	}
 	default:
 		return false;
 	}
 
+	if( numframes < 0 )
+		return false;
+
 	*out_version = version;
 	int bytes = ( version == SPRITE_VERSION_32 ) ? 4 : 1;
 
 	// swap all frames
-	for( int i = 0; i < numframes && p && p < end; i++ )
+	for( int i = 0; i < numframes; i++ )
 	{
 		dframetype_t frametype;
 
@@ -173,12 +186,18 @@ static qboolean Mod_SwapSprite( void *buffer, size_t buffersize, int *out_versio
 			p = Mod_SwapSpriteFrame( p, end, bytes );
 			break;
 		case FRAME_GROUP:
+			p = Mod_SwapSpriteGroup( p, end, bytes, 1 );
+			break;
 		case FRAME_ANGLED:
-			p = Mod_SwapSpriteGroup( p, end, bytes );
+			// angled groups are indexed by 0..7 at render time
+			p = Mod_SwapSpriteGroup( p, end, bytes, 8 );
 			break;
 		default:
 			return false;
 		}
+
+		if( !p )
+			return false;
 	}
 
 	return true;
@@ -229,17 +248,23 @@ void Mod_LoadSpriteModel( model_t *mod, void *buffer, size_t buffersize, qboolea
 		psprite->texFormat = SPR_ADDITIVE;
 		psprite->numframes = mod->numframes = pinq1->numframes;
 		psprite->facecull = SPR_CULL_FRONT;
-		psprite->radius = pinq1->boundingradius;
+		float radius = floorf( pinq1->boundingradius );
+		if( radius >= (float)INT_MAX )
+			psprite->radius = INT_MAX;
+		else if( radius < 0.0f || IS_NAN( radius ))
+			psprite->radius = 0;
+		else
+			psprite->radius = (int)radius;
 		psprite->synctype = pinq1->synctype;
 
 		// LadyHavoc: hack to allow sprites to be non-fullbright
 		if( Q_strchr( mod->name, '!' ))
 			psprite->texFormat = SPR_ALPHTEST;
 
-		mod->mins[0] = mod->mins[1] = -pinq1->bounds[0] * 0.5f;
 		mod->maxs[0] = mod->maxs[1] = pinq1->bounds[0] * 0.5f;
-		mod->mins[2] = -pinq1->bounds[1] * 0.5f;
+		mod->mins[0] = mod->mins[1] = -mod->maxs[0];
 		mod->maxs[2] = pinq1->bounds[1] * 0.5f;
+		mod->mins[2] = -mod->maxs[2];
 	}
 	else // if( version == SPRITE_VERSION_HL )
 	{
@@ -263,10 +288,10 @@ void Mod_LoadSpriteModel( model_t *mod, void *buffer, size_t buffersize, qboolea
 		psprite->radius = pinhl->boundingradius;
 		psprite->synctype = pinhl->synctype;
 
-		mod->mins[0] = mod->mins[1] = -pinhl->bounds[0] * 0.5f;
 		mod->maxs[0] = mod->maxs[1] = pinhl->bounds[0] * 0.5f;
-		mod->mins[2] = -pinhl->bounds[1] * 0.5f;
+		mod->mins[0] = mod->mins[1] = -mod->maxs[0];
 		mod->maxs[2] = pinhl->bounds[1] * 0.5f;
+		mod->mins[2] = -mod->maxs[2];
 	}
 
 	if( loaded )
@@ -283,3 +308,34 @@ void Mod_LoadSpriteModel( model_t *mod, void *buffer, size_t buffersize, qboolea
 	Mod_SpriteLoadTextures( mod, buffer );
 #endif
 }
+
+#if XASH_LLVM_LIBFUZZER
+int EXPORT Fuzz_Mod_LoadSpriteModel( const uint8_t *Data, size_t Size );
+int EXPORT Fuzz_Mod_LoadSpriteModel( const uint8_t *Data, size_t Size )
+{
+	model_t mod = { .name = "#internal.spr", .needload = NL_NEEDS_LOADED };
+	qboolean loaded = false;
+	byte *buf;
+
+	if( Size == 0 )
+		return 0;
+
+	Memory_Init();
+
+	// dedicated mode exercises the parser/validator without needing a renderer
+	host.type = HOST_DEDICATED;
+	host.mempool = Mem_AllocPool( "fuzzing pool" );
+
+	// the loader byteswaps the buffer in place, so hand it a writable copy
+	buf = Mem_Malloc( host.mempool, Size );
+	memcpy( buf, Data, Size );
+
+	Mod_LoadSpriteModel( &mod, buf, Size, &loaded );
+
+	if( mod.mempool )
+		Mem_FreePool( &mod.mempool );
+	Mem_FreePool( &host.mempool );
+
+	return 0;
+}
+#endif // XASH_LLVM_LIBFUZZER

engine/common/model.c

@@ -653,7 +653,7 @@ void Mod_NeedCRC( const char *name, qboolean needCRC )
 	else ClearBits( p->flags, FCRC_SHOULD_CHECKSUM );
 }
 
-#if XASH_ENGINE_TESTS
+#if XASH_LLVM_LIBFUZZER
 
 static const uint8_t *fuzz_data;
 static size_t fuzz_size;
@@ -689,4 +689,4 @@ int EXPORT Fuzz_Mod_LoadModel( const uint8_t *Data, size_t Size )
 	return 0;
 }
 
-#endif // XASH_ENGINE_TESTS
+#endif // XASH_LLVM_LIBFUZZER

engine/common/net_ws.c

@@ -1364,9 +1364,14 @@ static qboolean NET_QueuePacket( int net_socket, netsrc_t sock, netadr_t *from,
 			// check for split message
 			if( sock == NS_CLIENT && *(int *)data == NET_HEADER_SPLITPACKET )
 			{
-				if( !CL_IsFromConnectingServer( *from ))
-					return false;
-				return NET_GetLong( data, ret, length, CL_GetSplitSize( ), CL_Protocol( ));
+				if( CL_IsFromConnectingServer( *from ))
+					return NET_GetLong( data, ret, length, CL_GetSplitSize( ), CL_Protocol( ));
+
+				// GoldSrc servers (e.g. ReUnion) can split large query responses
+				if( CL_HasActiveNetRequest( *from ))
+					return NET_GetLong( data, ret, length, 1400, PROTO_GOLDSRC );
+
+				return false;
 			}
 #endif
 

engine/common/net_ws.h

@@ -89,6 +89,7 @@ void NET_GetLocalAddress( netadr_t *ip4, netadr_t *ip6 );
 #if !XASH_DEDICATED
 size_t CL_GetSplitSize( void );
 qboolean CL_IsFromConnectingServer( netadr_t from );
+qboolean CL_HasActiveNetRequest( netadr_t from );
 #endif
 
 void HTTP_AddCustomServer( const char *url );

engine/common/protocol.h

@@ -319,7 +319,6 @@ extern const char *const svc_goldsrc_strings[svc_lastmsg+1];
 #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
 

engine/platform/ios/launchdialog.m

@@ -13,41 +13,22 @@
  GNU General Public License for more details.
  */
 
-#include "SDL_syswm.h"
-#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <AVFoundation/AVFoundation.h>
-#include <sys/stat.h>
-#include "dlfcn.h"
 
 #define XASHLIB "@rpath/libxash.dylib"
 
-
-@interface XashPromptAlertViewDelegate : NSObject <UIAlertViewDelegate>
-
-@property (nonatomic, assign) int *button;
-
-@end
-
-@implementation XashPromptAlertViewDelegate
-
-- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
-	*_button = buttonIndex;
-}
-@end
-
-
-
 int szArgc;
 char **szArgv;
-char *g_szLibrarySuffix;
 float g_iOSVer;
-bool isdark;
 
-const char *IOS_GetDocsDir(void)
+//UI vars
+UIAlertController *alert;
+UIViewController *controller;
+bool finishedDialog = false;
+
+const char *IOS_GetDocsDir( void )
 {
-	if( g_iOSVer >= 8.0 )
-	{
 	static const char *dir = NULL;
 	
 	if( dir )
@@ -61,23 +42,9 @@ const char *IOS_GetDocsDir(void)
 	NSLog(@"IOS_GetDocsDir: %s", dir);
 	
 	return dir;
-	}
-	else
-	{
-		static char dir[1024];
-		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-		NSString *basePath = paths.firstObject;
-		[[NSFileManager defaultManager] createDirectoryAtPath:basePath withIntermediateDirectories:YES attributes:nil error:nil];
-		strcpy(dir,[basePath UTF8String]);
-		mkdir(dir,777);
-
-		NSLog(@"IOS_GetDocsDir: %s", dir);
-
-		return dir;
-	}
 }
 
-const char *IOS_GetExecDir(void)
+const char *IOS_GetExecDir( void )
 {
 	static const char *dir = NULL;
 	
@@ -87,7 +54,7 @@ const char *IOS_GetExecDir(void)
 	NSString *executableDirctory = [[NSBundle mainBundle] bundlePath];
 	
 	dir = [executableDirctory fileSystemRepresentation];
-	NSLog(@"IOS_GetDocsDir: %s", dir);
+	NSLog(@"IOS_GetExecDir: %s", dir);
 	
 	return dir;
 }
@@ -99,43 +66,44 @@ typedef struct settings_s
 {
 	unsigned char magic;
 	char args[1024];
-	unsigned int port;
-	char suffix[32];
-	unsigned int ftpserver;
 } settings_t;
-@interface ButtonHandler :NSObject
-@property (nonatomic, assign) int *button1;
-@end
-@implementation ButtonHandler
 
+settings_t settings;
+FILE *settingsfile;
+char settingspath[256];
 
--(void) buttonClicked:(UIButton*)sender
+static void SaveSettings( void ) 
 {
-	*_button1 = 0;
+	if( (settingsfile = fopen( settingspath, "wb" )) )
+	{
+		strlcpy( settings.args, [alert.textFields.firstObject.text UTF8String], 1024 );
+		settings.magic = 111;
+	
+		fwrite( &settings, sizeof(settings), 1, settingsfile );
+		fclose( settingsfile );
+	}
 }
-@end
-void IOS_PrepareView(void)
+
+static void IOS_PrepareView( void )
 {
-	ButtonHandler *handler = [[ButtonHandler alloc] init];
 	UIWindow *window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-	UIViewController *controller = [[UIViewController alloc] init];
-	[[controller view] setBackgroundColor:[UIColor grayColor]];
+	controller = [[UIViewController alloc] init];
+	[controller.view setBackgroundColor:[UIColor grayColor]];
 	[window setRootViewController:controller];
 	[window makeKeyAndVisible];
-	if([[controller traitCollection] userInterfaceStyle] == UIUserInterfaceStyleDark && g_iOSVer >= 13.0) isdark = true; else isdark = false;
-#if 0
-	UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(10, 10, 100, 20)];
-	int button1 = -1;
-	handler.button1 = &button1;
+	alert = [UIAlertController alertControllerWithTitle:@"Xash3D FWGS" 
+	message:nil
+	preferredStyle:UIAlertControllerStyleAlert];
 
-	[button addTarget:handler action:@selector(buttonClicked:) forControlEvents:UIControlEventValueChanged];
-	@autoreleasepool {
-		while( button1 == -1 ) {
-			[[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
-		}
-	}
-	[[controller view] addSubview:button];
-#endif
+	UIAlertAction* startAction = [UIAlertAction actionWithTitle:@"Start" style:UIAlertActionStyleDefault
+   	handler:^(UIAlertAction *action) { finishedDialog = true; }];
+	UIAlertAction* exitAction = [UIAlertAction actionWithTitle:@"Exit" style:UIAlertActionStyleDefault
+   	handler:^(UIAlertAction *action) { 
+	SaveSettings();
+	NSLog(@"Exit Selected\n");
+	exit(0); }];
+	[alert addAction:startAction];
+	[alert addAction:exitAction];
 }
 
 void IOS_LaunchDialog( void )
@@ -148,91 +116,48 @@ void IOS_LaunchDialog( void )
 	[[AVAudioSession sharedInstance] requestRecordPermission:^(BOOL granted){}];
 
 	IOS_PrepareView();	
-	int button = -1, bExit, bStart;
-	UIAlertView * alert = [[UIAlertView alloc] init];
-	bExit = [alert addButtonWithTitle:@"Exit"];
-	bStart = [alert addButtonWithTitle:@"Start"];
-	XashPromptAlertViewDelegate *delegate = [[XashPromptAlertViewDelegate alloc] init];
-	delegate.button = &button;
-	
-	alert.delegate = delegate;
 
 	const char *docsDir = IOS_GetDocsDir();
 
 	//set working directory to documents so logs can be generated there
-	NSString *workingDir = [NSString stringWithUTF8String:IOS_GetDocsDir()];
-	[[NSFileManager defaultManager] changeCurrentDirectoryPath:workingDir];
+	[[NSFileManager defaultManager] 
+	changeCurrentDirectoryPath:[NSString stringWithUTF8String:IOS_GetDocsDir()]];
 	
-	FILE *settingsfile;
-	char settingspath[256];
-	snprintf(settingspath, sizeof(settingspath), "%s/settings.bin", docsDir );
+	snprintf( settingspath, sizeof( settingspath ), "%s/settings.bin", docsDir );
 	settingspath[255] = 0;
-	settings_t settings;
-
-	[alert setTransform:CGAffineTransformMakeTranslation(0,109)];
-
-	UIScrollView *scroll = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, 300, 200)];
-
-	UILabel *argstitle = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 300, 30)];
-	[argstitle setText:@"Command-line arguments:"];
-
-	UITextField *args = [[UITextField alloc] initWithFrame:CGRectMake(0, 30, 300, 30)];
-	[args setBackgroundColor:[[UIColor alloc] initWithRed:1 green:1 blue:1 alpha:1]];
-	if(isdark) [args setBackgroundColor:[[UIColor alloc] initWithRed:0 green:0 blue:0 alpha:1]];
-	
-	
-	UITextField *suffix = [[UITextField alloc] initWithFrame:CGRectMake(140, 90, 160, 30 )];
-	[suffix setBackgroundColor:[[UIColor alloc] initWithRed:1 green:1 blue:1 alpha:1]];
-	if(isdark) [suffix setBackgroundColor:[[UIColor alloc] initWithRed:0 green:0 blue:0 alpha:1]];
-
-	UILabel *suffixtitle = [[UILabel alloc] initWithFrame:CGRectMake(0, 90, 140, 30)];
-	[suffixtitle setText:@"Library suffix"];
-
-	[scroll addSubview:argstitle];
-	[scroll addSubview:args];
-	[scroll addSubview:suffix];
-	[scroll addSubview:suffixtitle];
-
+ 
 	settingsfile = fopen( settingspath, "rb" );
-	if( settingsfile && ( fread(&settings, sizeof( settings ), 1, settingsfile ) == 1 ) && ( settings.magic == SETTINGS_MAGIC ) )
+	bool ret = false;
+	if ( settingsfile ) 
 	{
-		settings.args[1023] = 0;
-		settings.suffix[31] = 0;
-		[args setText:@(settings.args)];
-		[suffix setText:@(settings.suffix)];
-	}
-	else
-	{
-		[args setText:@"-dev 2 -log"];
+		ret = fread( &settings, sizeof( settings ), 1, settingsfile ) == 1;
 	}
 
-	scroll.contentSize=CGSizeMake(250, 200);
-	[alert setValue:scroll forKey:@"accessoryView"];
 
-	[alert show];
+	[alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+		[textField setPlaceholder:@"Launch Options"];
+		if (ret && ( settings.magic == SETTINGS_MAGIC ))
+		{
+			[textField setText:@(settings.args)];
+		}
+		else
+		{
+			[textField setText:@"-dev 2 -log"];
+		}
+		[textField setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+	}];
+
+	[controller presentViewController:alert animated:YES completion:nil];
 
 	@autoreleasepool {
-		while( button == -1 ) {
+		while( !finishedDialog ) {
 			[[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
 		}
 	}
 
-	if( (settingsfile = fopen( settingspath, "wb" )) )
-	{
-		strlcpy(settings.args, [args.text UTF8String], 1024);
-		strlcpy(settings.suffix, [suffix.text UTF8String], 32 );
-		settings.magic = 111;
-	
-		fwrite(&settings, sizeof(settings), 1, settingsfile);
-		fclose(settingsfile);
-	}
-	if( button == bExit )
-	{
-		printf("Exit selected\n");
-		exit(0);
-	}
+	NSArray *argv = [alert.textFields.firstObject.text componentsSeparatedByString:@" "];
 
-	NSArray *argv = [ args.text componentsSeparatedByString:@" " ];
+	SaveSettings();
 	
 	int count = [argv count];
 	szArgv = calloc( count + 2, sizeof( char* ) );
@@ -244,16 +169,6 @@ void IOS_LaunchDialog( void )
 	szArgc = count + 1;
 	szArgv[count + 1] = 0;
 
-	if( [suffix.text length] )
-		g_szLibrarySuffix = strdup([suffix.text UTF8String]);
-
-	alert.delegate = nil;
-
-	[args release];
-	[argstitle release];
-	[suffix release];
-	[suffixtitle release];
-
 	[alert release];
 }
 
@@ -266,7 +181,7 @@ char *IOS_GetUDID( void )
 	return udid;
 }
 
-void IOS_Log(const char *text)
+void IOS_Log( const char *text )
 {
 	NSLog(@"Xash: %@", [NSString stringWithUTF8String:text]);
 }

engine/server/server.h

@@ -542,6 +542,8 @@ void SV_UpdateServerInfo( void );
 void SV_EndRedirect( host_redirect_t *rd );
 void SV_RejectConnection( netadr_t from, const char *fmt, ... ) FORMAT_CHECK( 2 );
 void SV_GetPlayerCount( int *clients, int *bots );
+int SV_CreateChallenge( netadr_t from, qboolean *error );
+qboolean SV_ValidateChallenge( netadr_t from, int challenge );
 
 static inline qboolean SV_HavePassword( void )
 {
@@ -701,6 +703,6 @@ int SV_LightForEntity( edict_t *pEdict );
 //
 // sv_query.c
 //
-void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from );
+void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from, sizebuf_t *msg );
 
 #endif//SERVER_H

engine/server/sv_client.c

@@ -18,7 +18,6 @@ GNU General Public License for more details.
 #include "const.h"
 #include "server.h"
 #include "net_encode.h"
-#include "net_api.h"
 
 // challenges are valid for two consecutive windows of this size (max lifetime ~10s).
 #define CHALLENGE_WINDOW_SECONDS 5
@@ -110,11 +109,43 @@ static int SV_GetChallenge( netadr_t from, uint32_t time_window, qboolean *error
 	return digest[0] | digest[1] << 8 | digest[2] << 16 | digest[3] << 24;
 }
 
-static void SV_SendChallenge( netadr_t from, qboolean skip_bandwidth_test )
+/*
+=================
+SV_CreateChallenge
+=================
+*/
+int SV_CreateChallenge( netadr_t from, qboolean *error )
+{
+	uint32_t time_window = (uint32_t)( host.realtime / CHALLENGE_WINDOW_SECONDS );
+
+	return SV_GetChallenge( from, time_window, error );
+}
+
+/*
+=================
+SV_ValidateChallenge
+=================
+*/
+qboolean SV_ValidateChallenge( netadr_t from, int challenge )
 {
 	qboolean error = false;
 	uint32_t time_window = (uint32_t)( host.realtime / CHALLENGE_WINDOW_SECONDS );
-	int challenge = SV_GetChallenge( from, time_window, &error );
+
+	// accept the current window and the previous one so challenges issued just
+	// before a window boundary remain valid for the full expected lifetime
+	if( SV_GetChallenge( from, time_window, &error ) == challenge && !error )
+		return true;
+
+	if( SV_GetChallenge( from, time_window - 1, &error ) == challenge && !error )
+		return true;
+
+	return false;
+}
+
+static void SV_SendChallenge( netadr_t from, qboolean skip_bandwidth_test )
+{
+	qboolean error = false;
+	int challenge = SV_CreateChallenge( from, &error );
 
 	if( error )
 		return;
@@ -214,15 +245,7 @@ Make sure connecting client is not spoofing
 */
 static int SV_CheckChallenge( netadr_t from, int challenge )
 {
-	qboolean error = false;
-	uint32_t time_window = (uint32_t)( host.realtime / CHALLENGE_WINDOW_SECONDS );
-
-	// accept the current window and the previous one so challenges issued just
-	// before a window boundary remain valid for the full expected lifetime
-	if( SV_GetChallenge( from, time_window, &error ) == challenge && !error )
-		return true;
-
-	if( SV_GetChallenge( from, time_window - 1, &error ) == challenge && !error )
+	if( SV_ValidateChallenge( from, challenge ))
 		return true;
 
 	SV_RejectConnection( from, "no challenge for your address\n" );
@@ -466,6 +489,7 @@ static void SV_ConnectClient( netadr_t from )
 	protinfo[0] = '\0';
 	Info_SetValueForKeyf( protinfo, "ext", sizeof( protinfo ), "%d", newcl->extensions );
 	Info_SetValueForKey( protinfo, "cheats", sv_cheats.value ? "1" : "0", sizeof( protinfo ));
+	Info_SetValueForKeyf( protinfo, "challenge", sizeof( protinfo ), "%d", challenge );
 	if( FBitSet( newcl->extensions, NET_EXT_NETCHAN_COOKIE ))
 		Info_SetValueForKeyf( protinfo, "cookie", sizeof( protinfo ), "%016"PRIx64, netchan_cookie );
 
@@ -951,111 +975,6 @@ static void SV_ConnectNatClient( netadr_t from )
 	SV_Info( to, PROTOCOL_VERSION );
 }
 
-/*
-================
-SV_BuildNetAnswer
-
-Responds with long info for local and broadcast requests
-================
-*/
-static void SV_BuildNetAnswer( netadr_t from )
-{
-	const cvar_t *cv;
-	char string[4096];
-	int  version;
-	int  context;
-	int  type;
-	int  count = 0;
-	int  i;
-
-	// ignore in single player
-	if( svs.maxclients == 1 || !svs.initialized )
-		return;
-
-	version = Q_atoi( Cmd_Argv( 1 ));
-	context = Q_atoi( Cmd_Argv( 2 ));
-	type = Q_atoi( Cmd_Argv( 3 ));
-
-	string[0] = 0;
-
-	if( version != PROTOCOL_VERSION )
-	{
-		// send error unsupported protocol
-		Info_SetValueForKey( string, "neterror", "protocol", sizeof( string ));
-		Netchan_OutOfBandPrint( NS_SERVER, from, A2A_NETINFO" %i %i %s\n", context, type, string );
-		return;
-	}
-
-	switch( type )
-	{
-	case NETAPI_REQUEST_PING:
-		break;
-	case NETAPI_REQUEST_RULES:
-		for( cv = Cvar_GetList( ); cv; cv = cv->next )
-		{
-			if( !FBitSet( cv->flags, FCVAR_SERVER ))
-				continue;
-
-			if( FBitSet( cv->flags, FCVAR_PROTECTED ))
-			{
-				if( !COM_StringEmpty( cv->string ) && Q_stricmp( cv->string, "none" ))
-					Info_SetValueForKey( string, cv->name, "1", sizeof( string ));
-				else Info_SetValueForKey( string, cv->name, "0", sizeof( string ));
-			}
-			else Info_SetValueForKey( string, cv->name, cv->string, sizeof( string ));
-
-			count++;
-		}
-
-		Info_SetValueForKeyf( string, "rules", sizeof( string ), "%i", count );
-		break;
-	case NETAPI_REQUEST_PLAYERS:
-		if( !sv_expose_player_list.value || SV_HavePassword( ))
-		{
-			Info_SetValueForKey( string, "neterror", "forbidden", sizeof( string ));
-		}
-		else
-		{
-			for( i = 0; i < svs.maxclients; i++ )
-			{
-				const sv_client_t *cl = &svs.clients[i];
-
-				if( cl->state < cs_connected )
-					continue;
-
-				Info_SetValueForKey( string, va( "p%iname", count ), cl->name, sizeof( string ));
-				Info_SetValueForKeyf( string, va( "p%ifrags", count ), sizeof( string ), "%i", (int)cl->edict->v.frags );
-				Info_SetValueForKeyf( string, va( "p%itime", count ), sizeof( string ), "%f", host.realtime - cl->connection_started );
-
-				count++;
-			}
-
-			Info_SetValueForKeyf( string, "players", sizeof( string ), "%i", count );
-		}
-		break;
-	case NETAPI_REQUEST_DETAILS:
-		for( i = 0; i < svs.maxclients; i++ )
-		{
-			if( svs.clients[i].state >= cs_connected )
-				count++;
-		}
-
-		// should match SV_SourceQuery_Details
-		Info_SetValueForKey( string, "hostname", hostname.string, sizeof( string ));
-		Info_SetValueForKey( string, "gamedir", GI->gamefolder, sizeof( string ));
-		Info_SetValueForKeyf( string, "current", sizeof( string ), "%i", count );
-		Info_SetValueForKeyf( string, "max", sizeof( string ), "%i", svs.maxclients );
-		Info_SetValueForKey( string, "map", sv.name, sizeof( string ));
-		break;
-	default:
-		// send error undefined request type
-		Info_SetValueForKey( string, "neterror", "undefined", sizeof( string ));
-		break;
-	}
-
-	Netchan_OutOfBandPrint( NS_SERVER, from, A2A_NETINFO" %i %i %s\n", context, type, string );
-}
-
 /*
 ================
 Rcon_Validate
@@ -3243,11 +3162,7 @@ void SV_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 	// `pcmd` points only to the first word from the query string.
 	if( !Q_strcmp( args, A2S_GOLDSRC_INFO ) || pcmd[0] == A2S_GOLDSRC_PLAYERS || pcmd[0] == A2S_GOLDSRC_RULES )
 	{
-		SV_SourceQuery_HandleConnnectionlessPacket( args, from );
-	}
-	else if( !Q_strcmp( pcmd, A2A_NETINFO ))
-	{
-		SV_BuildNetAnswer( from );
+		SV_SourceQuery_HandleConnnectionlessPacket( args, from, msg );
 	}
 	else if( !Q_strcmp( pcmd, A2A_INFO ))
 	{

engine/server/sv_query.c

@@ -165,12 +165,49 @@ static void SV_SourceQuery_Players( netadr_t from )
 	}
 }
 
+/*
+==================
+SV_SourceQuery_CheckChallenge
+
+Validates the challenge that follows the query type byte.
+On missing, mismatched or explicitly requested (-1) challenge,
+replies with a new challenge for this address.
+==================
+*/
+static qboolean SV_SourceQuery_CheckChallenge( netadr_t from, sizebuf_t *msg )
+{
+	qboolean error = false;
+
+	MSG_SeekToBit( msg, ( sizeof( uint32_t ) + sizeof( uint8_t )) << 3, SEEK_SET );
+	int challenge = MSG_ReadLong( msg );
+
+	if( !MSG_CheckOverflow( msg ) && challenge != -1 && SV_ValidateChallenge( from, challenge ))
+		return true;
+
+	challenge = SV_CreateChallenge( from, &error );
+	if( error )
+		return false;
+
+	sizebuf_t buf;
+	char answer[16];
+
+	MSG_Init( &buf, "QueryChallenge", answer, sizeof( answer ));
+
+	MSG_WriteDword( &buf, 0xFFFFFFFFU );
+	MSG_WriteByte( &buf, S2C_GOLDSRC_CHALLENGE[0] );
+	MSG_WriteLong( &buf, challenge );
+
+	NET_SendPacket( NS_SERVER, MSG_GetNumBytesWritten( &buf ), MSG_GetData( &buf ), from );
+
+	return false;
+}
+
 /*
 ==================
 SV_SourceQuery_HandleConnnectionlessPacket
 ==================
 */
-void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from )
+void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from, sizebuf_t *msg )
 {
 	if( !Q_strcmp( c, A2S_GOLDSRC_INFO ))
 	{
@@ -179,10 +216,12 @@ void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from )
 	else switch( c[0] )
 	{
 	case A2S_GOLDSRC_RULES:
-		SV_SourceQuery_Rules( from );
+		if( SV_SourceQuery_CheckChallenge( from, msg ))
+			SV_SourceQuery_Rules( from );
 		break;
 	case A2S_GOLDSRC_PLAYERS:
-		SV_SourceQuery_Players( from );
+		if( SV_SourceQuery_CheckChallenge( from, msg ))
+			SV_SourceQuery_Players( from );
 		break;
 	}
 }

engine/wscript

@@ -47,9 +47,6 @@ def options(opt):
 	grp.add_option('--enable-static-binary', action = 'store_true', dest = 'STATIC', default = False,
 		help = 'build static binary(not recommended, --single-binary required) [default: %(default)s]')
 
-	grp.add_option('--enable-engine-fuzz', action = 'store_true', dest = 'ENGINE_FUZZ', default = False,
-		help = 'add LLVM libFuzzer [default: %(default)s]' )
-
 	grp.add_option('--enable-ffmpeg', action = 'store_true', dest = 'FFMPEG', default = False,
 		help = 'enable ffmpeg based movie playback [default: %(default)s')
 
@@ -89,9 +86,10 @@ def configure(conf):
 	elif conf.env.DEST_OS == 'dos':
 		conf.options.STATIC = True
 
-	if conf.options.ENGINE_FUZZ:
+	if conf.options.ENABLE_FUZZER:
+		conf.define('XASH_LLVM_LIBFUZZER', 1)
 		conf.env.append_unique('CFLAGS', '-fsanitize=fuzzer-no-link')
-		conf.env.append_unique('LINKFLAGS', '-fsanitize=fuzzer')
+		conf.env.append_unique('LINKFLAGS', '-fsanitize=fuzzer-no-link')
 
 	# Client-only dependencies
 	if conf.env.CLIENT:
@@ -161,7 +159,7 @@ def build(bld):
 	# public includes for renderers and utils use
 	bld(name = 'engine_includes', export_includes = '. common common/imagelib', use = 'filesystem_includes')
 
-	libs = ['engine_includes', 'public', 'werror', 'backtrace_custom', 'library_suffix', 'build_vcs', 'mbedtls']
+	libs = ['engine_includes', 'public', 'werror', 'backtrace_custom', 'library_suffix', 'build_vcs', 'mbedtls', 'yy_thunks']
 	includes = ['server', 'client', 'client/vgui', 'common/soundlib', 'platform']
 
 	# basic build: dedicated only

filesystem/VFileSystem009.cpp

@@ -28,7 +28,7 @@ GNU General Public License for more details.
 // GoldSrc Directories and ID
 // GAME          gamedir
 // GAMECONFIG    gamedir (rodir integration?)
-// GAMEDOWNLOAD  gamedir_downloads (gamedir/downloads for us)
+// GAMEDOWNLOAD  gamedir_downloads
 // GAME_FALLBACK liblist.gam's fallback_dir
 // ROOT and BASE rootdir
 // PLATFORM      platform
@@ -41,14 +41,22 @@ GNU General Public License for more details.
 	char * const var = static_cast<char *>( alloca( var ## _size )); \
 	CopyAndFixSlashes( var, ( str ), var ## _size )
 
-static inline bool IsIdGamedir( const char *id )
+static bool IsIdGamedir( const char *id )
 {
 	return !Q_strcmp( id, "GAME" ) ||
 		!Q_strcmp( id, "GAMECONFIG" ) ||
 		!Q_strcmp( id, "GAMEDOWNLOAD" );
 }
 
-static inline const char *IdToDir( char *dir, size_t size, const char *id )
+static searchpath_t *IdToWritableSearchpath( const char *id )
+{
+	if( !Q_strcmp( id, "GAME" ) || !Q_strcmp( id, "GAMECONFIG" ))
+		return fs_writepath;
+
+	return NULL;
+}
+
+static const char *IdToDir( char *dir, size_t size, const char *id )
 {
 	if( !Q_strcmp( id, "GAME" ))
 		return GI->gamefolder;
@@ -72,7 +80,7 @@ static inline const char *IdToDir( char *dir, size_t size, const char *id )
 	return fs_rootdir; // give at least root directory
 }
 
-static inline void CopyAndFixSlashes( char *p, const char *in, size_t size )
+static void CopyAndFixSlashes( char *p, const char *in, size_t size )
 {
 	Q_strncpy( p, in, size );
 	COM_FixSlashes( p );
@@ -147,10 +155,9 @@ public:
 
 	void RemoveFile( const char *path, const char *id ) override
 	{
-		char dir[MAX_VA_STRING], fullpath[MAX_VA_STRING];
-
-		Q_snprintf( fullpath, sizeof( fullpath ), "%s/%s", IdToDir( dir, sizeof( dir ), id ), path );
-		FS_Delete( fullpath ); // FS_Delete is aware of slashes
+		// FIXME: handle writable downloads path
+		if( IdToWritableSearchpath( id ))
+			FS_Delete( path ); // FS_Delete is aware of slashes
 	}
 
 	void CreateDirHierarchy( const char *path, const char *id ) override

filesystem/wscript

@@ -33,7 +33,7 @@ def configure(conf):
 def build(bld):
 	bld(name = 'filesystem_includes', export_includes = '.')
 
-	libs = [ 'filesystem_includes', 'sdk_includes', 'werror' ]
+	libs = [ 'filesystem_includes', 'sdk_includes', 'werror', 'yy_thunks' ]
 
 	# on PSVita do not link any libraries that are already in the main executable, but add the includes target
 	if bld.env.DEST_OS != 'psvita':

game_launch/wscript

@@ -32,7 +32,7 @@ def build(bld):
 
 	bld.program(source = source,
 		target   = 'xash3d', # hl.exe
-		use      = 'sdk_includes DL USER32 SHELL32 werror',
+		use      = 'sdk_includes DL USER32 SHELL32 werror yy_thunks',
 		rpath    = bld.env.DEFAULT_RPATH,
 		install_path = bld.env.BINDIR,
 		subsystem = bld.env.MSVC_SUBSYSTEM

ref/gl/gl_decals.c

@@ -721,7 +721,7 @@ void R_DecalShoot( int textureIndex, int entityIndex, int modelIndex, vec3_t pos
 
 	if( model->type != mod_brush )
 	{
-		gEngfuncs.Con_Printf( S_ERROR "Decals must hit mod_brush!\n" );
+		gEngfuncs.Con_Reportf( S_ERROR "Decals must hit mod_brush!\n" );
 		return;
 	}
 

ref/gl/gl_rsurf.c

@@ -566,7 +566,7 @@ static texture_t *R_TextureAnimation( msurface_t *s )
 R_AddDynamicLights
 ===============
 */
-static void R_AddDynamicLights( const msurface_t *surf )
+static void R_AddDynamicLights( const msurface_t *surf, float sample_size, int smax, int tmax )
 {
 	const mextrasurf_t *info = surf->info;
 	int sample_frac = 1.0;
@@ -575,9 +575,6 @@ static void R_AddDynamicLights( const msurface_t *surf )
 	if( !surf->dlightbits )
 		return;
 
-	float sample_size = gEngfuncs.Mod_SampleSizeForFace( surf );
-	int smax = (info->lightextents[0] / sample_size) + 1;
-	int tmax = (info->lightextents[1] / sample_size) + 1;
 	mtexinfo_t *tex = surf->texinfo;
 
 	if( FBitSet( tex->flags, TEX_WORLD_LUXELS ))
@@ -624,14 +621,22 @@ static void R_AddDynamicLights( const msurface_t *surf )
 		float sl = DotProduct( impact, info->lmvecs[0] ) + info->lmvecs[0][3] - info->lightmapmins[0];
 		float tl = DotProduct( impact, info->lmvecs[1] ) + info->lmvecs[1][3] - info->lightmapmins[1];
 
-		for( int t = 0; t < tmax; t++ )
+		// dist >= max( sd, td ), so a luxel can only pass the test below when both
+		// sd and td are under minlight
+		float half = ( minlight + 1.0f ) / ( sample_size * sample_frac );
+		int s0 = Q_max( 0, (int)( sl / sample_size - half ));
+		int s1 = Q_min( smax - 1, (int)( sl / sample_size + half ));
+		int t0 = Q_max( 0, (int)( tl / sample_size - half ));
+		int t1 = Q_min( tmax - 1, (int)( tl / sample_size + half ));
+
+		for( int t = t0; t <= t1; t++ )
 		{
 			int td = (tl - sample_size * t) * sample_frac;
 
 			if( td < 0 )
 				td = -td;
 
-			for( int s = 0; s < smax; s++ )
+			for( int s = s0; s <= s1; s++ )
 			{
 				int sd = (sl - sample_size * s) * sample_frac;
 				float dist;
@@ -755,7 +760,7 @@ static void R_BuildLightMap( const msurface_t *surf, byte *dest, int stride, qbo
 
 	// add all the dynamic lights
 	if( surf->dlightframe == tr.framecount && dynamic )
-		R_AddDynamicLights( surf );
+		R_AddDynamicLights( surf, sample_size, smax, tmax );
 
 	for( int t = 0; t < tmax; t++ )
 	{

ref/gl/gl_sprite.c

@@ -111,7 +111,7 @@ static float R_GetSpriteFrameInterpolant( cl_entity_t *ent, mspriteframe_t **old
 		// are positive, so we don't have to worry about division by zero
 		float targettime = time - ((int)(time / fullinterval)) * fullinterval;
 
-		// LordHavoc: since I can't measure the time properly when it loops from numframes - 1 to 0,
+		// LadyHavoc: since I can't measure the time properly when it loops from numframes - 1 to 0,
 		// i instead measure the time of the first frame, hoping it is consistent
 		int i, j;
 		for( i = 0, j = numframes - 1; i < (numframes - 1); i++ )

ref/gl/wscript

@@ -25,7 +25,7 @@ def configure(conf):
 		conf.check_cc(lib='log')
 
 def build(bld):
-	libs = [ 'ref_common', 'engine_includes', 'werror' ]
+	libs = [ 'ref_common', 'engine_includes', 'werror', 'yy_thunks' ]
 	# on PSVita do not link any libraries that are already in the main executable, but add the includes target
 	if bld.env.DEST_OS == 'psvita':
 		libs += [ 'sdk_includes', 'vgl_shim' ]

ref/null/wscript

@@ -13,6 +13,6 @@ def build(bld):
 		source   = 'r_context.c',
 		target   = 'ref_null',
 		defines  = 'REF_DLL',
-		use      = 'engine_includes sdk_includes werror',
+		use      = 'engine_includes sdk_includes werror yy_thunks',
 		install_path = bld.env.LIBDIR
 	)

ref/soft/r_decals.c

@@ -470,6 +470,8 @@ static decal_t *R_DecalIntersect( decalinfo_t *decalinfo, msurface_t *surf, int
 				}
 			}
 		}
+
+		if( pDecal == pDecal->pnext ) break;
 		pDecal = pDecal->pnext;
 	}
 	return plast;
@@ -523,7 +525,10 @@ static void R_AddDecalToSurface( decal_t *pdecal, msurface_t *surf, decalinfo_t
 	if( pold )
 	{
 		while( pold->pnext )
+		{
+			if( pold == pold->pnext ) break;
 			pold = pold->pnext;
+		}
 		pold->pnext = pdecal;
 	}
 	else
@@ -599,8 +604,10 @@ static void R_DecalSurface( msurface_t *surf, decalinfo_t *decalinfo )
 	{
 		// NOTE: we may have the decal on this surface that come from another level.
 		// check duplicate with same position and texture
-		while( decal != NULL && decal != decal->pnext )
+		while( decal != NULL )
 		{
+			if( decal == decal->pnext ) break;
+
 			if( VectorCompare( decal->position, decalinfo->m_Position ) && decal->texture == decalinfo->m_iTexture )
 				return; // decal already exists, don't place it again
 			decal = decal->pnext;
@@ -743,7 +750,7 @@ void GAME_EXPORT R_DecalShoot( int textureIndex, int entityIndex, int modelIndex
 
 	if( model->type != mod_brush )
 	{
-		gEngfuncs.Con_Printf( S_ERROR "Decals must hit mod_brush!\n" );
+		gEngfuncs.Con_Reportf( S_ERROR "Decals must hit mod_brush!\n" );
 		return;
 	}
 

ref/soft/wscript

@@ -14,7 +14,7 @@ def configure(conf):
 	return
 
 def build(bld):
-	libs = [ 'ref_common', 'engine_includes', 'werror' ]
+	libs = [ 'ref_common', 'engine_includes', 'werror', 'yy_thunks' ]
 	# on PSVita do not link any libraries that are already in the main executable, but add the includes target
 	if bld.env.DEST_OS == 'psvita':
 		libs += [ 'sdk_includes' ]

scripts/gha/deps_win32.sh

@@ -8,6 +8,11 @@ mv "SDL2-$SDL_VERSION" SDL2_VC
 
 if [ "$GH_CPU_ARCH" = "i386" ]; then
 	rustup target add i686-pc-windows-msvc
+
+	# YY-Thunks obj for Windows XP support
+	curl -L "https://github.com/Chuyu-Team/YY-Thunks/releases/download/$YY_THUNKS_VERSION/YY-Thunks-Objs.zip" -o yy-thunks.zip
+	unzip -q -j -o yy-thunks.zip 'objs/x86/YY_Thunks_for_WinXP.obj' -d 3rdparty/yy-thunks
+	rm yy-thunks.zip
 fi
 
 curl -L https://github.com/FWGS/potential-meme/releases/download/prebuilts/mingw-w64-x86_64-pkgconf-1.2.3.0-1-any.pkg.tar.zst -o pkgconf.tar.zst

scripts/waifulib/clang_format.py

@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+# encoding: utf-8
+# clang_format - `./waf format` runs clang-format -i in parallel on opted-in source files.
+# Copyright (C) 2026 Xash3D FWGS contributors
+#
+# To override clang-format binary:
+#   CLANG_FORMAT=xxx ./waf configure
+#   CLANG_FORMAT=xxx ./waf format # for post-configure override, won't check for minimum version
+#
+# Opt task gens in:
+#   bld.stlib(features='format', source='...', target='...', ...)
+
+from waflib import Build, Logs, Task, TaskGen, Utils
+import os
+import re
+import subprocess
+
+# Enforce minimum major version
+CLANG_FORMAT_MIN_MAJOR = None
+
+# File extensions to format
+CLANG_FORMAT_EXTS = ['.c', '.cpp', '.h']
+
+def probe_major(binary):
+	try:
+		out = subprocess.check_output([binary, '--version'], stderr=subprocess.DEVNULL).decode('utf-8', 'replace')
+	except (OSError, subprocess.CalledProcessError):
+		return None
+
+	m = re.search(r'version\s+(\d+)', out)
+	return int(m.group(1)) if m else None
+
+def configure(conf):
+	conf.find_program('clang-format', var='CLANG_FORMAT', mandatory=False)
+
+	if conf.env.CLANG_FORMAT and CLANG_FORMAT_MIN_MAJOR is not None:
+		major = probe_major(conf.env.CLANG_FORMAT[0])
+
+		if major is None:
+			Logs.warn('clang-format is not an executable or invalid')
+			return
+
+		if major < CLANG_FORMAT_MIN_MAJOR:
+			Logs.warn('clang-format %d found, need >= %d, format command won\'t be available' % (major, CLANG_FORMAT_MIN_MAJOR))
+			conf.env.CLANG_FORMAT = []
+			return
+
+		conf.msg('Checking clang-format version', major)
+
+class ClangFormatTask(Task.Task):
+	color = 'PINK'
+	always_run = True
+	binary = 'clang-format' # just a default, will be overriden
+
+	def keyword(self):
+		return 'Formatting'
+
+	def run(self):
+		return self.exec_command([self.binary, '-i', self.inputs[0].abspath()], env=self.env.env or None)
+
+# need this because if we add headers to to `source`
+# we can catch it in `format` feature, as nothing else
+# catches .h
+@TaskGen.extension('.h')
+def format_stub(self, node):
+	pass
+
+@TaskGen.feature('format')
+def make_format_tasks(self):
+	if self.bld.cmd != 'format':
+		return
+
+	for n in self.to_nodes(Utils.to_list(getattr(self, 'source', []))):
+		if n.suffix() in CLANG_FORMAT_EXTS:
+			self.create_task('ClangFormatTask', n)
+
+	self.source = [] # remove anything build related
+
+class FormatContext(Build.BuildContext):
+	cmd = 'format'
+	fun = 'build'
+
+	def execute(self):
+		self.restore()
+		if not self.all_envs:
+			self.load_envs()
+		self.recurse([self.run_dir])
+
+		binary = os.environ.get('CLANG_FORMAT') or (self.env.CLANG_FORMAT and self.env.CLANG_FORMAT[0])
+		if not binary:
+			self.fatal('format: clang-format not configured')
+		ClangFormatTask.binary = binary
+
+		# loops below filter taskgens by target name, format feature and by c-f task class
+		wanted = set(self.targets.split(',')) if self.targets else None
+		tasks = []
+		for group in self.groups:
+			for tg in group:
+				if not isinstance(tg, TaskGen.task_gen):
+					continue
+
+				if 'format' not in Utils.to_list(tg.features):
+					continue
+
+				if wanted and getattr(tg, 'name', None) not in wanted:
+					continue
+
+				tg.post()
+				for t in tg.tasks:
+					if isinstance(t, ClangFormatTask):
+						tasks.append(t)
+
+		if not tasks:
+			self.fatal("format: no sources matched (need features='format' on a task gen)")
+
+		Logs.info('format: %s on %d file(s)' % (binary, len(tasks)))
+		self.progress_bar = 0 # FIXME: doesn't work with progress bar for some reason
+		self.groups = [tasks]
+		self.cur_group = 0
+		self.targets = ''
+		self.compile()

utils/mdldec/wscript

@@ -19,7 +19,7 @@ def build(bld):
 	bld.program(source   = bld.path.ant_glob('*.c'),
 		target   = 'mdldec',
 		includes = '.',
-		use      = 'engine_includes public M werror',
+		use      = 'engine_includes public M werror yy_thunks',
 		install_path = bld.env.BINDIR,
 		subsystem = bld.env.CONSOLE_SUBSYSTEM
 	)

utils/run-fuzzer/run-fuzzer.c

@@ -1,4 +1,5 @@
 #include <dlfcn.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -6,12 +7,13 @@
 #error
 #endif
 
-typedef int (*FuzzFunc)(const char *Data, size_t Size);
+typedef int (*FuzzFunc)(const uint8_t *Data, size_t Size);
 
-void *handle = NULL;
-FuzzFunc f = NULL;
+static void *handle = NULL;
+static FuzzFunc f = NULL;
 
-int LLVMFuzzerTestOneInput( const char *Data, size_t Size )
+int LLVMFuzzerTestOneInput( const uint8_t *Data, size_t Size );
+int LLVMFuzzerTestOneInput( const uint8_t *Data, size_t Size )
 {
 	if( !handle )
 		handle = dlopen( LIB, RTLD_NOW );

utils/run-fuzzer/wscript

@@ -37,4 +37,6 @@ def build(bld):
 	add_runner_target(bld, 'libxash.so', 'Image_LoadPNG')
 	add_runner_target(bld, 'libxash.so', 'Image_LoadDDS')
 	add_runner_target(bld, 'libxash.so', 'Image_LoadTGA')
+	add_runner_target(bld, 'libxash.so', 'Image_LoadSPR')
 	add_runner_target(bld, 'libxash.so', 'Mod_LoadModel')
+	add_runner_target(bld, 'libxash.so', 'Mod_LoadSpriteModel')

utils/xar/wscript

@@ -12,7 +12,7 @@ def build(bld):
 	bld.program(source   = bld.path.ant_glob('*.c'),
 		target   = 'xar',
 		includes = '.',
-		use      = 'public filesystem_includes werror',
+		use      = 'public filesystem_includes werror yy_thunks',
 		rpath = bld.env.DEFAULT_RPATH,
 		install_path = bld.env.BINDIR,
 		subsystem = bld.env.CONSOLE_SUBSYSTEM

utils/xash-clang-format/config.c

@@ -0,0 +1,91 @@
+/*
+config.c - .clang-format extension parser
+Copyright (C) 2026 Xash3D FWGS contributors
+
+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 <string.h>
+#include "crtlib.h"
+#include "xcf.h"
+
+#define XCF_KEY "XashCollapseParens"
+
+/*
+============
+ConfigDefault
+============
+*/
+static void ConfigDefault( xcf_config_t *c )
+{
+	c->collapse_parens = false;
+}
+
+/*
+============
+SkipWhitespace
+============
+*/
+static const char *SkipWhitespace( const char *p, const char *end )
+{
+	for( ; p < end && ( *p == ' ' || *p == '\t' ); p++ )
+		;
+	return p;
+}
+
+/*
+============
+ParseConfigText
+
+Parse extension keys out of a YAML text body.
+We only look at lines that begin (after optional whitespace) with `#`.
+============
+*/
+qboolean ParseConfigText( const char *text, xcf_config_t *cfg )
+{
+	ConfigDefault( cfg );
+	if( !text )
+		return true;
+
+	for( const char *p = text; *p; )
+	{
+		const char *end = Q_strchrnul( p, '\n' );
+		const char *q;
+		const size_t klen = sizeof( XCF_KEY ) - 1;
+
+		q = SkipWhitespace( p, end );
+
+		if( q < end && *q == '#' )
+		{
+			q = SkipWhitespace( q + 1, end );
+
+			if( end - q >= klen && memcmp( q, XCF_KEY, klen ) == 0 )
+			{
+				q = SkipWhitespace( q + klen, end );
+
+				if( q < end && *q == ':' )
+				{
+					q = SkipWhitespace( q + 1, end );
+
+					if( end - q >= 4 && memcmp( q, "true", 4 ) == 0 )
+						cfg->collapse_parens = true;
+					else if( end - q >= 5 && memcmp( q, "false", 5 ) == 0 )
+						cfg->collapse_parens = false;
+				}
+			}
+		}
+
+		if( !*end )
+			break;
+		p = end + 1;
+	}
+
+	return true;
+}

utils/xash-clang-format/main.c

@@ -0,0 +1,402 @@
+/*
+main.c - xash-clang-format wrapper entry point
+Copyright (C) 2026 Xash3D FWGS contributors
+
+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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include "crtlib.h"
+#include "xcf.h"
+
+#ifndef XCF_CLANG_FORMAT_DEFAULT
+#define XCF_CLANG_FORMAT_DEFAULT "clang-format"
+#endif
+
+// TODO: move to custom config keys
+#define XCF_MIN_CLANG_FORMAT_MAJOR 17
+
+static const char *g_clang_format = NULL;
+
+/*
+============
+ResolveClangFormat
+============
+*/
+static const char *ResolveClangFormat( void )
+{
+	const char *e = getenv( "XASH_CLANG_FORMAT_BIN" );
+
+	if( !COM_StringEmptyOrNULL( e ))
+		return e;
+
+	return XCF_CLANG_FORMAT_DEFAULT;
+}
+
+/*
+============
+IsFileArg
+
+Attempt to distinguish files from other args.
+But to keep parsing args simple, it will parse value as --key value as
+filename. :(
+============
+*/
+static qboolean IsFileArg( const char *a )
+{
+	if( COM_StringEmptyOrNULL( a ))
+		return false;
+	if( a[0] == '-' )
+		return false;
+	return true;
+}
+
+/*
+============
+ReadTheFile
+
+============
+*/
+static qboolean ReadTheFile( const char *path, xcf_buf_t *out )
+{
+	FILE *f = fopen( path, "rb" );
+
+	if( !f )
+		return false;
+
+	char buf[8192];
+	size_t n;
+
+	while(( n = fread( buf, 1, sizeof( buf ), f )) > 0 )
+	{
+		if( !BufPutMem( out, buf, n ))
+		{
+			fclose( f );
+			return false;
+		}
+	}
+
+	fclose( f );
+	return true;
+}
+
+/*
+============
+WriteTheFile
+
+============
+*/
+static qboolean WriteTheFile( const char *path, const char *data, size_t len )
+{
+	FILE *f = fopen( path, "wb" );
+
+	if( !f )
+		return false;
+	if( fwrite( data, 1, len, f ) != len )
+	{
+		fclose( f );
+		return false;
+	}
+	if( fclose( f ) != 0 )
+		return false;
+	return true;
+}
+
+/*
+============
+FindConfig
+============
+*/
+static char *FindConfig( const char *startdir )
+{
+	char dir[MAX_SYSPATH];
+
+	if( startdir )
+	{
+		Q_strncpy( dir, startdir, sizeof( dir ));
+	}
+	else if( !getcwd( dir, sizeof( dir )))
+	{
+		return NULL;
+	}
+
+	for( ;; )
+	{
+		char path[MAX_SYSPATH];
+		struct stat st;
+		char *slash;
+
+		Q_snprintf( path, sizeof( path ), "%s/.clang-format", dir );
+
+		if( stat( path, &st ) == 0 && S_ISREG( st.st_mode ))
+		{
+			size_t len = Q_strlen( path ) + 1;
+			char *r = malloc( len );
+
+			if( r )
+				Q_strncpy( r, path, len );
+			return r;
+		}
+
+		slash = Q_strrchr( dir, '/' );
+		if( !slash || slash == dir )
+			break;
+		*slash = 0;
+	}
+
+	return NULL;
+}
+
+/*
+============
+LoadConfig
+============
+*/
+static qboolean LoadConfig( const char *path, xcf_config_t *cfg )
+{
+	xcf_buf_t buf = { 0 };
+	qboolean ok = false;
+
+	if( path && ReadTheFile( path, &buf ) && BufPutChar( &buf, 0 ))
+		ok = ParseConfigText( buf.data, cfg );
+	else
+		ParseConfigText( "", cfg );
+
+	BufFree( &buf );
+	return ok;
+}
+
+/*
+============
+Emit
+
+Transform pass on buffer and output to file
+============
+*/
+static qboolean Emit( const xcf_config_t *cfg, const xcf_buf_t *raw, FILE *dst, const char *write_path )
+{
+	xcf_buf_t out = { 0 };
+	const char *data;
+	size_t len;
+	if( cfg->collapse_parens && Transform( raw->data, raw->len, &out ))
+	{
+		data = out.data;
+		len = out.len;
+	}
+	else
+	{
+		data = raw->data;
+		len = raw->len;
+	}
+
+	qboolean ok = true;
+	if( write_path )
+	{
+		if( !WriteTheFile( write_path, data, len ))
+		{
+			fprintf( stderr, "xash-clang-format: cannot write %s: %s\n", write_path, strerror( errno ));
+			ok = false;
+		}
+	}
+	else if( len )
+	{
+		if( fwrite( data, 1, len, dst ) != len )
+			ok = false;
+	}
+
+	BufFree( &out );
+	return ok;
+}
+
+/*
+============
+PipeMode
+
+Process stdout (when clang-format called without -i)
+============
+*/
+static int PipeMode( int argc, char **argv, const xcf_config_t *cfg )
+{
+	char **fwd = malloc( sizeof( char * ) * ( argc + 1 ));
+	if( !fwd )
+		return 1;
+
+	fwd[0] = (char *)g_clang_format;
+	for( int i = 1; i < argc; i++ )
+		fwd[i] = argv[i];
+	fwd[argc] = NULL;
+
+	xcf_buf_t raw = { 0 };
+	int rc = RunCapture( fwd, &raw, false );
+	free( fwd );
+
+	if( rc != 0 )
+	{
+		// pass through whatever clang-format produced
+		if( raw.len )
+			fwrite( raw.data, 1, raw.len, stdout );
+		BufFree( &raw );
+		return rc < 0 ? 1 : rc;
+	}
+
+	rc = Emit( cfg, &raw, stdout, NULL ) ? 0 : 1;
+	BufFree( &raw );
+	return rc;
+}
+
+/*
+============
+PostProcessFile
+
+Read `path`, run the paren-collapse pass, write result back.
+============
+*/
+static qboolean PostProcessFile( const char *path )
+{
+	xcf_buf_t in = { 0 };
+	xcf_buf_t out = { 0 };
+	qboolean ok = false;
+
+	if( ReadTheFile( path, &in ) && Transform( in.data, in.len, &out ))
+		ok = WriteTheFile( path, out.data, out.len );
+
+	BufFree( &in );
+	BufFree( &out );
+	return ok;
+}
+
+/*
+============
+InPlaceMode
+
+Post-process mode, when clang-format is called with -i
+============
+*/
+static int InPlaceMode( int argc, char **argv, const xcf_config_t *cfg )
+{
+	char **fwd = malloc( sizeof( char * ) * ( argc + 1 ));
+
+	if( !fwd )
+		return 1;
+
+	fwd[0] = (char *)g_clang_format;
+	for( int i = 1; i < argc; i++ )
+		fwd[i] = argv[i];
+	fwd[argc] = NULL;
+
+	xcf_buf_t sink = { 0 };
+	int rc = RunCapture( fwd, &sink, false );
+
+	BufFree( &sink );
+	free( fwd );
+
+	if( rc != 0 )
+		return rc < 0 ? 1 : rc;
+
+	if( !cfg->collapse_parens )
+		return 0;
+
+	for( int i = 1; i < argc; i++ )
+	{
+		if( !IsFileArg( argv[i] ))
+			continue;
+		if( !PostProcessFile( argv[i] ))
+		{
+			fprintf( stderr, "xash-clang-format: post-process failed for %s\n", argv[i] );
+			rc = 1;
+		}
+	}
+	return rc;
+}
+
+static void Usage( FILE *dst )
+{
+	fprintf( dst,
+		"xash-clang-format: clang-format wrapper with xash3d-fwgs extensions\n"
+		"\n"
+		"Usage: xash-clang-format [clang-format options] [<file> ...]\n"
+		"       xash-clang-format -i <file> ...\n"
+		"\n"
+		"Most clang-format flags are forwarded as-is but there are limitations:\n"
+		"* --key value must be passed as --key=value\n"
+		"\n"
+		"Use XASH_CLANG_FORMAT_BIN envvar to override the clang-format binary;\n"
+		" setting it also skips the version probe.\n"
+		"\n"
+		"Wrapper's config is shared with clang-format config, but extended keys\n"
+		" start with comment hash.\n"
+		"New keys:\n"
+		"    XashCollapseParens, accepts 'true' or 'false'\n" );
+}
+
+int main( int argc, char **argv )
+{
+	g_clang_format = ResolveClangFormat();
+
+	qboolean has_inplace = false;
+	qboolean has_version = false;
+	qboolean has_help = false;
+
+	for( int i = 1; i < argc; i++ )
+	{
+		if( Q_strcmp( argv[i], "-i" ) == 0 )
+			has_inplace = true;
+		else if( Q_strcmp( argv[i], "--version" ) == 0 || Q_strcmp( argv[i], "-version" ) == 0 )
+			has_version = true;
+		else if( Q_strcmp( argv[i], "--help" ) == 0 || Q_strcmp( argv[i], "-h" ) == 0 || Q_strcmp( argv[i], "-help" ) == 0 )
+			has_help = true;
+	}
+
+	if( has_help )
+	{
+		Usage( stdout );
+		return 0;
+	}
+
+	if( has_version )
+	{
+		// transparent passthrough so tools that scrape `clang-format --version`
+		// (e.g. git clang-format auto-detection) keep working
+		execlp( g_clang_format, g_clang_format, "--version", (char *)NULL );
+		fprintf( stderr, "xash-clang-format: cannot exec %s: %s\n", g_clang_format, strerror( errno ));
+		return 127;
+	}
+
+	// if caller sets XASH_CLANG_FORMAT_BIN — they own version compatibility
+	// so skip the probe (lets ./waf format do the check once for parallel invocation)
+	if( COM_StringEmptyOrNULL( getenv( "XASH_CLANG_FORMAT_BIN" )))
+	{
+		int major = 0;
+
+		if( !ClangFormatVersion( g_clang_format, &major ))
+		{
+			fprintf( stderr, "xash-clang-format: cannot probe clang-format version (binary: %s)\n", g_clang_format );
+			return 2;
+		}
+		if( major < XCF_MIN_CLANG_FORMAT_MAJOR )
+		{
+			fprintf( stderr, "xash-clang-format: clang-format %d found, need >= %d\n",
+				major, XCF_MIN_CLANG_FORMAT_MAJOR );
+			return 2;
+		}
+	}
+
+	xcf_config_t cfg;
+	char *cfgpath = FindConfig( NULL );
+	LoadConfig( cfgpath, &cfg );
+	free( cfgpath );
+
+	return has_inplace ? InPlaceMode( argc, argv, &cfg ) : PipeMode( argc, argv, &cfg );
+}

utils/xash-clang-format/proc.c

@@ -0,0 +1,99 @@
+/*
+proc.c - subprocess utilities
+Copyright (C) 2026 Xash3D FWGS contributors
+
+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 <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include "xcf.h"
+
+/*
+============
+RunCapture
+
+Spawn argv as a child, capture stdout into `out`.
+============
+*/
+int RunCapture( char *const argv[], xcf_buf_t *out, qboolean silent_stderr )
+{
+	int p[2];
+	pid_t pid;
+	char buf[8192];
+	int status;
+
+	if( pipe( p ) < 0 )
+		return -1;
+
+	pid = fork();
+	if( pid < 0 )
+	{
+		close( p[0] );
+		close( p[1] );
+		return -1;
+	}
+
+	if( pid == 0 )
+	{
+		close( p[0] );
+		dup2( p[1], STDOUT_FILENO );
+		close( p[1] );
+		if( silent_stderr )
+		{
+			int devnull = open( "/dev/null", O_WRONLY );
+
+			if( devnull >= 0 )
+			{
+				dup2( devnull, STDERR_FILENO );
+				close( devnull );
+			}
+		}
+		execvp( argv[0], argv );
+		_exit( 127 );
+	}
+
+	close( p[1] );
+
+	for( ;; )
+	{
+		ssize_t r = read( p[0], buf, sizeof( buf ));
+
+		if( r < 0 )
+		{
+			if( errno == EINTR )
+				continue;
+			break;
+		}
+		if( r == 0 )
+			break;
+		if( !BufPutMem( out, buf, r ))
+		{
+			close( p[0] );
+			kill( pid, SIGKILL );
+			waitpid( pid, NULL, 0 );
+			return -1;
+		}
+	}
+	close( p[0] );
+
+	if( waitpid( pid, &status, 0 ) < 0 )
+		return -1;
+
+	// heh wife excited
+	if( WIFEXITED( status ))
+		return WEXITSTATUS( status );
+
+	return -1;
+}

utils/xash-clang-format/tests/test_config.c

@@ -0,0 +1,77 @@
+#include <stdio.h>
+#include "xcf.h"
+
+static int run_case( const char *label, const char *yaml, qboolean expect )
+{
+	xcf_config_t cfg;
+
+	ParseConfigText( yaml, &cfg );
+
+	if( cfg.collapse_parens != expect )
+	{
+		fprintf( stderr, "[%s] collapse_parens=%d, expected %d\n  yaml:\n%s\n",
+			label, cfg.collapse_parens, expect, yaml );
+		return 0;
+	}
+	return 1;
+}
+
+int main( void )
+{
+	int n = 0;
+
+	if( !run_case( "empty", "", false ))
+		return ++n;
+
+	xcf_config_t cfg2;
+
+	ParseConfigText( NULL, &cfg2 );
+	if( cfg2.collapse_parens )
+		return ++n;
+
+	if( !run_case( "explicit true",
+			"# XashCollapseParens: true\n", true ))
+		return ++n;
+
+	if( !run_case( "explicit false",
+			"# XashCollapseParens: false\n", false ))
+		return ++n;
+
+	if( !run_case( "leading ws",
+			"   # XashCollapseParens: true\n", true ))
+		return ++n;
+
+	if( !run_case( "tabs",
+			"#\tXashCollapseParens\t:\ttrue\n", true ))
+		return ++n;
+
+	if( !run_case( "unrelated key",
+			"# SomeOtherKey: true\nIndentWidth: 4\n", false ))
+		return ++n;
+
+	if( !run_case( "in larger config",
+			"---\n"
+			"Language: Cpp\n"
+			"# XashCollapseParens: true\n"
+			"IndentWidth: 4\n",
+			true ))
+		return ++n;
+
+	if( !run_case( "junk value",
+			"# XashCollapseParens: maybe\n", false ))
+		return ++n;
+
+	if( !run_case( "no colon",
+			"# XashCollapseParens true\n", false ))
+		return ++n;
+
+	if( !run_case( "last wins",
+			"# XashCollapseParens: false\n# XashCollapseParens: true\n", true ))
+		return ++n;
+
+	if( !run_case( "no trailing nl",
+			"# XashCollapseParens: true", true ))
+		return ++n;
+
+	return 0;
+}

utils/xash-clang-format/tests/test_transform.c

@@ -0,0 +1,171 @@
+#include <stdio.h>
+#include <string.h>
+#include "xcf.h"
+
+static int run_case( const char *label, const char *in, const char *expect )
+{
+	xcf_buf_t out = { 0 };
+	int ok;
+
+	if( !Transform( in, strlen( in ), &out ))
+	{
+		fprintf( stderr, "[%s] Transform returned error\n", label );
+		BufFree( &out );
+		return 0;
+	}
+
+	ok = ( out.len == strlen( expect ) && memcmp( out.data, expect, out.len ) == 0 );
+
+	if( !ok )
+	{
+		fprintf( stderr, "[%s] mismatch\n  in:     %s\n  out:    %.*s\n  expect: %s\n",
+			label, in, (int)out.len, out.data, expect );
+	}
+
+	BufFree( &out );
+	return ok;
+}
+
+int main( void )
+{
+	int n = 0;
+
+	if( !run_case( "outer parens",
+			"if( ( a + b ) )\n",
+			"if(( a + b ))\n" ))
+		return ++n;
+
+	if( !run_case( "triple nesting",
+			"x = ( ( ( a ) ) );\n",
+			"x = ((( a )));\n" ))
+		return ++n;
+
+	if( !run_case( "mixed [ )",
+			"arr[i] )\n",
+			"arr[i] )\n" ))
+		return ++n;
+	if( !run_case( "mixed ) ]",
+			"f( a ) ];\n",
+			"f( a ) ];\n" ))
+		return ++n;
+
+	if( !run_case( "newline boundary",
+			"(\n(\n",
+			"(\n(\n" ))
+		return ++n;
+
+	if( !run_case( "string literal",
+			"x = \"( ( hello ) )\";\n",
+			"x = \"( ( hello ) )\";\n" ))
+		return ++n;
+
+	if( !run_case( "escaped quote in string",
+			"x = \"a \\\" ( ( b ) ) \";\n",
+			"x = \"a \\\" ( ( b ) ) \";\n" ))
+		return ++n;
+
+	if( !run_case( "line comment",
+			"a; // ( ( comment ) )\nb;\n",
+			"a; // ( ( comment ) )\nb;\n" ))
+		return ++n;
+
+	if( !run_case( "block comment",
+			"/* ( ( leave\nthis ) ) alone */ x;\n",
+			"/* ( ( leave\nthis ) ) alone */ x;\n" ))
+		return ++n;
+
+	if( !run_case( "char literal '('",
+			"if( c == '(' )\n",
+			"if( c == '(' )\n" ))
+		return ++n;
+
+	if( !run_case( "raw string",
+			"const char *s = R\"x(( (\nstays )x\";\n",
+			"const char *s = R\"x(( (\nstays )x\";\n" ))
+		return ++n;
+
+	if( !run_case( "raw string empty delim",
+			"R\"(( (\n))\"",
+			"R\"(( (\n))\"" ))
+		return ++n;
+
+	if( !run_case( "ident Rabbit not raw",
+			"int Rabbit = ( ( 1 ) );\n",
+			"int Rabbit = (( 1 ));\n" ))
+		return ++n;
+
+	if( !run_case( "u8R raw",
+			"const auto s = u8R\"(( ( )\";\n",
+			"const auto s = u8R\"(( ( )\";\n" ))
+		return ++n;
+
+	if( !run_case( "include angle",
+			"#include <foo.h>\nf( ( x ) );\n",
+			"#include <foo.h>\nf(( x ));\n" ))
+		return ++n;
+
+	if( !run_case( "tabs between parens",
+			"f(\t(\tx\t)\t);\n",
+			"f((\tx\t));\n" ))
+		return ++n;
+
+	if( !run_case( "empty", "", "" ))
+		return ++n;
+
+	if( !run_case( "idempotent",
+			"f((( x )));\n",
+			"f((( x )));\n" ))
+		return ++n;
+
+	if( !run_case( "already touching",
+			"((a))",
+			"((a))" ))
+		return ++n;
+
+	if( !run_case( "single paren",
+			"f( a, b )",
+			"f( a, b )" ))
+		return ++n;
+
+	if( !run_case( "multiple pairs",
+			"f( ( a ) ) + g( ( b ) );\n",
+			"f(( a )) + g(( b ));\n" ))
+		return ++n;
+
+	if( !run_case( "L wide string",
+			"wchar_t *s = L\"( ( x ) )\";\n",
+			"wchar_t *s = L\"( ( x ) )\";\n" ))
+		return ++n;
+
+	if( !run_case( "u utf16 string",
+			"auto s = u\"( ( x ) )\";\n",
+			"auto s = u\"( ( x ) )\";\n" ))
+		return ++n;
+
+	if( !run_case( "U utf32 string",
+			"auto s = U\"( ( x ) )\";\n",
+			"auto s = U\"( ( x ) )\";\n" ))
+		return ++n;
+
+	if( !run_case( "u8 utf8 string",
+			"auto s = u8\"( ( x ) )\";\n",
+			"auto s = u8\"( ( x ) )\";\n" ))
+		return ++n;
+
+	if( !run_case( "L wide char",
+			"if( c == L'(' )\n",
+			"if( c == L'(' )\n" ))
+		return ++n;
+
+	if( !run_case( "u8 char",
+			"if( c == u8'(' )\n",
+			"if( c == u8'(' )\n" ))
+		return ++n;
+
+	if( !run_case( "ident L not prefix",
+			"int callL = ( ( 1 ) );\n",
+			"int callL = (( 1 ));\n" ))
+		return ++n;
+
+	return 0;
+}

utils/xash-clang-format/tests/test_version.c

@@ -0,0 +1,58 @@
+#include <stdio.h>
+#include "xcf.h"
+
+static int run_case( const char *label, const char *s, qboolean expect_ok, int expect_major )
+{
+	int major = -1;
+	qboolean ok = ParseVersion( s, &major );
+
+	if( ok != expect_ok )
+	{
+		fprintf( stderr, "[%s] ok=%d expected %d (input: %s)\n", label, ok, expect_ok, s ? s : "(null)" );
+		return 0;
+	}
+	if( ok && major != expect_major )
+	{
+		fprintf( stderr, "[%s] major=%d expected %d (input: %s)\n", label, major, expect_major, s );
+		return 0;
+	}
+	return 1;
+}
+
+int main( void )
+{
+	int n = 0;
+
+	if( !run_case( "vanilla 17",
+			"clang-format version 17.0.6 (Fedora 17.0.6-1.fc40)\n", true, 17 ))
+		return ++n;
+
+	if( !run_case( "ubuntu 18",
+			"Ubuntu clang-format version 18.1.3 (1ubuntu1)\n", true, 18 ))
+		return ++n;
+
+	if( !run_case( "large major",
+			"clang-format version 100.0.0\n", true, 100 ))
+		return ++n;
+
+	if( !run_case( "garbage",
+			"this has no version here\n", false, 0 ))
+		return ++n;
+
+	if( !run_case( "null", NULL, false, 0 ))
+		return ++n;
+
+	if( !run_case( "distro tag with digits",
+			"Ubuntu99 clang-format version 17.0.6\n", true, 17 ))
+		return ++n;
+
+	if( !run_case( "bare digits",
+			"foo 42 bar\n", false, 0 ))
+		return ++n;
+
+	if( !run_case( "no version word",
+			"fake clang-format 19.1.0\n", false, 0 ))
+		return ++n;
+
+	return 0;
+}

utils/xash-clang-format/transform.c

@@ -0,0 +1,325 @@
+/*
+transform.c - source post-processing pass
+Copyright (C) 2026 Xash3D FWGS contributors
+
+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 <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "xcf.h"
+
+#define XCF_RAW_DELIM_MAX 16 // C++11: 16 chars max in raw-string delimiter
+
+/*
+============
+BufFree
+
+============
+*/
+void BufFree( xcf_buf_t *b )
+{
+	free( b->data );
+	b->data = NULL;
+	b->len = b->cap = 0;
+}
+
+/*
+============
+BufGrow
+
+============
+*/
+static qboolean BufGrow( xcf_buf_t *b, size_t need )
+{
+	size_t cap;
+	char *p;
+
+	if( b->len + need <= b->cap )
+		return true;
+
+	cap = b->cap ? b->cap : 256;
+	while( cap < b->len + need )
+		cap *= 2;
+
+	p = realloc( b->data, cap );
+	if( !p )
+		return false;
+
+	b->data = p;
+	b->cap = cap;
+	return true;
+}
+
+/*
+============
+BufPutChar
+
+============
+*/
+qboolean BufPutChar( xcf_buf_t *b, char c )
+{
+	if( !BufGrow( b, 1 ))
+		return false;
+	b->data[b->len++] = c;
+	return true;
+}
+
+/*
+============
+BufPutMem
+
+============
+*/
+qboolean BufPutMem( xcf_buf_t *b, const char *src, size_t n )
+{
+	if( !n )
+		return true;
+	if( !BufGrow( b, n ))
+		return false;
+	memcpy( b->data + b->len, src, n );
+	b->len += n;
+	return true;
+}
+
+/*
+============
+TryCollapse
+
+Collapse spaces between the same type parentheses
+============
+*/
+static void TryCollapse( xcf_buf_t *out, char paren )
+{
+	size_t i = out->len;
+
+	while( i > 0 && ( out->data[i - 1] == ' ' || out->data[i - 1] == '\t' ))
+		i--;
+
+	if( i == 0 || i == out->len )
+		return; // nothing to collapse, or no whitespace between
+
+	if( out->data[i - 1] != paren )
+		return; // different bracket types or different char entirely
+
+	out->len = i;
+}
+
+/*
+============
+DetectRaw
+
+Detect C++11 raw string because why not
+============
+*/
+static qboolean DetectRaw( const char *s, size_t len, size_t i, size_t *prefix_end, size_t *paren )
+{
+	size_t j = i, k;
+
+	// must not be in the middle of an identifier
+	if( i > 0 && ( isalnum( s[i - 1] ) || s[i - 1] == '_' ))
+		return false;
+
+	if( j + 2 < len && s[j] == 'u' && s[j + 1] == '8' && s[j + 2] == 'R' )
+		j += 3;
+	else if( j + 1 < len && ( s[j] == 'u' || s[j] == 'U' || s[j] == 'L' ) && s[j + 1] == 'R' )
+		j += 2;
+	else if( j < len && s[j] == 'R' )
+		j += 1;
+	else
+		return false;
+
+	if( j >= len || s[j] != '"' )
+		return false;
+	j++; // past the opening quote
+	*prefix_end = j;
+
+	k = j;
+	while( k < len && s[k] != '(' && k - j < XCF_RAW_DELIM_MAX )
+		k++;
+
+	if( k >= len || s[k] != '(' )
+		return false;
+
+	*paren = k;
+	return true;
+}
+
+enum
+{
+	S_NORMAL,
+	S_LINE_CMT,
+	S_BLOCK_CMT,
+	S_STRING,
+	S_CHAR,
+	S_RAW,
+};
+
+/*
+============
+Transform
+
+Parse source, find parens and try collapse them
+============
+*/
+qboolean Transform( const char *in, size_t in_len, xcf_buf_t *out )
+{
+	size_t raw_dlen = 0;
+	char raw_delim[XCF_RAW_DELIM_MAX + 1];
+	int state = S_NORMAL;
+
+	for( size_t i = 0; i < in_len; i++ )
+	{
+		char c1 = in[i];
+		char c2 = ( i + 1 < in_len ) ? in[i + 1] : 0;
+
+		switch( state )
+		{
+		case S_NORMAL:
+		{
+			size_t pe, pp;
+
+			if( c1 == '/' && c2 == '/' )
+			{
+				if( !BufPutMem( out, in + i, 2 ))
+					return false;
+				i++;
+				state = S_LINE_CMT;
+				break;
+			}
+
+			if( c1 == '/' && c2 == '*' )
+			{
+				if( !BufPutMem( out, in + i, 2 ))
+					return false;
+				i++;
+				state = S_BLOCK_CMT;
+				break;
+			}
+
+			if( DetectRaw( in, in_len, i, &pe, &pp ))
+			{
+				size_t dl = pp - pe;
+
+				if( dl > XCF_RAW_DELIM_MAX )
+					dl = XCF_RAW_DELIM_MAX;
+
+				if( !BufPutMem( out, in + i, pp - i + 1 ))
+					return false;
+				memcpy( raw_delim, in + pe, dl );
+				raw_delim[dl] = 0;
+				raw_dlen = dl;
+				i = pp; // sit on the '('
+				state = S_RAW;
+				break;
+			}
+
+			if( c1 == '"' )
+			{
+				if( !BufPutChar( out, c1 ))
+					return false;
+				state = S_STRING;
+				break;
+			}
+
+			if( c1 == '\'' )
+			{
+				if( !BufPutChar( out, c1 ))
+					return false;
+				state = S_CHAR;
+				break;
+			}
+
+			if( c1 == '(' || c1 == ')' )
+				TryCollapse( out, c1 );
+
+			if( !BufPutChar( out, c1 ))
+				return false;
+			break;
+		}
+
+		case S_LINE_CMT:
+			if( !BufPutChar( out, c1 ))
+				return false;
+			if( c1 == '\n' )
+				state = S_NORMAL;
+			break;
+
+		case S_BLOCK_CMT:
+			if( !BufPutChar( out, c1 ))
+				return false;
+			if( c1 == '*' && c2 == '/' )
+			{
+				if( !BufPutChar( out, c2 ))
+					return false;
+				i++;
+				state = S_NORMAL;
+			}
+			break;
+
+		case S_STRING:
+			if( !BufPutChar( out, c1 ))
+				return false;
+			if( c1 == '\\' && c2 )
+			{
+				if( !BufPutChar( out, c2 ))
+					return false;
+				i++;
+			}
+			else if( c1 == '"' )
+			{
+				state = S_NORMAL;
+			}
+			else if( c1 == '\n' )
+			{
+				// unterminated; recover at next line
+				state = S_NORMAL;
+			}
+			break;
+
+		case S_CHAR:
+			if( !BufPutChar( out, c1 ))
+				return false;
+			if( c1 == '\\' && c2 )
+			{
+				if( !BufPutChar( out, c2 ))
+					return false;
+				i++;
+			}
+			else if( c1 == '\'' )
+			{
+				state = S_NORMAL;
+			}
+			else if( c1 == '\n' )
+			{
+				state = S_NORMAL;
+			}
+			break;
+
+		case S_RAW:
+			if( !BufPutChar( out, c1 ))
+				return false;
+			if( c1 == ')'
+				&& i + 1 + raw_dlen + 1 <= in_len
+				&& memcmp( in + i + 1, raw_delim, raw_dlen ) == 0
+				&& in[i + 1 + raw_dlen] == '"' )
+			{
+				if( !BufPutMem( out, in + i + 1, raw_dlen + 1 ))
+					return false;
+				i += raw_dlen + 1;
+				state = S_NORMAL;
+			}
+			break;
+		}
+	}
+
+	return true;
+}

utils/xash-clang-format/version.c

@@ -0,0 +1,67 @@
+/*
+version.c - clang-format version probe
+Copyright (C) 2026 Xash3D FWGS contributors
+
+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 "crtlib.h"
+#include "xcf.h"
+
+/*
+============
+ParseVersion
+
+Parse the major version number out of a `clang-format --version`
+============
+*/
+qboolean ParseVersion( const char *s, int *major )
+{
+	const char *p;
+
+	if( COM_StringEmptyOrNULL( s ) || !major )
+		return false;
+
+	// anchor on "version "
+	p = Q_strstr( s, "version " );
+	if( !p )
+		return false;
+	p += sizeof( "version " ) - 1;
+
+	while( *p == ' ' || *p == '\t' )
+		p++;
+	if( *p < '0' || *p > '9' )
+		return false;
+
+	*major = Q_atoi( p );
+	return true;
+}
+
+/*
+============
+ClangFormatVersion
+
+============
+*/
+qboolean ClangFormatVersion( const char *exe, int *major )
+{
+	char *argv[] = { (char *)exe, (char *)"--version", NULL };
+	xcf_buf_t out = { 0 };
+	qboolean ok = false;
+
+	if( !exe || !major )
+		return false;
+
+	if( RunCapture( argv, &out, true ) == 0 && BufPutChar( &out, 0 ))
+		ok = ParseVersion( out.data, major );
+
+	BufFree( &out );
+	return ok;
+}

utils/xash-clang-format/wscript

@@ -0,0 +1,42 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+def options(opt):
+	grp = opt.get_option_group('Utilities options')
+
+	grp.add_option('--disable-utils-xcf', action='store_true',
+		dest='DISABLE_UTILS_XCF', default = False,
+		help='disable xash-clang-format wrapper utility [default: %(default)s]')
+
+def configure(conf):
+	# wrapper relies on POSIX, disable on Windows for now
+	conf.env.DISABLE_UTILS_XCF = conf.options.DISABLE_UTILS_XCF or conf.env.DEST_OS == 'win32'
+
+def build(bld):
+	if bld.env.DISABLE_UTILS_XCF:
+		return
+
+	bld.stlib(source = bld.path.ant_glob(['*.c', '*.h'], excl='main.c'),
+		target = 'xcflib',
+		features = 'format',
+		includes = '.',
+		use = 'public werror',
+		install_path = None)
+
+	bld.program(source = 'main.c',
+		target = 'xash-clang-format',
+		features = 'format',
+		use = 'xcflib werror',
+		install_path = bld.env.BINDIR,
+		subsystem = bld.env.CONSOLE_SUBSYSTEM)
+
+	if bld.env.TESTS:
+		tests = ['transform', 'config', 'version']
+
+		for name in tests:
+			bld.program(features = 'test format',
+				source       = 'tests/test_%s.c' % name,
+				target       = 'test_xcflib_%s' % name,
+				includes     = '.',
+				use          = 'xcflib werror',
+				install_path = None)

utils/xash-clang-format/xcf.h

@@ -0,0 +1,57 @@
+/*
+xcf.h - clang-format wrapper internals
+Copyright (C) 2026 Xash3D FWGS contributors
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+*/
+#ifndef XCF_H
+#define XCF_H
+
+#include <stddef.h>
+#include "xash3d_types.h"
+
+//
+// transform.c
+//
+typedef struct
+{
+	char *data;
+	size_t len;
+	size_t cap;
+} xcf_buf_t;
+
+void BufFree( xcf_buf_t *b );
+qboolean BufPutChar( xcf_buf_t *b, char c );
+qboolean BufPutMem( xcf_buf_t *b, const char *src, size_t n );
+qboolean Transform( const char *in, size_t in_len, xcf_buf_t *out );
+
+//
+// config.c
+//
+typedef struct
+{
+	qboolean collapse_parens; // default: false
+} xcf_config_t;
+
+qboolean ParseConfigText( const char *text, xcf_config_t *cfg );
+
+//
+// version.c
+//
+qboolean ParseVersion( const char *s, int *major );
+qboolean ClangFormatVersion( const char *exe, int *major );
+
+//
+// proc.c
+//
+int RunCapture( char *const argv[], xcf_buf_t *out, qboolean silent_stderr );
+
+#endif // XCF_H

wscript

@@ -4,9 +4,13 @@
 
 from waflib import Build, Context, Logs, TaskGen
 from waflib.Tools import waf_unit_test, c_tests
+import clang_format
 import sys
 import os
 
+# we need version 17 minimum
+clang_format.CLANG_FORMAT_MIN_MAJOR = 17
+
 VERSION = '0.99'
 APPNAME = 'xash3d-fwgs'
 top = '.'
@@ -32,6 +36,24 @@ def apply_subsystem_msvc(self):
 	if 'test' in self.features:
 		self.subsystem = self.env.CONSOLE_SUBSYSTEM
 
+@TaskGen.feature('format')
+@TaskGen.after_method('make_format_tasks')
+def use_xash_clang_format(self):
+	if self.bld.cmd != 'format':
+		return
+
+	wrapper = self.bld.bldnode.find_node('utils/xash-clang-format/xash-clang-format')
+	if not wrapper:
+		self.bld.fatal('no xash-clang-format found in build directory, reconfigure and rebuild with --enable-utils')
+		return
+
+	real_cf = clang_format.ClangFormatTask.binary
+	for t in self.tasks:
+		if isinstance(t, clang_format.ClangFormatTask):
+			t.binary = wrapper.abspath()
+			t.env.env = dict(os.environ, XASH_CLANG_FORMAT_BIN=real_cf)
+
+
 class Subproject:
 	def __init__(self, name, fnFilter = None):
 		self.name = name
@@ -85,6 +107,8 @@ SUBDIRS = [
 	Subproject('stub/server'),
 	Subproject('3rdparty/libbacktrace'),
 	Subproject('3rdparty/library_suffix'),
+	Subproject('3rdparty/yy-thunks'),
+	Subproject('utils/run-fuzzer', lambda x: x.env.ENABLE_FUZZER),
 
 	# disable only by engine feature, makes no sense to even parse subprojects in dedicated mode
 	Subproject('3rdparty/extras',       lambda x: x.env.CLIENT and x.env.DEST_OS != 'android'),
@@ -111,9 +135,9 @@ SUBDIRS = [
 	Subproject('engine'), # keep latest for static linking
 
 	# enabled optionally
-	Subproject('utils/mdldec',     lambda x: x.env.ENABLE_UTILS),
-	Subproject('utils/xar',        lambda x: x.env.ENABLE_UTILS and x.env.ENABLE_XAR),
-	Subproject('utils/run-fuzzer', lambda x: x.env.ENABLE_FUZZER),
+	Subproject('utils/mdldec',            lambda x: x.env.ENABLE_UTILS),
+	Subproject('utils/xar',               lambda x: x.env.ENABLE_UTILS and x.env.ENABLE_XAR),
+	Subproject('utils/xash-clang-format', lambda x: x.env.ENABLE_UTILS),
 
 	# enabled on PSVita only
 	Subproject('ref/gl/vgl_shim',   lambda x: x.env.DEST_OS == 'psvita'),
@@ -235,7 +259,7 @@ def configure(conf):
 	if conf.env.COMPILER_CC == 'msvc':
 		conf.load('msvc_pdb')
 
-	conf.load('msvs subproject clang_compilation_database strip_on_install waf_unit_test enforce_pic force_32bit ninja')
+	conf.load('msvs subproject clang_compilation_database strip_on_install waf_unit_test enforce_pic force_32bit ninja clang_format')
 
 	conf.env.MSVC_SUBSYSTEM = 'WINDOWS'
 	conf.env.CONSOLE_SUBSYSTEM = 'CONSOLE'