Merge master into qc_physics_prehax (blame TimePath if it's completely broken)

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

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index 101bdece81d943748c9be2b44e75894451601345..32e48f370162f6c89c4c11b8c4fb0e26aa802bec 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -8,8 +8,6 @@
 #include "../cl_impulse.qh"
 #include "../cheats.qh"
 #include "../g_damage.qh"
-#include "../g_subs.qh"
-#include "../t_teleporters.qh"
 #include "../round_handler.qh"
 #include "../scores.qh"
 #include "../scores_rules.qh"
@@ -34,6 +32,8 @@
 
 #include "../../common/deathtypes.qh"
 #include "../../common/notifications.qh"
+#include "../../common/triggers/teleporters.qh"
+#include "../../common/triggers/subs.qh"
 #include "../../common/stats.qh"
 #include "../../common/teams.qh"