add a field .damageextraradius to DamageInfo entities to be able to tune how much...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / damage.qc

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 51029396a299e46ce1270781b905ed7c9db99f25..57d4c5c0e7da66651f4280e8abdadabea0d6e072 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -30,13 +30,17 @@ void Ent_DamageInfo(float isNew)
        else
                forcemul = 1;
        
-       for(self = findradius(w_org, rad); self; self = self.chain)
+       for(self = findradius(w_org, rad + MAX_DAMAGEEXTRARADIUS); self; self = self.chain)
        {
+               vector p = NearestPointOnBox(self, w_org);
+               if(vlen(p - w_org) > rad + self.damageextraradius)
+                       continue;
+
                if(rad)
                {
                        thisdmg = vlen(self.origin - w_org) / rad;
                        if(thisdmg >= 1)
-                               continue;
+                               thisdmg = 1;
                        if(dmg)
                        {
                                thisdmg = dmg + (edge - dmg) * thisdmg;