Style: expand LAMBDA()

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

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 12083e423cb573b940c3c82c9453450447f6c096..260e035b5bef4251057af0cec6d12663b211677f 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -208,8 +208,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 +473,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
@@ -481,9 +481,13 @@ void Portal_Think(entity this)
                if(it != o || time >= this.portal_activatetime)
                        Portal_Think_TryTeleportPlayer(this, it, g);
 
-               if(it.hook)
-                       Portal_Think_TryTeleportPlayer(this, it.hook, g);
-       ));
+               for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+           {
+               .entity weaponentity = weaponentities[slot];
+               if(it.(weaponentity).hook)
+                       Portal_Think_TryTeleportPlayer(this, it.(weaponentity).hook, g);
+           }
+       });
        this.solid = SOLID_TRIGGER;
        this.aiment = o;
 #endif