Merge branch 'master' into Lyberta/WaypointIcons

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

diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh
index d24ee1cf50cf514605e9cc8d1122e854129ffa70..d1665b2bd1dadc5f5de95bd925a2c828d5789646 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qh
+++ b/qcsrc/server/weapons/accuracy.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 .bool cvar_cl_accuracy_data_share;
@@ -9,12 +10,12 @@ REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share");
 REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive");
 
 .entity accuracy;
-.float accuracy_frags[Weapons_MAX];
+.float accuracy_frags[REGISTRY_MAX(Weapons)];
 
-.float accuracy_hit[Weapons_MAX];
-.float accuracy_fired[Weapons_MAX];
-.float accuracy_cnt_hit[Weapons_MAX];
-.float accuracy_cnt_fired[Weapons_MAX];
+.float accuracy_hit[REGISTRY_MAX(Weapons)];
+.float accuracy_fired[REGISTRY_MAX(Weapons)];
+.float accuracy_cnt_hit[REGISTRY_MAX(Weapons)];
+.float accuracy_cnt_fired[REGISTRY_MAX(Weapons)];
 
 
 // init/free
@@ -25,7 +26,7 @@ void accuracy_free(entity e);
 void accuracy_resend(entity e);
 
 // update accuracy stats
-void accuracy_add(entity e, float w, float fired, float hit);
+void accuracy_add(entity e, Weapon w, float fired, float hit);
 
 // helper
 bool accuracy_isgooddamage(entity attacker, entity targ);