Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index f5caf74afea392a6517e63bd755147db27b8e18e..7f31cacf2bb779ab769c98462771354af9922f1f 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -1,12 +1,10 @@
 ../../csprogs.dat
 
+../common/util-pre.qh
 sys-pre.qh
 ../dpdefs/csprogsdefs.qc
 sys-post.qh
 
-pre.qh
-
-../common/util-pre.qh
 Defs.qc
 ../dpdefs/keycodes.qc
 ../common/constants.qh
@@ -24,7 +22,7 @@ Defs.qc
 
 autocvars.qh
 
-interpolate.qh
+../csqcmodellib/interpolate.qh
 teamradar.qh
 hud.qh
 scoreboard.qh
@@ -39,18 +37,22 @@ tturrets.qh
 ../server/movelib.qc
 main.qh
 vehicles/vehicles.qh
+../common/csqcmodel_settings.qh
+../csqcmodellib/common.qh
+../csqcmodellib/cl_model.qh
+../csqcmodellib/cl_player.qh
+projectile.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
@@ -60,6 +62,8 @@ projectile.qc
 gibs.qc
 damage.qc
 casings.qc
+../csqcmodellib/cl_model.qc
+../csqcmodellib/cl_player.qc
 effects.qc
 wall.qc
 modeleffects.qc
@@ -73,7 +77,7 @@ shownames.qc
 announcer.qc
 Main.qc
 View.qc
-interpolate.qc
+../csqcmodellib/interpolate.qc
 waypointsprites.qc
 movetypes.qc
 prandom.qc