X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstats.qh;h=2c471f0db30bb63d39b53966ed92ff6bf2e573ad;hb=edf01df130d0d1877461561178b8833a9ab6051c;hp=fc82c13208e7b053baf27b1c661af64b57ae2101;hpb=f1a87492d9fed27a64d0e99c068705aba5509f26;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index fc82c1320..2c471f0db 100644
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -2,7 +2,7 @@
 #define STATS_H
 
 #ifdef SVQC
-#include "../server/cl_client.qh"
+#include <server/cl_client.qh>
 #endif
 
 // Full list of all stat constants, included in a single location for easy reference
@@ -62,10 +62,10 @@ REGISTER_STAT(SWITCHWEAPON, int)
 REGISTER_STAT(SWITCHINGWEAPON, int)
 REGISTER_STAT(WEAPON_NEXTTHINK, float)
 #ifdef SVQC
-SPECTATE_COPY(_STAT(WEAPON_NEXTTHINK))
-float W_WeaponRateFactor();
+SPECTATE_COPYFIELD(_STAT(WEAPON_NEXTTHINK))
+float W_WeaponRateFactor(entity this);
 #endif
-REGISTER_STAT(WEAPONRATEFACTOR, float, W_WeaponRateFactor())
+REGISTER_STAT(WEAPONRATEFACTOR, float, W_WeaponRateFactor(this))
 
 REGISTER_STAT(GAMESTARTTIME, float)
 REGISTER_STAT(STRENGTH_FINISHED, float)
@@ -122,6 +122,8 @@ REGISTER_STAT(REVIVE_PROGRESS, float)
 REGISTER_STAT(ROUNDLOST, int)
 REGISTER_STAT(BUFF_TIME, float)
 REGISTER_STAT(CTF_FLAGSTATUS, int)
+REGISTER_STAT(ENTRAP_ORB, float)
+REGISTER_STAT(ENTRAP_ORB_ALPHA, float)
 
 #ifdef SVQC
 int autocvar_g_multijump;
@@ -247,7 +249,7 @@ REGISTER_STAT(TELEPORT_TELEFRAG_AVOID, int, autocvar_g_telefrags_avoid)
 REGISTER_STAT(SPECTATORSPEED, float)
 
 #ifdef SVQC
-#include "movetypes/movetypes.qh"
+#include "physics/movetypes/movetypes.qh"
 #endif
 
 REGISTER_STAT(MOVEVARS_AIRACCEL_QW_STRETCHFACTOR, float)
@@ -273,6 +275,7 @@ REGISTER_STAT(MOVEVARS_MAXAIRSTRAFESPEED, float)
 REGISTER_STAT(MOVEVARS_AIRCONTROL, float)
 REGISTER_STAT(FRAGLIMIT, float, autocvar_fraglimit)
 REGISTER_STAT(TIMELIMIT, float, autocvar_timelimit)
+REGISTER_STAT(WARMUP_TIMELIMIT, float, warmup_limit)
 #ifdef SVQC
 float autocvar_sv_wallfriction;
 #endif
@@ -303,7 +306,7 @@ REPLICATE(cvar_cl_gunalign, int, "cl_gunalign");
 #endif
 REGISTER_STAT(GUNALIGN, int, this.cvar_cl_gunalign)
 #ifdef SVQC
-SPECTATE_COPY(_STAT(GUNALIGN))
+SPECTATE_COPYFIELD(_STAT(GUNALIGN))
 #endif