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 e3dc63501dccb13f434fea10f1e1142470367206..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
@@ -36,6 +38,7 @@ tturrets.qh
 main.qh
 vehicles/vehicles.qh
 ../csqcmodel/settings.qh
+../csqcmodel/common.qh
 ../csqcmodel/cl_model.qh
 ../csqcmodel/cl_player.qh
 
@@ -43,8 +46,6 @@ sortlist.qc
 miscfunctions.qc
 teamplay.qc
 
-ctf.qc
-
 teamradar.qc
 hud_config.qc
 hud.qc
@@ -60,7 +61,6 @@ projectile.qc
 gibs.qc
 damage.qc
 casings.qc
-../csqcmodel/common.qc
 ../csqcmodel/cl_model.qc
 ../csqcmodel/cl_player.qc
 effects.qc