X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fportals.qc;h=6de3e0af39fc0e16840ae692f4b13548ca83b755;hb=9a8e15cbd3858cf9f8958dfa8ab1c126acca2655;hp=b41c53bbcce4eed3dcd541f25fd738ebfb750fae;hpb=f6a5832d12fbcf7fb4f44778063e2c251b9d0a38;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index b41c53bbc..6de3e0af3 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -1,5 +1,6 @@ #include "portals.qh" +#include #include "g_hook.qh" #include "mutators/_mod.qh" #include "../common/constants.qh" @@ -208,8 +209,8 @@ float Portal_FindSafeOrigin(entity portal) { vector o; o = portal.origin; - portal.mins = STAT(PL_MIN, NULL) - SAFERNUDGE; - portal.maxs = STAT(PL_MAX, NULL) + SAFERNUDGE; + portal.mins = PL_MIN_CONST - SAFERNUDGE; + portal.maxs = PL_MAX_CONST + SAFERNUDGE; fixedmakevectors(portal.mangle); portal.origin += 16 * v_forward; if(!move_out_of_solid(portal)) @@ -473,7 +474,7 @@ void Portal_Think(entity this) fixedmakevectors(this.mangle); - FOREACH_CLIENT(IS_PLAYER(it), LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it), { if(it != o) if(IS_INDEPENDENT_PLAYER(it) || IS_INDEPENDENT_PLAYER(o)) continue; // cannot go through someone else's portal @@ -487,7 +488,7 @@ void Portal_Think(entity this) if(it.(weaponentity).hook) Portal_Think_TryTeleportPlayer(this, it.(weaponentity).hook, g); } - )); + }); this.solid = SOLID_TRIGGER; this.aiment = o; #endif