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 25b9d6d7886bcb4e20a3e6aff61c551fb82bbea9..1120eda510e54fa2014f20125fb86c80b7fdd16b 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -13,8 +13,11 @@ sys-post.qh
 ../warpzonelib/server.qh
 
 ../common/constants.qh
+../common/stats.qh
 ../common/teams.qh
 ../common/util.qh
+../common/nades.qh
+../common/buffs.qh
 ../common/test.qh
 ../common/counting.qh
 ../common/items.qh
@@ -37,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
@@ -76,6 +83,8 @@ scores.qh
 
 spawnpoints.qh
 
+mapvoting.qh
+
 ipban.qh
 
 race.qh
@@ -121,6 +130,8 @@ pathlib/pathlib.qh
 g_world.qc
 g_casings.qc
 
+mapvoting.qc
+
 t_jumppads.qc
 t_teleporters.qc
 
@@ -188,8 +199,7 @@ t_quake.qc
 race.qc
 
 
-//// tZork Turrets ////
-tturrets/include/turrets.qh
+//// tZork Vehicles ////
 vehicles/vehicles.qh
 
 scores.qc
@@ -204,6 +214,9 @@ target_music.qc
 
 ../common/items.qc
 
+../common/nades.qc
+../common/buffs.qc
+
 
 accuracy.qc
 ../csqcmodellib/sv_model.qc
@@ -219,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