X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Faccuracy.qc;h=95ddf78e1f9e498ec889ebe4ef8c985c1b000f5b;hb=f39f563dc8b308a110a98708ee1e71c5d02fcab6;hp=4d63fd82002dcb9ea176cfabdedd43f3d4bd5db1;hpb=7b8473b5128d64ae34f128ad44933834139aa364;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc
index 4d63fd820..95ddf78e1 100644
--- a/qcsrc/server/accuracy.qc
+++ b/qcsrc/server/accuracy.qc
@@ -1,8 +1,11 @@
-.entity accuracy;
 .float accuracy_hit[WEP_MAXCOUNT];
 .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)
 {
@@ -74,6 +77,11 @@ void accuracy_set(entity e, float w, float fired, float hit)
 	b = accuracy_byte(a.(accuracy_hit[w]), a.(accuracy_fired[w]));
 	a.(accuracy_hit[w]) = hit;
 	a.(accuracy_fired[w]) = fired;
+
+    if(hit)
+        a.(accuracy_cnt_hit[w]) = 1;
+    a.(accuracy_cnt_fired[w]) = 1;
+
 	if(b == accuracy_byte(hit, fired))
 		return;
 	w = pow(2, w);
@@ -84,6 +92,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;
@@ -97,6 +108,19 @@ void accuracy_add(entity e, float w, float fired, float hit)
 		a.(accuracy_hit[w]) += hit;
 	if(fired)
 		a.(accuracy_fired[w]) += fired;
+
+    if(hit && a.hit_time != time) // only run this once per frame
+    {
+        a.(accuracy_cnt_hit[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;
 	w = pow(2, w);