From 0a683f6a82be6e2b3aa4eeea3bec163a3276f9c1 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 30 Dec 2006 00:24:08 +0000 Subject: * (bug 2960) Pain indication no longer displayed during intermission * (bug 2858) Wrong collision mask allowing bad spawns * Adv Granger spit now slows players as it was always supposed to --- src/cgame/cg_draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cgame') diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 3cb74ab0..f5527348 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -3354,7 +3354,7 @@ static void CG_PainBlend( void ) float x, y, w, h; float s1, t1, s2, t2; - if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR ) + if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR || cg.intermissionStarted ) return; damage = cg.lastHealth - cg.snap->ps.stats[ STAT_HEALTH ]; -- cgit