test for virtual force even though there's no dmg, git wants me to commit anyway

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 4e9c2a95bfc3e1c834569cc19eef2b7c39b083f8..3e50528f270b40ca7fd83b04bdfda668d4f5b739 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -642,6 +642,7 @@ seta g_mirrordamage 0.700000        "for teamplay 4: mirror damage factor"
 seta g_mirrordamage_virtual 1  "for teamplay 4: do not actually apply mirror damage, just show graphics effect for it"
 seta g_friendlyfire 0.500000   "for teamplay 4: fiendly fire factor"
 seta g_friendlyfire_virtual 1  "for teamplay 4: do not actually apply friendly fire, just show graphics effect for it"
+seta g_friendlyfire_virtual_force 1    "for teamplay 4: apply force even though there's no damage"
 seta g_teamdamage_threshold 40 "for teamplay 4: threshold over which to apply mirror damage"
 seta g_teamdamage_resetspeed 20        "for teamplay 4: how fast player's teamdamage count decreases"
 

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 44daadfc471a82607219b291057af09f8721196f..22c3698c2853de266c921260e618b77190f15ef1 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -602,7 +602,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                                targ.dmg_save += v_y;
                                                                targ.dmg_inflictor = inflictor;
                                                                damage = 0;
-                                                               force = '0 0 0';
+                                if(!autocvar_g_friendlyfire_virtual_force)
+                                    force = '0 0 0';
                                                        }
                                                }
                                                else