Kill most cases of FOR_EACH_CLIENT and deprecate FOR_EACH_MONSTER

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

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 9b1d7194f9555587bb42fcda6e0d01d589c168fc..8f311f169ce32bd5842c2b0dbbcdcfc8507ed93d 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -53,7 +53,7 @@ vector Portal_ApplyTransformToPlayerAngle(vector transform, vector vangle)
         */
 
        // PLAYERS use different math
-#ifndef POSITIVE_PITCH_IS_DOWN
+#if !(POSITIVE_PITCH_IS_DOWN)
        ang.x = -ang.x;
 #endif
 
@@ -94,7 +94,7 @@ vector Portal_ApplyTransformToPlayerAngle(vector transform, vector vangle)
                //print("GOOD path: ", vtos(ang), "\n");
        }
 
-#ifndef POSITIVE_PITCH_IS_DOWN
+#if !(POSITIVE_PITCH_IS_DOWN)
        ang.x = -ang.x;
 #endif
        ang.z = vangle.z;
@@ -454,7 +454,7 @@ void Portal_Think_TryTeleportPlayer(entity e, vector g)
 
 void Portal_Think()
 {SELFPARAM();
-       entity e, o;
+       entity o;
        vector g;
 
 #ifdef PORTALS_ARE_NOT_SOLID
@@ -473,18 +473,17 @@ void Portal_Think()
 
        fixedmakevectors(self.mangle);
 
-       FOR_EACH_PLAYER(e)
-       {
-               if(e != o)
-                       if(IS_INDEPENDENT_PLAYER(e) || IS_INDEPENDENT_PLAYER(o))
+       FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+               if(it != o)
+                       if(IS_INDEPENDENT_PLAYER(it) || IS_INDEPENDENT_PLAYER(o))
                                continue; // cannot go through someone else's portal
 
-               if(e != o || time >= self.portal_activatetime)
-                       Portal_Think_TryTeleportPlayer(e, g);
+               if(it != o || time >= self.portal_activatetime)
+                       Portal_Think_TryTeleportPlayer(it, g);
 
-               if(e.hook)
-                       Portal_Think_TryTeleportPlayer(e.hook, g);
-       }
+               if(it.hook)
+                       Portal_Think_TryTeleportPlayer(it.hook, g);
+       ));
        self.solid = SOLID_TRIGGER;
        self.aiment = o;
 #endif
@@ -624,8 +623,7 @@ entity Portal_Spawn(entity own, vector org, vector ang)
        if(!CheckWireframeBox(own, org - 48 * v_right - 48 * v_up + 16 * v_forward, 96 * v_right, 96 * v_up, 96 * v_forward))
                return world;
 
-       portal = spawn();
-       portal.classname = "portal";
+       portal = new(portal);
        portal.aiment = own;
        setorigin(portal, org);
        portal.mangle = ang;