WIPEOUT: invuln only during matches

dusty-qw · Feb 1, 2024 · 891d04f · 891d04f
1 parent 5356f03
commit 891d04f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/clan_arena.c b/src/clan_arena.c
@@ -1278,7 +1278,7 @@ void CA_player_pre_think(void)
 		}
 
 		// take no damage to health/armor within 1 second of respawn or during endround
-		if ((match_in_progress == 2) && self->in_play && ((self->alive_time >= 1) || !self->round_deaths) && !ca_round_pause)
+		if (self->in_play && ((self->alive_time >= 1) || !self->round_deaths) && !ca_round_pause)
 		{
 			self->no_pain = false;
 		}

diff --git a/src/combat.c b/src/combat.c
@@ -493,7 +493,7 @@ void T_Damage(gedict_t *targ, gedict_t *inflictor, gedict_t *attacker, float dam
 		}
 
 		// don't accept any damage in CA modes if no_pain is true 
-		if (targ->no_pain)
+		if (targ->no_pain && (match_in_progress == 2))
 		{	
 			if (attacker == targ)
 			{