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 288b2477597c00114d0a3b0246c296f3e1360b51..820ddbd2f8189566f2346400ef83447dca1ff13c 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -40,11 +40,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
@@ -197,7 +198,6 @@ race.qc
 
 //// tZork Turrets ////
 tturrets/include/turrets.qh
-vehicles/vehicles.qh
 
 scores.qc
 
@@ -211,10 +211,10 @@ target_music.qc
 
 ../common/items.qc
 
+../common/vehicles/vehicles_include.qc
 ../common/nades.qc
 ../common/buffs.qc
 
-
 accuracy.qc
 ../csqcmodellib/sv_model.qc
 csqcprojectile.qc