From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 13 Jun 2016 07:57:52 +0000 (+1000)
Subject: Global forces: allow range limit
X-Git-Tag: xonotic-v0.8.2~715^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b6b2d155b24b07de908aafae19595e2db6ed6b8;p=xonotic%2Fxonotic-data.pk3dir.git

Global forces: allow range limit
---

diff --git a/qcsrc/common/mutators/mutator/globalforces/globalforces.qc b/qcsrc/common/mutators/mutator/globalforces/globalforces.qc
index 662d4e24b..96735a005 100644
--- a/qcsrc/common/mutators/mutator/globalforces/globalforces.qc
+++ b/qcsrc/common/mutators/mutator/globalforces/globalforces.qc
@@ -2,6 +2,7 @@
 
 AUTOCVAR(g_globalforces, float, false, "Global forces: knockback affects everyone");
 AUTOCVAR(g_globalforces_noself, bool, false, "Global forces: ignore self damage");
+AUTOCVAR(g_globalforces_range, float, 0, "Global forces: max range of effect");
 REGISTER_MUTATOR(mutator_globalforces, autocvar_g_globalforces);
 
 MUTATOR_HOOKFUNCTION(mutator_globalforces, BuildMutatorsString) {
@@ -18,6 +19,11 @@ MUTATOR_HOOKFUNCTION(mutator_globalforces, PlayerDamage_SplitHealthArmor) {
     if (autocvar_g_globalforces_noself && frag_target == frag_attacker) return;
     vector damage_force = M_ARGV(3, vector) * autocvar_g_globalforces;
     FOREACH_CLIENT(IS_PLAYER(it) && it != frag_target, {
+        if (autocvar_g_globalforces_range) {
+            if (vdist(it.origin - frag_target.origin, >, autocvar_g_globalforces_range)) {
+                continue;
+            }
+        }
         it.velocity += damage_explosion_calcpush(it.damageforcescale * damage_force, it.velocity, autocvar_g_balance_damagepush_speedfactor);
     });
 }