Merge branch 'master' into Mario/vehicles

[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 88fdd239f13b673da029dba98c518c33a4bd10d5..ae13c7d020f14d186eb61bbf2162fe9b61165a3a 100644 (file)
--- a/qcsrc/server/mutators/mutators_include.qc
+++ b/qcsrc/server/mutators/mutators_include.qc
@@ -20,14 +20,14 @@
     #include "../../common/command/markup.qh"
     #include "../../common/command/rpn.qh"
     #include "../../common/command/generic.qh"
     #include "../../common/command/markup.qh"
     #include "../../common/command/rpn.qh"
     #include "../../common/command/generic.qh"

-    #include "../../common/command/shared_defs.qh"
+    #include "../../common/command/command.qh"

     #include "../../common/net_notice.qh"
     #include "../../common/animdecide.qh"
     #include "../../common/net_notice.qh"
     #include "../../common/animdecide.qh"

-    #include "../../common/monsters/monsters.qh"
+    #include "../../common/monsters/all.qh"

     #include "../../common/monsters/sv_monsters.qh"
     #include "../../common/monsters/spawn.qh"
     #include "../../common/weapons/config.qh"
     #include "../../common/monsters/sv_monsters.qh"
     #include "../../common/monsters/spawn.qh"
     #include "../../common/weapons/config.qh"

-    #include "../../common/weapons/weapons.qh"
+    #include "../../common/weapons/all.qh"

     #include "../weapons/accuracy.qh"
     #include "../weapons/common.qh"
     #include "../weapons/csqcprojectile.qh"
     #include "../weapons/accuracy.qh"
     #include "../weapons/common.qh"
     #include "../weapons/csqcprojectile.qh"


@@ -74,12 +74,11 @@
     #include "../playerdemo.qh"
     #include "../round_handler.qh"
     #include "../item_key.qh"
     #include "../playerdemo.qh"
     #include "../round_handler.qh"
     #include "../item_key.qh"

-    #include "../secret.qh"

     #include "../pathlib/pathlib.qh"
     #include "../tturrets/include/turrets.qh"
 #endif
 
     #include "../pathlib/pathlib.qh"
     #include "../tturrets/include/turrets.qh"
 #endif
 

-#include "base.qc"
+#include "../../common/mutators/base.qh"

 #include "gamemode_assault.qc"
 #include "gamemode_ca.qc"
 #include "gamemode_ctf.qc"
 #include "gamemode_assault.qc"
 #include "gamemode_ca.qc"
 #include "gamemode_ctf.qc"