X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fportals.qc;h=361abcd1128d664c2d2286de40b227aa4fd87fd0;hb=39d7296bebbb6ea486c5cdb59c7f60d11aedd1c3;hp=18600463741fc20bb88e1fd5baf07b7a9ddb47bc;hpb=719ba01817465b96db552e18c7f277721d8dbb7e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 186004637..361abcd11 100644
--- 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;
@@ -208,8 +208,8 @@ float Portal_FindSafeOrigin(entity portal)
 {
 	vector o;
 	o = portal.origin;
-	portal.mins = PL_MIN - SAFERNUDGE;
-	portal.maxs = PL_MAX + SAFERNUDGE;
+	portal.mins = STAT(PL_MIN, NULL) - SAFERNUDGE;
+	portal.maxs = STAT(PL_MAX, NULL) + SAFERNUDGE;
 	fixedmakevectors(portal.mangle);
 	portal.origin += 16 * v_forward;
 	if(!move_out_of_solid(portal))
@@ -428,16 +428,16 @@ void Portal_Remove(entity portal, float killed)
 	}
 }
 
-void Portal_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{SELFPARAM();
+void Portal_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+{
 	if(deathtype == DEATH_TELEFRAG.m_id)
 		return;
-	if(attacker != self.aiment)
-		if(IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(self.aiment))
+	if(attacker != this.aiment)
+		if(IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(this.aiment))
 			return;
-	self.health -= damage;
-	if(self.health < 0)
-		Portal_Remove(self, 1);
+	this.health -= damage;
+	if(this.health < 0)
+		Portal_Remove(this, 1);
 }
 
 void Portal_Think_TryTeleportPlayer(entity e, vector g)
@@ -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