Merge branch 'master' into develop

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / _mod.inc

diff --git a/qcsrc/server/_mod.inc b/qcsrc/server/_mod.inc
index 429117ad00cf42f7d73aa7e78a22b737dc17f122..c82e892f721815fdeff9c6b46d0260eee26fe86d 100644 (file)
--- a/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@ -2,38 +2,37 @@
 #include <server/anticheat.qc>
 #include <server/antilag.qc>
 #include <server/campaign.qc>
+#include <server/chat.qc>
 #include <server/cheats.qc>
 #include <server/client.qc>
 #include <server/clientkill.qc>
-#include <server/g_damage.qc>
-#include <server/g_hook.qc>
-#include <server/g_world.qc>
+#include <server/damage.qc>
+#include <server/elimination.qc>
+#include <server/gamelog.qc>
 #include <server/handicap.qc>
+#include <server/hook.qc>
 #include <server/impulse.qc>
+#include <server/intermission.qc>
 #include <server/ipban.qc>
-#include <server/item_key.qc>
-#include <server/items.qc>
+#include <server/main.qc>
 #include <server/mapvoting.qc>
 #include <server/matrix.qc>
-#include <server/miscfunctions.qc>
 #include <server/player.qc>
 #include <server/portals.qc>
 #include <server/race.qc>
-#include <server/resources.qc>
 #include <server/round_handler.qc>
 #include <server/scores.qc>
 #include <server/scores_rules.qc>
 #include <server/spawnpoints.qc>
 #include <server/steerlib.qc>
-#ifdef SVQC
-    #include <server/sv_main.qc>
-#endif
 #include <server/teamplay.qc>
 #include <server/tests.qc>
+#include <server/world.qc>
 
 #include <server/bot/_mod.inc>
 #include <server/command/_mod.inc>
 #include <server/compat/_mod.inc>
+#include <server/items/_mod.inc>
 #include <server/mutators/_mod.inc>
 #include <server/pathlib/_mod.inc>
 #include <server/weapons/_mod.inc>