From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 13 Jun 2016 07:54:15 +0000 (+1000)
Subject: Global forces: allow self damage to be ignored
X-Git-Tag: xonotic-v0.8.2~715^2~2
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=3c3430532c12aa200f9893dd445c1b14a677ced5;p=xonotic%2Fxonotic-data.pk3dir.git

Global forces: allow self damage to be ignored
---

diff --git a/qcsrc/common/mutators/mutator/globalforces/globalforces.qc b/qcsrc/common/mutators/mutator/globalforces/globalforces.qc
index 4e2e0424f..662d4e24b 100644
--- a/qcsrc/common/mutators/mutator/globalforces/globalforces.qc
+++ b/qcsrc/common/mutators/mutator/globalforces/globalforces.qc
@@ -1,6 +1,7 @@
 #ifdef IMPLEMENTATION
 
 AUTOCVAR(g_globalforces, float, false, "Global forces: knockback affects everyone");
+AUTOCVAR(g_globalforces_noself, bool, false, "Global forces: ignore self damage");
 REGISTER_MUTATOR(mutator_globalforces, autocvar_g_globalforces);
 
 MUTATOR_HOOKFUNCTION(mutator_globalforces, BuildMutatorsString) {
@@ -12,7 +13,9 @@ MUTATOR_HOOKFUNCTION(mutator_globalforces, BuildMutatorsPrettyString) {
 }
 
 MUTATOR_HOOKFUNCTION(mutator_globalforces, PlayerDamage_SplitHealthArmor) {
+    entity frag_attacker = M_ARGV(1, entity);
     entity frag_target = M_ARGV(2, entity);
+    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, {
         it.velocity += damage_explosion_calcpush(it.damageforcescale * damage_force, it.velocity, autocvar_g_balance_damagepush_speedfactor);