Replace classname checks with IS_PLAYER

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 0d6e29360328cbff338e2acefc03cd2e9e6b843d..15f9ed8c70683530a5a53cf3152548527fc2b31e 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2308,7 +2308,7 @@ void CheckRules_World()
        }
        else if(g_td)
        {
-               checkrules_status = WinningCondition_TowerDefense(); // TODO make these mutator hooks?
+               checkrules_status = WinningCondition_TowerDefense();
        }
        else
        {

diff --git a/qcsrc/server/mutators/gamemode_rts.qc b/qcsrc/server/mutators/gamemode_rts.qc
index 874aaccfb3b0727f07f17588505855ef6c9be5cd..19dba4b59eb64f60d821bb8b53ef85bf40966060 100644 (file)
--- a/qcsrc/server/mutators/gamemode_rts.qc
+++ b/qcsrc/server/mutators/gamemode_rts.qc
@@ -76,7 +76,7 @@ MUTATOR_HOOKFUNCTION(rts_SetStartItems)
 
 MUTATOR_HOOKFUNCTION(rts_PlayerThink)
 {
-       if(self.classname != "player")
+       if not(IS_PLAYER(self))
                return FALSE; // dont do any checks for spectators
                
        switch(self.impulse)
@@ -240,8 +240,8 @@ MUTATOR_HOOKFUNCTION(rts_MonsterThink)
        monster_speed_run = 150 * self.speed;
        monster_speed_walk = 150 * self.speed;
        
-       if(monster_target.classname == "player")
-               monster_target = world;
+       if(IS_PLAYER(monster_target))
+               monster_target = world; // shouldn't be able to find players...
                
        if not(IsDifferentTeam(monster_target, self))
        {
@@ -291,7 +291,7 @@ MUTATOR_HOOKFUNCTION(rts_MonsterDies)
                TeamScore_AddToTeam(frag_attacker.team, ST_SCORE, 1);
        
        // need to keep the monster selected to get the points... hmm (TODO: realowners?)
-       if(frag_attacker.owner.classname == "player")
+       if(IS_PLAYER(frag_attacker.owner))
        {
                PlayerScore_Add(frag_attacker.owner, SP_SCORE, 5);
                PlayerScore_Add(frag_attacker.owner, SP_KILLS, 1);
@@ -340,7 +340,7 @@ MUTATOR_HOOKFUNCTION(rts_MonsterBossFlag)
 
 MUTATOR_HOOKFUNCTION(rts_PlayerDamage)
 {
-       if(frag_target.classname == "player")
+       if(IS_PLAYER(frag_target))
                frag_damage = 0; // don't damage the invincible players...
                
        if((frag_target.flags & FL_MONSTER) && frag_target.goalentity)
@@ -357,7 +357,7 @@ MUTATOR_HOOKFUNCTION(rts_PlayerDamage)
 
 MUTATOR_HOOKFUNCTION(rts_PlayerPhysics)
 {
-       if(self.classname != "player")
+       if not(IS_PLAYER(self))
                return FALSE;
                
        self.origin_z = self.oldorigin_z;