X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fportals.qc;h=7edbc6f996b39d185806bb53c449bfe3d5734265;hb=7069dc3f41678554d089db582ccf16da1f8874a5;hp=6f128716365933599e271f4294ef295a779ef8b8;hpb=a3a388a32d0ea11fe79341ef44edc21c5ba460f4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 6f1287163..7edbc6f99 100644
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -3,10 +3,13 @@
 #include <common/effects/all.qh>
 #include "g_hook.qh"
 #include "mutators/_mod.qh"
+#include <server/client.qh>
+#include <server/weapons/common.qh>
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/notifications/all.qh"
 #include "../common/mapobjects/teleporters.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../common/mapobjects/subs.qh"
 #include "../common/util.qh"
 #include <common/weapons/_all.qh>
@@ -16,6 +19,9 @@
 #include "../lib/warpzone/common.qh"
 #include "../common/vehicles/vehicle.qh"
 #include "../common/vehicles/sv_vehicles.qh"
+#include <common/weapons/weapon/porto.qh>
+#include <server/player.qh>
+#include <server/g_damage.qh>
 
 #define PORTALS_ARE_NOT_SOLID
 
@@ -30,11 +36,10 @@ const vector SAFERNUDGE = '8 8 8';
 
 float PlayerEdgeDistance(entity p, vector v)
 {
-	vector vbest;
-
-	if(v.x < 0) vbest.x = p.mins.x; else vbest.x = p.maxs.x;
-	if(v.y < 0) vbest.y = p.mins.y; else vbest.y = p.maxs.y;
-	if(v.z < 0) vbest.z = p.mins.z; else vbest.z = p.maxs.z;
+	vector vbest = vec3(
+		((v.x < 0) ? p.mins.x : p.maxs.x),
+		((v.y < 0) ? p.mins.y : p.maxs.y),
+		((v.z < 0) ? p.mins.z : p.maxs.z));
 
 	return vbest * v;
 }
@@ -103,7 +108,7 @@ vector Portal_ApplyTransformToPlayerAngle(vector transform, vector vangle)
 }
 
 .vector right_vector;
-float Portal_TeleportPlayer(entity teleporter, entity player)
+float Portal_TeleportPlayer(entity teleporter, entity player, entity portal_owner)
 {
 	vector from, to, safe, step, transform, ang, newvel;
 	float planeshift, s, t;
@@ -189,6 +194,12 @@ float Portal_TeleportPlayer(entity teleporter, entity player)
 		if(time < teleporter.teleport_time + 1)
 			Send_Notification(NOTIF_ONE, player, MSG_ANNCE, ANNCE_ACHIEVEMENT_AMAZING);
 	}
+	else if(player != portal_owner && IS_PLAYER(portal_owner) && IS_PLAYER(player))
+	{
+		player.pusher = portal_owner;
+		player.pushltime = time + autocvar_g_maxpushtime;
+		player.istypefrag = PHYS_INPUT_BUTTON_CHAT(player);
+	}
 
 	if (!teleporter.enemy)
 	{
@@ -317,7 +328,7 @@ void Portal_Touch(entity this, entity toucher)
 	}
 	*/
 
-	if(Portal_TeleportPlayer(this, toucher))
+	if(Portal_TeleportPlayer(this, toucher, this.aiment))
 		if(toucher.classname == "porto")
 			if(toucher.effects & EF_RED)
 				toucher.effects += EF_BLUE - EF_RED;
@@ -440,7 +451,7 @@ void Portal_Damage(entity this, entity inflictor, entity attacker, float damage,
 		Portal_Remove(this, 1);
 }
 
-void Portal_Think_TryTeleportPlayer(entity this, entity e, vector g)
+void Portal_Think_TryTeleportPlayer(entity this, entity e, vector g, entity portal_owner)
 {
 	if(!Portal_WillHitPlane(e.origin, e.mins, e.maxs, e.velocity + g, this.origin, v_forward, this.maxs.x))
 		return;
@@ -449,7 +460,7 @@ void Portal_Think_TryTeleportPlayer(entity this, entity e, vector g)
 	// already teleport him
 	tracebox(e.origin, e.mins, e.maxs, e.origin + e.velocity * 2 * frametime, MOVE_NORMAL, e);
 	if(trace_ent == this)
-		Portal_TeleportPlayer(this, e);
+		Portal_TeleportPlayer(this, e, portal_owner);
 }
 
 void Portal_Think(entity this)
@@ -479,13 +490,13 @@ void Portal_Think(entity this)
 				continue; // cannot go through someone else's portal
 
 		if(it != o || time >= this.portal_activatetime)
-			Portal_Think_TryTeleportPlayer(this, it, g);
+			Portal_Think_TryTeleportPlayer(this, it, g, o);
 
 		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	    {
 	    	.entity weaponentity = weaponentities[slot];
 	    	if(it.(weaponentity).hook)
-	    		Portal_Think_TryTeleportPlayer(this, it.(weaponentity).hook, g);
+	    		Portal_Think_TryTeleportPlayer(this, it.(weaponentity).hook, g, o);
 	    }
 	});
 	this.solid = SOLID_TRIGGER;