X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_teleporters.qc;h=0adbd5196af1731fecf51774167e77816d161c1b;hb=128c68b3e475d812ab3aa81a1aab0648a7d80505;hp=93ced82670b1a36fb15c42a8236419621d52513a;hpb=f209ef256e1c8cc09fcfb1cf3b3f30f34345e88b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 93ced8267..0adbd5196 100644
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -1,6 +1,6 @@
 void trigger_teleport_use()
 {
-	if(teams_matter)
+	if(teamplay)
 		self.team = activator.team;
 }
 
@@ -33,7 +33,7 @@ float check_tdeath(entity player, vector org, vector telefragmin, vector telefra
 	{
 		TDEATHLOOP(org)
 		{
-			if not(teams_matter && autocvar_g_telefrags_teamplay && head.team == player.team)
+			if not(teamplay && autocvar_g_telefrags_teamplay && head.team == player.team)
 				if(head.classname == "player")
 					if(head.health >= 1)
 						return 1;
@@ -48,7 +48,7 @@ void tdeath(entity player, entity teleporter, entity telefragger, vector telefra
 	{
 		if (player.classname == "player" && player.health >= 1)
 		{
-			if not(teams_matter && autocvar_g_telefrags_teamplay && head.team == player.team)
+			if not(teamplay && autocvar_g_telefrags_teamplay && head.team == player.team)
 			{
 				if(head.classname == "player")
 					if(head.health >= 1)
@@ -77,7 +77,6 @@ void spawn_tdeath(vector v0, entity e, vector v)
 #define TELEPORT_FLAGS_TELEPORTER (TELEPORT_FLAG_SOUND | TELEPORT_FLAG_PARTICLES | TELEPORT_FLAG_TDEATH)
 void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity, vector telefragmin, vector telefragmax, float tflags)
 {
-	entity oldself;
 	entity telefragger;
 	vector from;
 
@@ -91,7 +90,7 @@ 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, CHAN_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTN_NORM);
+			sound (player, CH_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTN_NORM);
 		if(tflags & TELEPORT_FLAG_PARTICLES)
 		{
 			pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1);
@@ -136,14 +135,6 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 		}
 
 		player.lastteleporttime = time;
-
-		// stop player name display
-		{
-			oldself = self;
-			self = player;
-			ClearSelectedPlayer();
-			self = oldself;
-		}
 	}
 }
 
@@ -157,9 +148,14 @@ void Teleport_Touch (void)
 	if (self.active != ACTIVE_ACTIVE)
 		return;
 	
-	if (other.health < 1)
+	if not(other.iscreature)
 		return;
-	if not(other.flags & FL_CLIENT)	// FIXME: Make missiles firable through the teleport too
+
+	// for gameplay: vehicles can't teleport
+	if (other.vehicle_flags & VHF_ISVEHICLE)
+		return;
+
+	if (other.deadflag != DEAD_NO)
 		return;
 
 	if(self.team)
@@ -255,18 +251,15 @@ void teleport_findtarget (void)
 	entity e;
 	float n;
 
-	RandomSelection_Init();
 	n = 0;
 	for(e = world; (e = find(e, targetname, self.target)); )
 	{
 		++n;
 		if(e.movetype == MOVETYPE_NONE)
-			RandomSelection_Add(e, 0, string_null, 1, 1);
+			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");
 	}
-	if(RandomSelection_chosen_ent)
-		waypoint_spawnforteleporter(self, RandomSelection_chosen_ent.origin, 0);
 
 	if(n == 0)
 	{
@@ -278,7 +271,6 @@ void teleport_findtarget (void)
 	{
 		// exactly one dest - bots love that
 		self.enemy = find(e, targetname, self.target);
-		self.dest = self.enemy.origin;
 	}
 	else
 	{
@@ -313,6 +305,9 @@ void spawnfunc_trigger_teleport (void)
 void WarpZone_PostTeleportPlayer_Callback(entity pl)
 {
 	UpdateCSQCProjectileAfterTeleport(pl);
+	// "disown" projectiles after teleport
+	if(pl.owner == pl.realowner)
+		pl.owner = world;
 	if(pl.classname == "player")
 	{
 		// reset tracking of oldvelocity for impact damage (sudden velocity changes)