Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / accuracy.qc

diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc
index dfc923b2bb7d573e5139dcf26390065b8f334170..c7d851b6ea039c47aa0e948e0857313ba4108b51 100644 (file)
--- a/qcsrc/server/accuracy.qc
+++ b/qcsrc/server/accuracy.qc
@@ -109,7 +109,11 @@ void accuracy_add(entity e, float w, float fired, float hit)
 
 float accuracy_isgooddamage(entity attacker, entity targ)
 {
 
 float accuracy_isgooddamage(entity attacker, entity targ)
 {

+       float targ_isvalid = ((g_invasion) ? targ.flags & FL_MONSTER : IS_CLIENT(targ));
+

        if(!warmup_stage)
        if(!warmup_stage)

+       if(targ_isvalid)
+       if not(attacker.flags & FL_MONSTER) // no accuracy for monsters

        if(IS_CLIENT(targ))
        if(targ.deadflag == DEAD_NO)
        if(DIFF_TEAM(attacker, targ))
        if(IS_CLIENT(targ))
        if(targ.deadflag == DEAD_NO)
        if(DIFF_TEAM(attacker, targ))