X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fportals.qc;h=20039cfcc8205c83f784012c01a286cdfc531e50;hp=f6502dfd812335d794b6a43f79322a03f68a6402;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=8e0690ba978a6a0c7287bc3cfa2873a05b15fc5f

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index f6502dfd81..20039cfcc8 100644
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,14 +1,15 @@
 #include "portals.qh"
 
+#include <common/effects/all.qh>
 #include "g_hook.qh"
-#include "mutators/all.qh"
+#include "mutators/_mod.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/notifications/all.qh"
 #include "../common/triggers/teleporters.qh"
 #include "../common/triggers/subs.qh"
 #include "../common/util.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 #include "../lib/csqcmodel/sv_model.qh"
 #include "../lib/warpzone/anglestransform.qh"
 #include "../lib/warpzone/util_server.qh"
@@ -148,7 +149,7 @@ float Portal_TeleportPlayer(entity teleporter, entity player)
 	tracebox(safe, player.mins - SAFENUDGE, player.maxs + SAFENUDGE, step, MOVE_NOMONSTERS, player);
 	if(trace_startsolid)
 	{
-		LOG_INFO("'safe' teleport location is not safe!\n");
+		LOG_INFO("'safe' teleport location is not safe!");
 		// FAIL TODO why does this happen?
 		return 0;
 	}
@@ -156,7 +157,7 @@ float Portal_TeleportPlayer(entity teleporter, entity player)
 	tracebox(safe, player.mins - SAFENUDGE, player.maxs + SAFENUDGE, to, MOVE_NOMONSTERS, player);
 	if(trace_startsolid)
 	{
-		LOG_INFO("trace_endpos in solid, this can't be!\n");
+		LOG_INFO("trace_endpos in solid, this can't be!");
 		// FAIL TODO why does this happen? (reported by MrBougo)
 		return 0;
 	}
@@ -208,14 +209,14 @@ 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))
 	{
 #ifdef DEBUG
-		LOG_INFO("NO SAFE ORIGIN\n");
+		LOG_INFO("NO SAFE ORIGIN");
 #endif
 		return 0;
 	}
@@ -249,7 +250,7 @@ float Portal_WillHitPlane(vector eorg, vector emins, vector emaxs, vector evel,
 #endif
 }
 
