Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 78c0b091eb7ecf70205b4086adf96146084a73e9..48cceca20e9303ab9dccdf14208e8d82f1c6cd2c 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -52,11 +52,12 @@ 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/vehicles/vehicles_include.qh
+
 mutators/mutators_include.qh
 
 //// tZork Turrets ////
 tturrets/include/turrets_early.qh
-vehicles/vehicles_def.qh
 
 campaign.qh
 ../common/campaign_common.qh
@@ -213,7 +214,6 @@ race.qc
 
 //// tZork Turrets ////
 tturrets/include/turrets.qh
-vehicles/vehicles.qh
 
 scores.qc
 
@@ -225,6 +225,8 @@ target_spawn.qc
 func_breakable.qc
 target_music.qc
 
+../common/vehicles/vehicles_include.qc
+
 ../common/nades.qc
 ../common/buffs.qc