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 c71889ce1412f68dce5ab08a3ea2359c2db30113..1120eda510e54fa2014f20125fb86c80b7fdd16b 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -16,6 +16,7 @@ sys-post.qh
 ../common/stats.qh
 ../common/teams.qh
 ../common/util.qh
+../common/nades.qh
 ../common/buffs.qh
 ../common/test.qh
 ../common/counting.qh
@@ -39,10 +40,14 @@ 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/mutators_include.qh
 
-//// tZork Turrets ////
-tturrets/include/turrets_early.qh
+//// tZork Vehicles ////
 vehicles/vehicles_def.qh
 
 campaign.qh
@@ -194,8 +199,7 @@ t_quake.qc
 race.qc
 
 
-//// tZork Turrets ////
-tturrets/include/turrets.qh
+//// tZork Vehicles ////
 vehicles/vehicles.qh
 
 scores.qc
@@ -210,6 +214,7 @@ target_music.qc
 
 ../common/items.qc
 
+../common/nades.qc
 ../common/buffs.qc
 
 
@@ -227,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