-void Portal_Touch(entity this)
+void Portal_Touch(entity this, entity toucher)
 {
 	vector g;
 
@@ -258,18 +259,18 @@ void Portal_Touch(entity this)
 	if(this.solid != SOLID_TRIGGER)
 		return; // possibly engine bug
 
-	if(IS_PLAYER(other))
+	if(IS_PLAYER(toucher))
 		return; // handled by think
 #endif
 
-	if(other.classname == "item_flag_team")
+	if(toucher.classname == "item_flag_team")
 		return; // never portal these
 
-	if(other.classname == "grapplinghook")
+	if(toucher.classname == "grapplinghook")
 		return; // handled by think
 
 	if(!autocvar_g_vehicles_teleportable)
-	if(other.vehicle_flags & VHF_ISVEHICLE)
+	if(IS_VEHICLE(toucher))
 		return; // no teleporting vehicles?
 
 	if(!this.enemy)
@@ -283,43 +284,43 @@ void Portal_Touch(entity this)
 		return; // only handle impacts
 #endif
 
-	if(other.classname == "porto")
+	if(toucher.classname == "porto")
 	{
-		if(other.portal_id == this.portal_id)
+		if(toucher.portal_id == this.portal_id)
 			return;
 	}
 	if(time < this.portal_activatetime)
-		if(other == this.aiment)
+		if(toucher == this.aiment)
 		{
 			this.portal_activatetime = time + 0.1;
 			return;
 		}
-	if(other != this.aiment)
-		if(IS_PLAYER(other))
-			if(IS_INDEPENDENT_PLAYER(other) || IS_INDEPENDENT_PLAYER(this.aiment))
+	if(toucher != this.aiment)
+		if(IS_PLAYER(toucher))
+			if(IS_INDEPENDENT_PLAYER(toucher) || IS_INDEPENDENT_PLAYER(this.aiment))
 				return; // cannot go through someone else's portal
-	if(other.aiment != this.aiment)
-		if(IS_PLAYER(other.aiment))
-			if(IS_INDEPENDENT_PLAYER(other.aiment) || IS_INDEPENDENT_PLAYER(this.aiment))
+	if(toucher.aiment != this.aiment)
+		if(IS_PLAYER(toucher.aiment))
+			if(IS_INDEPENDENT_PLAYER(toucher.aiment) || IS_INDEPENDENT_PLAYER(this.aiment))
 				return; // cannot go through someone else's portal
 	fixedmakevectors(this.mangle);
 	g = frametime * '0 0 -1' * autocvar_sv_gravity;
-	if(!Portal_WillHitPlane(other.origin, other.mins, other.maxs, other.velocity + g, this.origin, v_forward, this.maxs.x))
+	if(!Portal_WillHitPlane(toucher.origin, toucher.mins, toucher.maxs, toucher.velocity + g, this.origin, v_forward, this.maxs.x))
 		return;
 
 	/*
-	if(other.mins_x < PL_MIN.x || other.mins_y < PL_MIN.y || other.mins_z < PL_MIN.z
-	|| other.maxs_x > PL_MAX.x || other.maxs_y > PL_MAX.y || other.maxs_z > PL_MAX.z)
+	if(toucher.mins_x < PL_MIN.x || toucher.mins_y < PL_MIN.y || toucher.mins_z < PL_MIN.z
+	|| toucher.maxs_x > PL_MAX.x || toucher.maxs_y > PL_MAX.y || toucher.maxs_z > PL_MAX.z)
 	{
 		// can't teleport this
 		return;
 	}
 	*/
 
-	if(Portal_TeleportPlayer(this, other))
-		if(other.classname == "porto")
-			if(other.effects & EF_RED)
-				other.effects += EF_BLUE - EF_RED;
+	if(Portal_TeleportPlayer(this, toucher))
+		if(toucher.classname == "porto")
+			if(toucher.effects & EF_RED)
+				toucher.effects += EF_BLUE - EF_RED;
 }
 
 void Portal_Think(entity this);
@@ -418,7 +419,7 @@ void Portal_Remove(entity portal, float killed)
 		fixedmakevectors(portal.mangle);
 		sound(portal, CH_SHOTS, SND_PORTO_EXPLODE, VOL_BASE, ATTEN_NORM);
 		Send_Effect(EFFECT_ROCKET_EXPLODE, portal.origin + v_forward * 16, v_forward * 1024, 4);
-		remove(portal);
+		delete(portal);
 	}
 	else
 	{
@@ -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
@@ -481,9 +482,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
@@ -494,15 +499,15 @@ void Portal_Think(entity this)
 		Portal_Remove(this, 0);
 }
 
-float Portal_Customize(entity this)
+bool Portal_Customize(entity this, entity client)
 {
-	if(IS_SPEC(other))
-		other = other.enemy;
-	if(other == this.aiment)
+	if(IS_SPEC(client))
+		client = client.enemy;
+	if(client == this.aiment)
 	{
 		this.modelindex = this.savemodelindex;
 	}
-	else if(IS_INDEPENDENT_PLAYER(other) || IS_INDEPENDENT_PLAYER(this.aiment))
+	else if(IS_INDEPENDENT_PLAYER(client) || IS_INDEPENDENT_PLAYER(this.aiment))
 	{
 		this.modelindex = 0;
 	}
@@ -642,7 +647,7 @@ entity Portal_Spawn(entity own, vector org, vector ang)
 
 	if(!Portal_FindSafeOrigin(portal))
 	{
-		remove(portal);
+		delete(portal);
 		return NULL;
 	}