From: Mario <mario@smbclan.net>
Date: Sun, 23 Sep 2018 03:12:18 +0000 (+1000)
Subject: Minor optimisation to client physics options
X-Git-Tag: xonotic-v0.8.5~1836
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b3cae54d302d864c03663580912ae7abc1402db;p=xonotic%2Fxonotic-data.pk3dir.git

Minor optimisation to client physics options
---

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 572bee349..3f220e84d 100644
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -10,19 +10,23 @@
 // client side physics
 bool Physics_Valid(string thecvar)
 {
-	return autocvar_g_physics_clientselect && thecvar != "" && thecvar && thecvar != "default" && strhasword(autocvar_g_physics_clientselect_options, thecvar);
+	return thecvar != "" && thecvar && thecvar != "default" && strhasword(autocvar_g_physics_clientselect_options, thecvar);
 }
 
 float Physics_ClientOption(entity this, string option, float defaultval)
 {
+	if(!autocvar_g_physics_clientselect)
+		return defaultval;
+
 	if(IS_REAL_CLIENT(this) && Physics_Valid(CS(this).cvar_cl_physics))
 	{
 		string s = strcat("g_physics_", CS(this).cvar_cl_physics, "_", option);
 		if(cvar_type(s) & CVAR_TYPEFLAG_EXISTS)
 			return cvar(s);
 	}
-	if(autocvar_g_physics_clientselect && autocvar_g_physics_clientselect_default && autocvar_g_physics_clientselect_default != "")
+	if(autocvar_g_physics_clientselect_default && autocvar_g_physics_clientselect_default != "" && autocvar_g_physics_clientselect_default != "default")
 	{
+		// NOTE: not using Physics_Valid here, so the default can be forced to something normally unavailable
 		string s = strcat("g_physics_", autocvar_g_physics_clientselect_default, "_", option);
 		if(cvar_type(s) & CVAR_TYPEFLAG_EXISTS)
 			return cvar(s);