Merge branch 'master' into Mario/arc_bolt_bounce

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

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 75d0e2caf810ddbbfc90c9d0b5a01e60931d8977..3506aa7b799b9dc254cac14ac7ad09c71c4eaec6 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -1,43 +1,32 @@
 #include "cheats.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <common/effects/all.qh>
-#include <server/resources.qh>
-#include <server/main.qh>
-#include <server/world.qh>
-
-#include "damage.qh"
-#include "clientkill.qh"
-#include "player.qh"
-#include "race.qh"
-#include <common/mapobjects/teleporters.qh>
-
-#include <server/mutators/_mod.qh>
-
 #include "weapons/tracing.qh"
-
 #include <common/constants.qh>
 #include <common/deathtypes/all.qh>
-#include <common/util.qh>
-
-#include <common/physics/player.qh>
-
-#include <common/monsters/_mod.qh>
-
+#include <common/effects/all.qh>
 #include <common/items/_mod.qh>
-
-#include <common/weapons/_all.qh>
-
+#include <common/mapobjects/func/breakable.qh>
 #include <common/mapobjects/subs.qh>
+#include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
-
-#include <common/mapobjects/func/breakable.qh>
-
+#include <common/monsters/_mod.qh>
+#include <common/physics/player.qh>
+#include <common/stats.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
 #include <lib/csqcmodel/sv_model.qh>
-
 #include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/common.qh>
 #include <lib/warpzone/util_server.qh>
+#include <server/clientkill.qh>
+#include <server/damage.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/race.qh>
+#include <server/resources.qh>
+#include <server/world.qh>
 
 #ifdef NOCHEATS