Merge branch 'master' into divVerent/4team_ctf

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
index af9055e34fe3b56307224b4462bc6e201daf0322,62320f37f3232589f2e089798cf2bfd63a2a5049..0184995fd21e77488bfd2024526a1f02ee503624
--- 1/qcsrc/server/mutators/gamemode_ctf.qc
--- 2/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;