Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc
index c692b6e4ad53d26174c1686f0bb9f35c7cbcae05..a5817fa502addef565a946eaaa55a7bd544f60ff 100644 (file)
--- a/qcsrc/server/waypointsprites.qc
+++ b/qcsrc/server/waypointsprites.qc
@@ -197,7 +197,7 @@ float WaypointSprite_visible_for_player(entity e)
        {
                if(self.team != e.team)
                        return FALSE;
-               if(e.classname != "player")
+               if not(IS_PLAYER(e))
                        return FALSE;
        }
 
@@ -206,7 +206,7 @@ float WaypointSprite_visible_for_player(entity e)
 
 entity WaypointSprite_getviewentity(entity e)
 {
-       if(e.classname == "spectator")
+       if(IS_SPEC(e))
                e = e.enemy;
        /* TODO idea (check this breaks nothing)
        else if(e.classname == "observer")
@@ -237,7 +237,7 @@ float WaypointSprite_Customize()
        // make spectators see what the player would see
        entity e;
        e = WaypointSprite_getviewentity(other);
-       
+
        if(MUTATOR_CALLHOOK(CustomizeWaypoint))
                return FALSE;
 
@@ -253,7 +253,7 @@ float WaypointSprite_SendEntity(entity to, float sendflags)
        sendflags = sendflags & 0x7F;
        
        if(g_nexball)
-               sendflags &~= 0x80;
+               sendflags &= ~0x80;
        else if(self.max_health || (self.pain_finished && (time < self.pain_finished + 0.25)))
                sendflags |= 0x80;