Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

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

diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc
index a0a557c3ccb7df33f6daae7b3f11bcd753f963ed..de6b52752b95b358503e9fdd1a846377bd4f6bc6 100644 (file)
--- a/qcsrc/server/accuracy.qc
+++ b/qcsrc/server/accuracy.qc
@@ -2,10 +2,6 @@
 .float accuracy_fired[WEP_MAXCOUNT];
 .float accuracy_cnt_hit[WEP_MAXCOUNT];
 .float accuracy_cnt_fired[WEP_MAXCOUNT];
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(accuracy_hit);
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(accuracy_fired);
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(accuracy_cnt_hit);
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(accuracy_cnt_fired);
 
 float accuracy_byte(float n, float d)
 {
@@ -80,7 +76,7 @@ void accuracy_set(entity e, float w, float fired, float hit)
 
     if(hit)
         a.(accuracy_cnt_hit[w]) = 1;
-       a.(accuracy_cnt_fired[w]) = 1;
+    a.(accuracy_cnt_fired[w]) = 1;
 
        if(b == accuracy_byte(hit, fired))
                return;
@@ -92,6 +88,9 @@ void accuracy_set(entity e, float w, float fired, float hit)
                                a.SendFlags |= w;
 }
 
+.float hit_time;
+.float fired_time;
+
 void accuracy_add(entity e, float w, float fired, float hit)
 {
        entity a;
@@ -106,9 +105,17 @@ void accuracy_add(entity e, float w, float fired, float hit)
        if(fired)
                a.(accuracy_fired[w]) += fired;
 
-    if(hit)
+    if(hit && a.hit_time != time) // only run this once per frame
+    {
         a.(accuracy_cnt_hit[w]) += 1;
-       a.(accuracy_cnt_fired[w]) += 1;
+        a.hit_time = time;
+    }
+
+    if(fired && a.fired_time != time) // only run this once per frame
+    {
+        a.(accuracy_cnt_fired[w]) += 1;
+        a.fired_time = time;
+    }
 
        if(b == accuracy_byte(a.(accuracy_hit[w]), a.(accuracy_fired[w])))
                return;