Fix invasion accuracy

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

diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc
index d4b706dca15972e0c74cad233713cc12a2bed33b..139d8e7a39efe9430bf018574b66173bc839dde5 100644 (file)
--- a/qcsrc/server/accuracy.qc
+++ b/qcsrc/server/accuracy.qc
@@ -109,20 +109,20 @@ void accuracy_add(entity e, float w, float fired, float hit)
 
 float accuracy_isgooddamage(entity attacker, entity targ)
 {
-       float targ_isvalid = ((g_td) ? targ.flags & FL_MONSTER : IS_CLIENT(targ));
-       
-       if(!inWarmupStage)
+       float targ_isvalid = ((g_invasion) ? targ.flags & FL_MONSTER : IS_CLIENT(targ));
+
+       if(!warmup_stage)
        if(targ_isvalid)
-       if not(attacker.flags & FL_MONSTER) // no accuracy for monsters
+       if(!targ.frozen)
        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;
 }