X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_teleporters.qc;h=4d7bd92cf86b3bbd4abf9daadc16537df796d5fe;hb=01e79c17c82c10622708fb4e2ce2efc818d1a0ef;hp=eba0ea0681b3ee22edfcc378e7ca1c23f1027b17;hpb=6af4e73de035e6bbed9ba2d60e0768c43dc66f2a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index eba0ea068..4d7bd92cf 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(teamplay && cvar("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(teamplay && cvar("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);
@@ -115,7 +114,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 	if(player.classname == "player")
 	{
 		if(tflags & TELEPORT_FLAG_TDEATH)
-			if(player.takedamage && player.deadflag == DEAD_NO && !g_race && !g_cts && (cvar("g_telefrags") || (tflags & TELEPORT_FLAG_FORCE_TDEATH)))
+			if(player.takedamage && player.deadflag == DEAD_NO && !g_race && !g_cts && (autocvar_g_telefrags || (tflags & TELEPORT_FLAG_FORCE_TDEATH)))
 				tdeath(player, teleporter, telefragger, telefragmin, telefragmax);
 
 		// player no longer is on ground
@@ -128,7 +127,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 		if(teleporter.owner)
 		{
 			player.pusher = teleporter.owner;
-			player.pushltime = time + cvar("g_maxpushtime");
+			player.pushltime = time + autocvar_g_maxpushtime;
 		}
 		else
 		{
@@ -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)
@@ -183,7 +179,7 @@ void Teleport_Touch (void)
 		for(e = world; (e = find(e, targetname, self.target)); )
 		{
 			p = 1;
-			if(cvar("g_telefrags_avoid"))
+			if(autocvar_g_telefrags_avoid)
 			{
 				o = e.origin + '0 0 1' * (1 - other.mins_z - 24);
 				if(check_tdeath(other, o, '0 0 0', '0 0 0'))
@@ -205,9 +201,9 @@ void Teleport_Touch (void)
 	if(e.speed)
 		if(vlen(other.velocity) > e.speed)
 			other.velocity = normalize(other.velocity) * max(0, e.speed);
-	if(cvar("g_teleport_maxspeed"))
-		if(vlen(other.velocity) > cvar("g_teleport_maxspeed"))
-			other.velocity = normalize(other.velocity) * max(0, cvar("g_teleport_maxspeed"));
+	if(autocvar_g_teleport_maxspeed)
+		if(vlen(other.velocity) > autocvar_g_teleport_maxspeed)
+			other.velocity = normalize(other.velocity) * max(0, autocvar_g_teleport_maxspeed);
 
 	o = e.origin + '0 0 1' * (1 - other.mins_z - 24);
 	TeleportPlayer(self, other, o, e.mangle, v_forward * vlen(other.velocity), '0 0 0', '0 0 0', TELEPORT_FLAGS_TELEPORTER);
@@ -313,6 +309,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)