Merge branch 'proraide/fix_fps' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / qc / damageeffects.qc

diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc
index 2de4ef14c2874a4cf51a78990c4eca468a66ee9f..4d85ab90956c4ffdb390e7968ce5b4c0d9ba985f 100644 (file)
--- a/qcsrc/common/effects/qc/damageeffects.qc
+++ b/qcsrc/common/effects/qc/damageeffects.qc
@@ -2,11 +2,11 @@
 #define DAMAGEEFFECTS_H
 
 #ifdef CSQC
-#include "../../deathtypes/all.qh"
-#include "../../physics/movetypes/movetypes.qh"
-#include "../../../client/mutators/events.qh"
-#include "../../vehicles/all.qh"
-#include "../../weapons/all.qh"
+#include <common/deathtypes/all.qh>
+#include <common/physics/movetypes/movetypes.qh>
+#include <client/mutators/events.qh>
+#include <common/vehicles/all.qh>
+#include <common/weapons/all.qh>
 #endif
 
 #endif
@@ -145,7 +145,7 @@ void DamageEffect(vector hitorg, float thedamage, int type, int specnum)
                        continue; // player model bone blacklist
 
                // now choose the bone closest to impact origin
-               if(nearestbone == 0 || vlen(hitorg - gettaginfo(self, tagnum)) <= vlen(hitorg - gettaginfo(self, nearestbone)))
+               if(nearestbone == 0 || vlen2(hitorg - gettaginfo(self, tagnum)) <= vlen2(hitorg - gettaginfo(self, nearestbone)))
                        nearestbone = tagnum;
        }
        gettaginfo(self, nearestbone); // set gettaginfo_name
@@ -253,7 +253,7 @@ NET_HANDLE(ENT_CLIENT_DAMAGEINFO, bool isNew)
                }
                else
                {
-                       if(vlen(nearest - w_org) > bound(MIN_DAMAGEEXTRARADIUS, self.damageextraradius, MAX_DAMAGEEXTRARADIUS))
+                       if(vdist((nearest - w_org), >, bound(MIN_DAMAGEEXTRARADIUS, self.damageextraradius, MAX_DAMAGEEXTRARADIUS)))
                                continue;
 
                        thisdmg = thedamage;
@@ -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;
@@ -271,7 +271,7 @@ NET_HANDLE(ENT_CLIENT_DAMAGEINFO, bool isNew)
                        self.silent = 1;
 
                if(self.event_damage)
-                       self.event_damage(thisdmg, w_deathtype, w_org, thisforce);
+                       self.event_damage(self, thisdmg, w_deathtype, w_org, thisforce);
 
                DamageEffect(w_org, thisdmg, w_deathtype, species);