Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Thu, 10 Nov 2016 16:05:48 +0000 (02:05 +1000)
committerMario <mario@smbclan.net>
Thu, 10 Nov 2016 16:05:48 +0000 (02:05 +1000)
1  2 
mutators.cfg
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc

diff --cc mutators.cfg
Simple merge
Simple merge
@@@ -509,11 -507,11 +509,11 @@@ void PlayerDamage(entity this, entity i
        da = da - max(this.armorvalue, 0);
        if(valid_damage_for_weaponstats)
        {
 -              WeaponStats_LogDamage(awep.m_id, abot, PS(this).m_weapon.m_id, vbot, dh + da);
 +              WeaponStats_LogDamage(awep.m_id, abot, this.(weaponentity).m_weapon.m_id, vbot, dh + da);
        }
-       if (dh + da)
+       if (damage)
        {
-               MUTATOR_CALLHOOK(PlayerDamaged, attacker, this, dh, da, hitloc, deathtype);
+               MUTATOR_CALLHOOK(PlayerDamaged, attacker, this, dh, da, hitloc, deathtype, damage);
        }
  
        if (this.health < 1)