Merge branch 'terencehill/scoreboard_ui' into 'master'

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

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 7abe6ae9786bd75941f6b927e214dacf80b6508e..2cf8db682f950e179f85f559d0997d6792765823 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,27 +1,27 @@
 #include "portals.qh"
 
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
 #include <common/effects/all.qh>
-#include "hook.qh"
-#include "mutators/_mod.qh"
-#include <server/client.qh>
-#include <server/weapons/common.qh>
-#include "../common/constants.qh"
-#include "../common/deathtypes/all.qh"
-#include "../common/notifications/all.qh"
-#include "../common/mapobjects/teleporters.qh"
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
-#include "../common/mapobjects/subs.qh"
-#include "../common/util.qh"
+#include <common/notifications/all.qh>
+#include <common/util.qh>
+#include <common/vehicles/sv_vehicles.qh>
+#include <common/vehicles/vehicle.qh>
 #include <common/weapons/_all.qh>
-#include "../lib/csqcmodel/sv_model.qh"
-#include "../lib/warpzone/anglestransform.qh"
-#include "../lib/warpzone/util_server.qh"
-#include "../lib/warpzone/common.qh"
-#include "../common/vehicles/vehicle.qh"
-#include "../common/vehicles/sv_vehicles.qh"
 #include <common/weapons/weapon/porto.qh>
-#include <server/player.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/client.qh>
 #include <server/damage.qh>
+#include <server/hook.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/weapons/common.qh>
 
 #define PORTALS_ARE_NOT_SOLID