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 d161c6dfc60b09ff502b2cfa4bb24c313ade789d..6292ad5dd1ed09476f7c68e4d03922639a5e0743 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -28,7 +28,6 @@ scoreboard.qc
 shownames.qc
 sortlist.qc
 teamradar.qc
-tturrets.qc
 tuba.qc
 t_items.qc
 view.qc
@@ -37,13 +36,11 @@ waypointsprites.qc
 
 command/all.qc
 
-vehicles/bumblebee.qc
-vehicles/all.qc
-
 weapons/projectile.qc // TODO
 
 ../common/animdecide.qc
 ../common/buffs.qc
+../common/effects.qc
 ../common/mapinfo.qc
 ../common/movetypes/include.qc
 ../common/nades.qc
@@ -58,9 +55,14 @@ weapons/projectile.qc // TODO
 
 ../common/viewloc.qc
 
+../common/weapons/all.qc // TODO
+
 ../common/items/all.qc
 
 ../common/monsters/all.qc
+../common/turrets/cl_turrets.qc
+../common/turrets/turrets.qc
+
 
 ../common/weapons/all.qc // TODO
 
@@ -70,10 +72,15 @@ weapons/projectile.qc // TODO
 ../csqcmodellib/cl_player.qc
 ../csqcmodellib/interpolate.qc
 
+../common/vehicles/vehicles_include.qc
+
 ../server/mutators/mutator_multijump.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/client.qc
+
 ../warpzonelib/common.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/util_server.qc
+
+../../mod/client/progs.inc