X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_teleporters.qc;h=d61911ecdfd2e9e75033b69887c8c69eaf4b73c6;hb=1dec86a7a2ee9cb1a9e5c32d780771990c4ffc06;hp=2cfdd8a7720f5bf665d22ed5d7916da177375887;hpb=b9ba93fc571cdcdfb7da9375cdd877f5c9927814;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 2cfdd8a77..d61911ecd 100644
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -29,12 +29,12 @@ void trigger_teleport_use()
 
 float check_tdeath(entity player, vector org, vector telefragmin, vector telefragmax)
 {
-	if (player.classname == "player" && player.health >= 1)
+	if (IS_PLAYER(player) && player.health >= 1)
 	{
 		TDEATHLOOP(org)
 		{
 			if not(teamplay && autocvar_g_telefrags_teamplay && head.team == player.team)
-				if(head.classname == "player")
+				if(IS_PLAYER(head))
 					if(head.health >= 1)
 						return 1;
 		}
@@ -46,11 +46,11 @@ void tdeath(entity player, entity teleporter, entity telefragger, vector telefra
 {
 	TDEATHLOOP(player.origin)
 	{
-		if (player.classname == "player" && player.health >= 1)
+		if (IS_PLAYER(player) && player.health >= 1)
 		{
 			if not(teamplay && autocvar_g_telefrags_teamplay && head.team == player.team)
 			{
-				if(head.classname == "player")
+				if(IS_PLAYER(head))
 					if(head.health >= 1)
 						++tdeath_hit;
 				Damage (head, teleporter, telefragger, 10000, DEATH_TELEFRAG, head.origin, '0 0 0');
@@ -97,7 +97,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, CH_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTN_NORM);
+				sound (player, CH_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTEN_NORM);
 			if(tflags & TELEPORT_FLAG_PARTICLES)
 			{
 				pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1);
@@ -119,14 +119,14 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 
 	UpdateCSQCProjectileAfterTeleport(player);
 
-	if(player.classname == "player")
+	if(IS_PLAYER(player))
 	{
 		if(tflags & TELEPORT_FLAG_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
-		player.flags &~= FL_ONGROUND;
+		player.flags &= ~FL_ONGROUND;
 
 		// reset tracking of oldvelocity for impact damage (sudden velocity changes)
 		player.oldvelocity = player.velocity;
@@ -216,12 +216,12 @@ void Teleport_Touch (void)
 		return;
 
 	if(self.team)
-		if((self.spawnflags & 4 == 0) == (self.team != other.team))
+		if(((self.spawnflags & 4) == 0) == (self.team != other.team))
 			return;
 
 	EXACTTRIGGER_TOUCH;
 
-	if(other.classname == "player")
+	if(IS_PLAYER(other))
 		RemoveGrapplingHook(other);
 		
 	entity e;
@@ -325,7 +325,7 @@ void spawnfunc_trigger_teleport (void)
 	// this must be called to spawn the teleport waypoints for bots
 	InitializeEntity(self, teleport_findtarget, INITPRIO_FINDTARGET);
 
-	if (!self.target)
+	if (self.target == "")
 	{
 		objerror ("Teleporter with no target");
 		return;
@@ -346,7 +346,7 @@ void WarpZone_PostTeleportPlayer_Callback(entity pl)
 			print("A non-projectile got through a warpzone and its owner cleared. It's a ", pl.classname, ".\n");
 		pl.owner = world;
 	}
-	if(pl.classname == "player")
+	if(IS_PLAYER(pl))
 	{
 		// reset tracking of oldvelocity for impact damage (sudden velocity changes)
 		pl.oldvelocity = pl.velocity;