Merge branch 'master' into Mario/classname_checks

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

diff --git a/qcsrc/server/attic/runematch.qc b/qcsrc/server/attic/runematch.qc
index ba8f648c888b33e0e312cdf8774b3e1cd0169cad..1b6cc5dbb16266a3a585c0b0645edcb5c00a4afb 100644 (file)
--- a/qcsrc/server/attic/runematch.qc
+++ b/qcsrc/server/attic/runematch.qc
@@ -168,7 +168,7 @@ void RuneCarriedThink()
        vector ang = '0 0 0';
        entity rune;
 
-       if(self.owner.classname != "player" || time < game_starttime)
+       if(!IS_PLAYER(self.owner) || time < game_starttime)
        {
                rune_respawn();
                return;
@@ -205,7 +205,7 @@ void rune_touch()
                return;
        }
 
-       if(other.classname != "player" || other.health < 1)
+       if(!IS_PLAYER(other) || other.health < 1)
                return;
        if(self.wait > time)
                return; // "notouch" time isn't finished
@@ -551,7 +551,7 @@ void RuneMatchGivePoints()
                if(!rune)
                        return;
 
-               if(rune.owner.classname == "player")
+               if(IS_PLAYER(rune.owner))
                {
                        UpdateFrags(rune.owner, autocvar_g_runematch_pointamt);
                }