X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_teleporters.qc;h=93ced82670b1a36fb15c42a8236419621d52513a;hb=bc79763325f92e7688f6e61d24b42d35eb08d989;hp=26acf7f0ead9d4f59a5d2f5c1d8770afbf0ba3f3;hpb=a271dac885ffbfb3f944f942970333cfeb2fb4f8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 26acf7f0e..93ced8267 100644
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -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(teams_matter && 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(teams_matter && autocvar_g_telefrags_teamplay && head.team == player.team)
 			{
 				if(head.classname == "player")
 					if(head.health >= 1)
@@ -115,7 +115,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 +128,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
 		{
@@ -154,6 +154,9 @@ void Teleport_Touch (void)
 	float p;
 	string s;
 
+	if (self.active != ACTIVE_ACTIVE)
+		return;
+	
 	if (other.health < 1)
 		return;
 	if not(other.flags & FL_CLIENT)	// FIXME: Make missiles firable through the teleport too
@@ -180,7 +183,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'))
@@ -202,9 +205,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);
@@ -292,7 +295,9 @@ void spawnfunc_trigger_teleport (void)
 	self.angles = '0 0 0';
 
 	EXACTTRIGGER_INIT;
-
+	
+	self.active = ACTIVE_ACTIVE;	
+	
 	self.use = trigger_teleport_use;
 
 	// this must be called to spawn the teleport waypoints for bots