X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics.qc;h=731cba8ed45c912bb35b409be792f2ffe15f77bb;hp=b3db77143b375f4bdb315e22a1a3c0d057aecd38;hb=f9e4718d229df569d7878259d3db2bd2df1e7b91;hpb=28305c2245f99ca5ae21ea8858e05c6bb0a2000b

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index b3db77143..731cba8ed 100644
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -1,6 +1,5 @@
 #include "physics.qh"
-#include "triggers/trigger/swamp.qh"
-#include "triggers/trigger/jumppads.qh"
+#include "triggers/include.qh"
 #include "viewloc.qh"
 
 #ifdef SVQC
@@ -11,29 +10,22 @@
 // client side physics
 bool Physics_Valid(string thecvar)
 {
-	if(!autocvar_g_physics_clientselect) { return false; }
-
-	string l = strcat(" ", autocvar_g_physics_clientselect_options, " ");
-
-	if(strstrofs(l, strcat(" ", thecvar, " "), 0) >= 0)
-		return true;
-
-	return false;
+	return autocvar_g_physics_clientselect && strhasword(autocvar_g_physics_clientselect_options, thecvar);
 }
 
 float Physics_ClientOption(entity pl, string option)
 {
 	if(Physics_Valid(pl.cvar_cl_physics))
 	{
-		string var = sprintf("g_physics_%s_%s", pl.cvar_cl_physics, option);
-		if(cvar_type(var) & CVAR_TYPEFLAG_EXISTS)
-			return cvar(var);
+		string s = sprintf("g_physics_%s_%s", pl.cvar_cl_physics, option);
+		if(cvar_type(s) & CVAR_TYPEFLAG_EXISTS)
+			return cvar(s);
 	}
 	if(autocvar_g_physics_clientselect && autocvar_g_physics_clientselect_default)
 	{
-		string var = sprintf("g_physics_%s_%s", autocvar_g_physics_clientselect_default, option);
-		if(cvar_type(var) & CVAR_TYPEFLAG_EXISTS)
-			return cvar(var);
+		string s = sprintf("g_physics_%s_%s", autocvar_g_physics_clientselect_default, option);
+		if(cvar_type(s) & CVAR_TYPEFLAG_EXISTS)
+			return cvar(s);
 	}
 	return cvar(strcat("sv_", option));
 }