Merge remote-tracking branch 'origin/Mario/yet_another_vehicle_crashfix'

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

diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc
index 3c737f6e6cec277f4e8d225f6ccefcc0004a271d..dfc923b2bb7d573e5139dcf26390065b8f334170 100644 (file)
--- a/qcsrc/server/accuracy.qc
+++ b/qcsrc/server/accuracy.qc
@@ -109,17 +109,17 @@ void accuracy_add(entity e, float w, float fired, float hit)
 
 float accuracy_isgooddamage(entity attacker, entity targ)
 {
-       if(!inWarmupStage)
+       if(!warmup_stage)
        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;
 }