Merge branch 'master' into terencehill/slider_anim_improvements

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qh

diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index 49f495bc4a86dd5ed4c8a8dc19ae042aaff5de64..8d7db7f5dcf05a46e3804b0acf2d5aa16de0731d 100644 (file)
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -10,7 +10,7 @@
     #include "../common/constants.qh"
     #include "../common/teams.qh"
     #include "../common/util.qh"
-    #include "../common/weapons/weapons.qh"
+    #include "../common/weapons/all.qh"
     #include "weapons/accuracy.qh"
     #include "weapons/csqcprojectile.qh"
     #include "weapons/selection.qh"
@@ -21,8 +21,8 @@
     #include "../common/notifications.qh"
     #include "../common/deathtypes.qh"
     #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicle.qh"
+    #include "../common/turrets/sv_turrets.qh"
+    #include "../common/vehicles/all.qh"
     #include "../csqcmodellib/sv_model.qh"
     #include "../common/playerstats.qh"
     #include "g_hook.qh"