diff options
| author | Tim Angus <tim@ngus.net> | 2006-12-30 00:24:08 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-12-30 00:24:08 +0000 |
| commit | 0a683f6a82be6e2b3aa4eeea3bec163a3276f9c1 (patch) | |
| tree | 48a657ea50c0ef0389ed0b4ac4338dceb495d00f /src/cgame | |
| parent | 9ed2e16fd1561c57275967569452678e860cfae7 (diff) | |
* (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
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 ]; |