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 24cc20e17b524c35c05eae3e0710a7dd5ab1654e..c7d851b6ea039c47aa0e948e0857313ba4108b51 100644 (file)
--- a/qcsrc/server/accuracy.qc
+++ b/qcsrc/server/accuracy.qc
@@ -111,18 +111,19 @@ float accuracy_isgooddamage(entity attacker, entity targ)
 {
        float targ_isvalid = ((g_invasion) ? targ.flags & FL_MONSTER : IS_CLIENT(targ));
 
-       if(!inWarmupStage)
+       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(IsDifferentTeam(attacker, targ))
+       if(DIFF_TEAM(attacker, targ))
                return TRUE;
        return FALSE;
 }
 
 float accuracy_canbegooddamage(entity attacker)
 {
-       if(!inWarmupStage)
+       if(!warmup_stage)
                return TRUE;
        return FALSE;
 }