Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 1ae22e2029f7ff518aff3b21533a54a07163673d..14902a8a375dbab71566ce5e5f34f192cab68cce 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -37,6 +37,11 @@ defs.qh              // Should rename this, it has fields and globals
 ../common/notifications.qh // must be after autocvars
 ../common/deathtypes.qh // must be after notifications
 
+../common/turrets/config.qh
+../common/turrets/turrets.qh
+../common/turrets/sv_turrets.qh
+../common/turrets/util.qc
+
 mutators/base.qh
 mutators/mutators.qh
 mutators/gamemode_assault.qh
@@ -51,8 +56,7 @@ mutators/gamemode_invasion.qh
 mutators/mutator_dodging.qh
 mutators/mutator_nades.qh
 
-//// tZork Turrets ////
-tturrets/include/turrets_early.qh
+//// tZork Vehicles ////
 vehicles/vehicles_def.qh
 
 campaign.qh
@@ -198,8 +202,7 @@ t_quake.qc
 race.qc
 
 
-//// tZork Turrets ////
-tturrets/include/turrets.qh
+//// tZork Vehicles ////
 vehicles/vehicles.qh
 
 scores.qc
@@ -229,6 +232,12 @@ round_handler.qc
 
 ../common/explosion_equation.qc
 
+../common/turrets/sv_turrets.qc
+../common/turrets/config.qc
+../common/turrets/turrets.qc
+../common/turrets/checkpoint.qc
+../common/turrets/targettrigger.qc
+
 ../common/monsters/sv_monsters.qc
 ../common/monsters/monsters.qc