X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fteleporters.qc;h=438292a438690a3bc83f66edcdcfab182f6d4fab;hb=2ce2f533321210bef1f49b1245a8ea1fda15eea4;hp=25b18dd0955ab6c4e75a423c9f44939f43d5d846;hpb=8f935a3cd36d703f480691e5fe61ecaac0ebb5c0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index 25b18dd09..438292a43 100644
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -3,7 +3,6 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../server/_all.qh"
     #include "../../warpzonelib/common.qh"
     #include "../../warpzonelib/util_server.qh"
     #include "../../warpzonelib/server.qh"
@@ -15,7 +14,7 @@
     #include "../../server/constants.qh"
     #include "../../server/defs.qh"
     #include "../deathtypes.qh"
-    #include "../../server/tturrets/include/turrets_early.qh"
+    #include "../turrets/sv_turrets.qh"
     #include "../vehicles/all.qh"
     #include "../mapinfo.qh"
     #include "../../server/anticheat.qh"
@@ -63,7 +62,7 @@ void spawn_tdeath(vector v0, entity e, vector v)
 }
 
 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;
 
@@ -79,11 +78,11 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 		if(self.pushltime < time) // only show one teleport effect per teleporter per 0.2 seconds, for better fps
 		{
 			if(tflags & TELEPORT_FLAG_SOUND)
-				sound (player, CH_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTEN_NORM);
+				sound (player, CH_TRIGGER, SND_TELEPORT, VOL_BASE, ATTEN_NORM);
 			if(tflags & TELEPORT_FLAG_PARTICLES)
 			{
-				Send_Effect("teleport", player.origin, '0 0 0', 1);
-				Send_Effect("teleport", to + v_forward * 32, '0 0 0', 1);
+				Send_Effect(EFFECT_TELEPORT, player.origin, '0 0 0', 1);
+				Send_Effect(EFFECT_TELEPORT, to + v_forward * 32, '0 0 0', 1);
 			}
 			self.pushltime = time + 0.2;
 		}
@@ -179,7 +178,7 @@ entity Simple_TeleportPlayer(entity teleporter, entity player)
 }
 
 void teleport_findtarget (void)
-{
+{SELFPARAM();
 	entity e;
 	float n;
 
@@ -190,7 +189,7 @@ void teleport_findtarget (void)
 		if(e.movetype == MOVETYPE_NONE)
 			waypoint_spawnforteleporter(self, e.origin, 0);
 		if(e.classname != "info_teleport_destination")
-			print("^3MAPPER ERROR: teleporter does target an invalid teleport destination entity. Angles will not work.\n");
+			LOG_INFO("^3MAPPER ERROR: teleporter does target an invalid teleport destination entity. Angles will not work.\n");
 	}
 
 	if(n == 0)
@@ -224,22 +223,19 @@ entity Teleport_Find(vector mi, vector ma)
 }
 
 void WarpZone_PostTeleportPlayer_Callback(entity pl)
-{
+{SELFPARAM();
 	makevectors(pl.angles);
 	Reset_ArcBeam(pl, v_forward);
 	UpdateCSQCProjectileAfterTeleport(pl);
 	{
-		entity oldself = self;
-		self = pl;
-		anticheat_fixangle();
-		self = oldself;
+		WITH(entity, self, pl, anticheat_fixangle());
 	}
 	// "disown" projectiles after teleport
 	if(pl.owner)
 	if(pl.owner == pl.realowner)
 	{
 		if(!(pl.flags & FL_PROJECTILE))
-			print("A non-projectile got through a warpzone and its owner cleared. It's a ", pl.classname, ".\n");
+			LOG_INFO("A non-projectile got through a warpzone and its owner cleared. It's a ", pl.classname, ".\n");
 		pl.owner = world;
 	}
 	if(IS_PLAYER(pl))