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 f80da18d67309ace7482be0dd4ac37ac784cd1c0..cdd0b09d1fbade0c6fe08e79b7053add507da7e3 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -29,7 +29,6 @@ shownames.qc
 sortlist.qc
 target_music.qc
 teamradar.qc
-tturrets.qc
 tuba.qc
 vehicles/vehicles.qc
 view.qc
@@ -57,6 +56,9 @@ weapons/projectile.qc // TODO
 
 ../common/monsters/monsters.qc
 
+../common/turrets/cl_turrets.qc
+../common/turrets/turrets.qc
+
 ../common/weapons/weapons.qc // TODO
 
 ../csqcmodellib/cl_model.qc
@@ -69,5 +71,6 @@ weapons/projectile.qc // TODO
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/client.qc
+
 ../warpzonelib/common.qc
 ../warpzonelib/mathlib.qc