Merge branch 'master' into TimePath/deathtypes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutators_include.qc

diff --git a/qcsrc/server/mutators/mutators_include.qc b/qcsrc/server/mutators/mutators_include.qc
index d5e47c62f845cecd29cff0afd1de0e151a6c21e3..d2ea4688f0a06ccfcf534882a532df7f5e877bf9 100644 (file)
--- a/qcsrc/server/mutators/mutators_include.qc
+++ b/qcsrc/server/mutators/mutators_include.qc
@@ -1,12 +1,10 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
+    #include "../../lib/warpzone/anglestransform.qh"
+    #include "../../lib/warpzone/common.qh"
+    #include "../../lib/warpzone/util_server.qh"
+    #include "../../lib/warpzone/server.qh"
     #include "../../common/constants.qh"
     #include "../../common/stats.qh"
     #include "../../common/teams.qh"
@@ -54,8 +52,8 @@
     #include "../command/cmd.qh"
     #include "../command/sv_cmd.qh"
     #include "../../common/csqcmodel_settings.qh"
-    #include "../../csqcmodellib/common.qh"
-    #include "../../csqcmodellib/sv_model.qh"
+    #include "../../lib/csqcmodel/common.qh"
+    #include "../../lib/csqcmodel/sv_model.qh"
     #include "../anticheat.qh"
     #include "../cheats.qh"
     #include "../../common/playerstats.qh"
@@ -87,7 +85,6 @@
 #include "gamemode_keepaway.qc"
 #include "gamemode_keyhunt.qc"
 #include "gamemode_lms.qc"
-#include "gamemode_nexball.qc"
 #include "gamemode_onslaught.qc"
 #include "gamemode_race.qc"
 #include "gamemode_tdm.qc"
@@ -98,7 +95,6 @@
 #include "mutator_campcheck.qc"
 #include "mutator_dodging.qc"
 #include "mutator_hook.qc"
-#include "mutator_instagib.qc"
 #include "mutator_invincibleproj.qc"
 #include "mutator_melee_only.qc"
 #include "mutator_midair.qc"