From: FruitieX Date: Fri, 31 Dec 2010 18:44:07 +0000 (+0200) Subject: test for virtual force even though there's no dmg, git wants me to commit anyway X-Git-Tag: xonotic-v0.5.0~318^2~133^2~16 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e871e26f5d35f31355cee329c5944a5b0232ddf;p=xonotic%2Fxonotic-data.pk3dir.git 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 4e9c2a95b..3e50528f2 100644 --- 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 44daadfc4..22c3698c2 100644 --- 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