Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 1a518c5a697f9079977a896ae21cf841cdedeb17..a5109ac690422988f3a0898592a2701f49376770 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -36,6 +36,9 @@ autocvars.qh
 ../common/notifications.qh // must be after autocvars
 ../common/deathtypes.qh // must be after notifications
 
+../common/turrets/turrets.qh
+../common/turrets/cl_turrets.qh
+
 damage.qh
 
 ../csqcmodellib/interpolate.qh
@@ -47,8 +50,6 @@ movetypes.qh
 prandom.qh
 bgmscript.qh
 noise.qh
-tturrets.qh
-../server/tturrets/include/turrets_early.qh
 ../server/movelib.qc
 main.qh
 vehicles/vehicles.qh
@@ -121,7 +122,9 @@ command/cl_cmd.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc
 ../warpzonelib/client.qc
-tturrets.qc
+
+../common/turrets/cl_turrets.qc
+../common/turrets/turrets.qc
 
 player_skeleton.qc
 ../common/animdecide.qc