Merge branch 'master' into Mirio/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator.qh

diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh
index d7474fab45e3c75352109cdadc38b88426409556..40fad29b34426e03fae679d508eab6968ca327ba 100644 (file)
--- a/qcsrc/server/mutators/mutator.qh
+++ b/qcsrc/server/mutators/mutator.qh
@@ -1,47 +1,40 @@
-#ifndef MUTATOR_H
-#define MUTATOR_H
-
-#include "base.qh"
-#include "mutator_nades.qh"
-
-#include "../cl_client.qh"
-#include "../cl_player.qh"
-#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"
-#include "../bot/waypoints.qh"
-
-#include "../bot/havocbot/havocbot.qh"
-#include "../bot/havocbot/roles.qh"
-#include "../bot/havocbot/role_keyhunt.qh"
-
-#include "../command/vote.qh"
-#include "../command/common.qh"
-
-#include "../weapons/common.qh"
-#include "../weapons/tracing.qh"
-#include "../weapons/throwing.qh"
-#include "../weapons/weaponsystem.qh"
-
-#include "../../common/deathtypes.qh"
-#include "../../common/notifications.qh"
-#include "../../common/stats.qh"
-#include "../../common/teams.qh"
-
-#include "../../common/monsters/all.qh"
-
-#include "../../warpzonelib/anglestransform.qh"
-#include "../../warpzonelib/mathlib.qh"
-#include "../../warpzonelib/server.qh"
-#include "../../warpzonelib/util_server.qh"
-
-#endif
+#pragma once
+
+#include <common/mutators/base.qh>
+
+#include <server/cl_client.qh>
+#include <server/cl_player.qh>
+#include <server/cl_impulse.qh>
+#include <server/cheats.qh>
+#include <server/g_damage.qh>
+#include <server/round_handler.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
+
+#include <server/bot/bot.qh>
+#include <server/bot/navigation.qh>
+#include <server/bot/waypoints.qh>
+
+#include <server/bot/havocbot/havocbot.qh>
+#include <server/bot/havocbot/roles.qh>
+
+#include <server/command/vote.qh>
+#include <server/command/common.qh>
+
+#include <server/weapons/common.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/throwing.qh>
+#include <server/weapons/weaponsystem.qh>
+
+#include <common/deathtypes/all.qh>
+#include <common/notifications/all.qh>
+#include <common/triggers/teleporters.qh>
+#include <common/triggers/subs.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
+
+#include <common/monsters/all.qh>
+
+#include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/server.qh>
+#include <lib/warpzone/util_server.qh>