]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Matherize
authorMario <mario@smbclan.net>
Mon, 28 Dec 2015 12:31:48 +0000 (22:31 +1000)
committerMario <mario@smbclan.net>
Mon, 28 Dec 2015 12:31:48 +0000 (22:31 +1000)
qcsrc/client/view.qc
qcsrc/common/animdecide.qc
qcsrc/common/effects/qc/casings.qc
qcsrc/common/effects/qc/damageeffects.qc
qcsrc/common/turrets/sv_turrets.qc

index df9a7a6f26da4a2a1bf688cce3280007c0fc9de3..43b7f72f6c6767a7e0fd1c6850d9214c859802b7 100644 (file)
@@ -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)
index 44b3c1baf5fe68a85080bf3666c1783d10922ee4..b2cc26fd9a96d262377e0c9351bcf0e2df61016e 100644 (file)
@@ -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;
index 4d91acb544111289a85b77a77271fbce27dda2b2..994ea574733716d0590932a50120c6cc0428886c 100644 (file)
@@ -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)
             {
index 2de4ef14c2874a4cf51a78990c4eca468a66ee9f..01296010b8ac7a05e319c370961134c35abc3049 100644 (file)
@@ -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;
index 1d58686bb038e2a5a010024219ac0379145f2c84..fbe2eb9e6668ecfaf49303a578d11e917201f449 100644 (file)
@@ -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;