Merge branch 'master' into divVerent/csqcmodel

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 2e8992134e859e207ea9b472022369ca71756f46..1a303f4f42d57916214aa3db15c804fce89f4294 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -1,11 +1,13 @@
 ../../csprogs.dat
-pre.qh
 
 ../common/util-pre.qh
+sys-pre.qh
+../dpdefs/csprogsdefs.qc
+sys-post.qh
+
 Defs.qc
-csqc_constants.qc
+../dpdefs/keycodes.qc
 ../common/constants.qh
-csqc_builtins.qc
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
@@ -20,7 +22,7 @@ csqc_builtins.qc
 
 autocvars.qh
 
-interpolate.qh
+../csqcmodel/interpolate.qh
 teamradar.qh
 hud.qh
 scoreboard.qh
@@ -29,21 +31,27 @@ movetypes.qh
 prandom.qh
 bgmscript.qh
 noise.qh
-
+teamplay.qh
+tturrets.qh
+../server/tturrets/include/turrets_early.qh
+../server/movelib.qc
 main.qh
 vehicles/vehicles.qh
-../server/vehicles/vehicles_def.qh
+../csqcmodel/settings.qh
+../csqcmodel/common.qh
+../csqcmodel/cl_model.qh
+../csqcmodel/cl_player.qh
 
 sortlist.qc
 miscfunctions.qc
 teamplay.qc
 
-ctf.qc
-
 teamradar.qc
+hud_config.qc
 hud.qc
 scoreboard.qc
 mapvoting.qc
+csqcmodel_hooks.qc
 
 rubble.qc
 hook.qc
@@ -53,19 +61,22 @@ projectile.qc
 gibs.qc
 damage.qc
 casings.qc
+../csqcmodel/cl_model.qc
+../csqcmodel/cl_player.qc
 effects.qc
 wall.qc
 modeleffects.qc
 tuba.qc
 target_music.qc
 
-
 vehicles/vehicles.qc
-../server/vehicles/network.qc
+shownames.qh
+shownames.qc
 
+announcer.qc
 Main.qc
 View.qc
-interpolate.qc
+../csqcmodel/interpolate.qc
 waypointsprites.qc
 movetypes.qc
 prandom.qc
@@ -83,5 +94,6 @@ noise.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc
 ../warpzonelib/client.qc
+tturrets.qc
 
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail