Clean up turrets system a bit

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_teleporters.qc

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 2932ad68b143bed0b8d8cf342717592bc48eaa49..65131f84672f6bfde0dd0d9868d6f3dbe1deeac6 100644 (file)
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -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);
@@ -126,7 +126,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
                                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;
@@ -209,14 +209,14 @@ void Teleport_Touch (void)
        if(!other.vehicle.teleportable)
                return;
                        
-       if(other.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
+       if(other.turret_flags & TUR_FLAG_ISTURRET)
                return;
         
        if(other.deadflag != DEAD_NO)
                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;