From: Mario Date: Tue, 24 Sep 2013 11:10:06 +0000 (-0700) Subject: Merge branch 'master' into divVerent/4team_ctf X-Git-Tag: xonotic-v0.8.1~29^2~35 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d443aa411d5ba001380775b4cabec80db9701150;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/4team_ctf --- d443aa411d5ba001380775b4cabec80db9701150 diff --cc qcsrc/server/mutators/gamemode_ctf.qc index af9055e34,62320f37f..0184995fd --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@@ -1806,9 -1728,9 +1806,9 @@@ MUTATOR_HOOKFUNCTION(ctf_PlayerDamage) frag_force *= autocvar_g_ctf_flagcarrier_forcefactor; } } - else if(frag_target.flagcarried && (frag_target.deadflag == DEAD_NO) && DIFF_TEAM(frag_target, frag_attacker)) // if the target is a flagcarrier + else if(frag_target.flagcarried && (frag_target.deadflag == DEAD_NO) && CTF_DIFFTEAM(frag_target, frag_attacker)) // if the target is a flagcarrier { - if(autocvar_g_ctf_flagcarrier_auto_helpme_damage > ('1 0 0' * healtharmor_maxdamage(frag_target.health, frag_target.armorvalue, autocvar_g_balance_armor_blockpercent))) + if(autocvar_g_ctf_flagcarrier_auto_helpme_damage > ('1 0 0' * healtharmor_maxdamage(frag_target.health, frag_target.armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON))) if(time > frag_target.wps_helpme_time + autocvar_g_ctf_flagcarrier_auto_helpme_time) { frag_target.wps_helpme_time = time;