X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fteleporters.qc;h=afeabfcddc3cba2cf3da9d779b5007a79176505c;hb=77d6a05629e33da863fccb3cdd03b3c63af890dd;hp=eae31ead021891d6b9f8e8803175a4bbda5363b1;hpb=f8ae7c7b2490de9c4f18f10f8986c977d7931571;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index eae31ead0..afeabfcdd 100644
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -68,7 +68,7 @@ void spawn_tdeath(vector v0, entity e, vector v)
 #endif
 
 void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity, vector telefragmin, vector telefragmax, float tflags)
-{SELFPARAM();
+{
 	entity telefragger;
 	vector from;
 
@@ -80,6 +80,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 	makevectors (to_angles);
 
 #ifdef SVQC
+    SELFPARAM();
 	if(player.teleportable == TELEPORT_NORMAL) // don't play sounds or show particles for anything that isn't a player, maybe change later to block only observers
 	{
 		if(self.pushltime < time) // only show one teleport effect per teleporter per 0.2 seconds, for better fps
@@ -160,7 +161,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 		{
 			player.pusher = teleporter.owner;
 			player.pushltime = time + autocvar_g_maxpushtime;
-			player.istypefrag = player.BUTTON_CHAT;
+			player.istypefrag = PHYS_INPUT_BUTTON_CHAT(player);
 		}
 		else
 		{
@@ -248,6 +249,7 @@ entity Simple_TeleportPlayer(entity teleporter, entity player)
 
 void teleport_findtarget()
 {
+    SELFPARAM();
 	int n = 0;
 	entity e;
 	for(e = world; (e = find(e, targetname, self.target)); )
@@ -298,15 +300,13 @@ entity Teleport_Find(vector mi, vector ma)
 }
 
 void WarpZone_PostTeleportPlayer_Callback(entity pl)
-{SELFPARAM();
+{
 #ifdef SVQC
 	makevectors(pl.angles);
 	Reset_ArcBeam(pl, v_forward);
 	UpdateCSQCProjectileAfterTeleport(pl);
 	UpdateItemAfterTeleport(pl);
-	{
-		WITH(entity, self, pl, anticheat_fixangle());
-	}
+    if (IS_PLAYER(pl)) anticheat_fixangle(pl);
 #endif
 	// "disown" projectiles after teleport
 	if(pl.owner)