Merge branch 'master' into Mario/vaporizer_damage

[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 38e9ad8a3b39a27530021e9e3156f2484157e140..d2066b9abde1a14fdee774df9168b86d17347373 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -8,12 +8,9 @@
 #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"
-#include "../waypointsprites.qh"
 
 #include "../bot/bot.qh"
 #include "../bot/navigation.qh"
@@ -25,7 +22,7 @@
 
 #include "../command/vote.qh"
 
-#include "../../common/monsters/monsters.qh"
+#include "../../common/monsters/all.qh"
 
 #include "../command/common.qh"
 
@@ -34,10 +31,11 @@
 
 #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"
 
-#include "../../warpzonelib/mathlib.qh"
 #include "../../warpzonelib/server.qh"
 #include "../../warpzonelib/util_server.qh"