Fix another game over check; remove some redundant checks
authorterencehill <piuntn@gmail.com>
Wed, 4 Jan 2017 22:03:56 +0000 (23:03 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 4 Jan 2017 22:03:56 +0000 (23:03 +0100)
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/server/miscfunctions.qc

index 627321e..413dd99 100644 (file)
@@ -769,7 +769,6 @@ void nade_touch(entity this, entity toucher)
        if(autocvar_g_nades_pickup)
        if(time >= this.spawnshieldtime)
        if(!toucher.nade && this.health == this.max_health) // no boosted shot pickups, thank you very much
-       if(!STAT(FROZEN, toucher))
        if(CanThrowNade(toucher)) // prevent some obvious things, like dead players
        if(IS_REAL_CLIENT(toucher)) // above checks for IS_PLAYER, don't need to do it here
        {
@@ -1106,9 +1105,6 @@ bool CanThrowNade(entity this)
        if(this.vehicle)
                return false;
 
-       if(game_stopped)
-               return false;
-
        if(IS_DEAD(this))
                return false;
 
index 6e2fdfc..9d0b853 100644 (file)
@@ -479,7 +479,7 @@ void GetCvars(entity this, int f)
 string playername(entity p)
 {
     string t;
-    if (teamplay && !game_stopped && IS_PLAYER(p))
+    if (teamplay && !intermission_running && IS_PLAYER(p))
     {
         t = Team_ColorCode(p.team);
         return strcat(t, strdecolorize(p.netname));