From: Mario <mario@smbclan.net>
Date: Mon, 28 Dec 2015 12:31:48 +0000 (+1000)
Subject: Matherize
X-Git-Tag: xonotic-v0.8.2~1372
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3071e864c022e6a4e5f4c3656c7a092668cc2b51;p=xonotic%2Fxonotic-data.pk3dir.git

Matherize
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index df9a7a6f2..43b7f72f6 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -683,7 +683,7 @@ float TrueAimCheck()
 	traceline(traceorigin, traceorigin + view_forward * MAX_SHOT_DISTANCE, mv, ta);
 	trueaimpoint = trace_endpos;
 
-	if(vlen(trueaimpoint - traceorigin) < g_trueaim_minrange)
+	if(vdist((trueaimpoint - traceorigin), <, g_trueaim_minrange))
 		trueaimpoint = traceorigin + view_forward * g_trueaim_minrange;
 
 	if(vecs.x > 0)
diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 44b3c1baf..b2cc26fd9 100644
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -271,7 +271,7 @@ void animdecide_setimplicitstate(entity e, float onground)
 	// it slightly less likely to "hit two keys at once", so let's do this
 	// here too
 
-	if(vlen(v) > 10)
+	if(vdist(v, >, 10))
 	{
 		if(v.x >  fabs(v.y) * 0.5)
 			s |= ANIMIMPLICITSTATE_FORWARD;
diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc
index 4d91acb54..994ea5747 100644
--- a/qcsrc/common/effects/qc/casings.qc
+++ b/qcsrc/common/effects/qc/casings.qc
@@ -90,7 +90,7 @@ void Casing_Touch()
     if (!self.silent)
     if (!trace_ent || trace_ent.solid == SOLID_BSP)
     {
-        if (vlen(self.velocity) > 50)
+        if(vdist(self.velocity, >, 50))
         {
             if (time >= self.nextthink)
             {
diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc
index 2de4ef14c..01296010b 100644
--- a/qcsrc/common/effects/qc/damageeffects.qc
+++ b/qcsrc/common/effects/qc/damageeffects.qc
@@ -261,7 +261,7 @@ NET_HANDLE(ENT_CLIENT_DAMAGEINFO, bool isNew)
 		}
 
 		if(self.damageforcescale)
-			if(vlen(thisforce))
+			if(vdist(thisforce, !=, 0))
 			{
 				self.move_velocity = self.move_velocity + damage_explosion_calcpush(self.damageforcescale * thisforce, self.move_velocity, autocvar_g_balance_damagepush_speedfactor);
 				self.move_flags &= ~FL_ONGROUND;
diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index 1d58686bb..fbe2eb9e6 100644
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -119,7 +119,7 @@ float turret_targetscore_generic(entity _turret, entity _target)
 			(m_score * _turret.target_select_missilebias) +
 			(p_score * _turret.target_select_playerbias);
 
-	if(_turret.target_range < vlen(_turret.tur_shotorg - real_origin(_target)))
+	if(vdist((_turret.tur_shotorg - real_origin(_target)), >, _turret.target_range))
 	{
 		//dprint("Wtf?\n");
 		score *= 0.001;