Merge branch 'master' into develop

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

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index bd5a8540e22937cd791fb569dd89a24590431e6a..2cf8db682f950e179f85f559d0997d6792765823 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,22 +1,27 @@
 #include "portals.qh"
 
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
 #include <common/effects/all.qh>
-#include "g_hook.qh"
-#include "mutators/_mod.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/util.qh"
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/triggers.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 <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
 
@@ -31,11 +36,10 @@ const vector SAFERNUDGE = '8 8 8';
 
 float PlayerEdgeDistance(entity p, vector v)
 {
-       vector vbest;
-
-       if(v.x < 0) vbest.x = p.mins.x; else vbest.x = p.maxs.x;
-       if(v.y < 0) vbest.y = p.mins.y; else vbest.y = p.maxs.y;
-       if(v.z < 0) vbest.z = p.mins.z; else vbest.z = p.maxs.z;
+       vector vbest = vec3(
+               ((v.x < 0) ? p.mins.x : p.maxs.x),
+               ((v.y < 0) ? p.mins.y : p.maxs.y),
+               ((v.z < 0) ? p.mins.z : p.maxs.z));
 
        return vbest * v;
 }