Merge branch 'master' into Mario/nade_updates

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index bc1ec35eba339a8dbf3006ad67ef20ca7e13490e..86a8b43395e199d83a1dc1676f5a7d234cf1a27f 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -8,6 +8,7 @@ sys-post.qh
 Defs.qc
 ../dpdefs/keycodes.qc
 ../common/constants.qh
+../common/stats.qh
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
@@ -16,6 +17,8 @@ Defs.qc
 
 ../common/teams.qh
 ../common/util.qh
+../common/nades.qh
+../common/buffs.qh
 ../common/test.qh
 ../common/counting.qh
 ../common/items.qh
@@ -27,9 +30,10 @@ Defs.qc
 ../common/command/shared_defs.qh
 ../common/urllib.qh
 ../common/animdecide.qh
-../common/monsters/monsters.qh
 command/cl_cmd.qh
 
+../common/monsters/monsters.qh
+
 autocvars.qh
 
 ../common/notifications.qh // must be after autocvars
@@ -48,10 +52,7 @@ bgmscript.qh
 noise.qh
 tturrets.qh
 ../server/tturrets/include/turrets_early.qh
-monsters.qh
-../common/monsters/lib/monsters_early.qh
 ../server/movelib.qc
-../server/generator.qh
 main.qh
 vehicles/vehicles.qh
 ../common/csqcmodel_settings.qh
@@ -115,20 +116,18 @@ noise.qc
 ../server/w_all.qc
 ../common/explosion_equation.qc
 ../common/urllib.qc
-../common/monsters/monsters.qc
 command/cl_cmd.qc
 
+../common/monsters/monsters.qc
+
+../common/nades.qc
+../common/buffs.qc
+
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc
 ../warpzonelib/client.qc
 tturrets.qc
 
-../server/generator.qc
-
-monsters.qc
-
 player_skeleton.qc
 ../common/animdecide.qc
-
-../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail