Merge remote-tracking branch 'origin/master' into samual/serverlist

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / progs.src

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 5aec16ba0c1a19727a2d5489b196525ea4262f62..fa61033f653b48f75947c6b95ea7a2e062ae8f0b 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -16,8 +16,9 @@ Defs.qc
 
 ../common/teams.qh
 ../common/util.qh
+../common/test.qh
+../common/counting.qh
 ../common/items.qh
-../common/deathtypes.qh
 ../common/explosion_equation.qh
 ../common/mapinfo.qh
 ../common/command/markup.qh
@@ -25,10 +26,14 @@ Defs.qc
 ../common/command/generic.qh
 ../common/command/shared_defs.qh
 ../common/urllib.qh
+../common/animdecide.qh
 command/cl_cmd.qh
 
 autocvars.qh
 
+../common/notifications.qh // must be after autocvars
+../common/deathtypes.qh // must be after notifications
+
 damage.qh
 
 ../csqcmodellib/interpolate.qh
@@ -50,8 +55,7 @@ vehicles/vehicles.qh
 ../csqcmodellib/cl_model.qh
 ../csqcmodellib/cl_player.qh
 projectile.qh
-
-../common/notifications.qc
+player_skeleton.qh
 
 sortlist.qc
 miscfunctions.qc
@@ -96,7 +100,9 @@ prandom.qc
 bgmscript.qc
 noise.qc
 
+../common/test.qc
 ../common/util.qc
+../common/notifications.qc
 ../common/command/markup.qc
 ../common/command/rpn.qc
 ../common/command/generic.qc
@@ -113,4 +119,5 @@ command/cl_cmd.qc
 ../warpzonelib/client.qc
 tturrets.qc
 
-../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail
+player_skeleton.qc
+../common/animdecide.qc