Merge branch 'master' into bones_was_here/q3compat

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index adad55b7499d99706b23f494798d47fa18509850..afaf00ed66460d968d0fba62d2e62026a46e9ec4 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -1,21 +1,17 @@
 #include "teamplay.qh"
 
-#include "client.qh"
-#include <server/gamelog.qh>
+#include <common/deathtypes/all.qh>
+#include <common/gamemodes/_mod.qh>
+#include <common/teams.qh>
+#include <server/bot/api.qh>
+#include <server/client.qh>
+#include <server/command/vote.qh>
 #include <server/damage.qh>
-#include "race.qh"
-#include "scores.qh"
-#include "scores_rules.qh"
-
-#include "bot/api.qh"
-
-#include "command/vote.qh"
-
+#include <server/gamelog.qh>
 #include <server/mutators/_mod.qh>
-
-#include "../common/deathtypes/all.qh"
-#include <common/gamemodes/_mod.qh>
-#include "../common/teams.qh"
+#include <server/race.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
 
 /// \brief Describes a state of team balance entity.
 enum