- Fixed: The simulated palette blends when the menu or console are open

were applied even when the status bar wasn't drawn. (In other words, even
  in situations where a real palette blend wouldn't have happened.)


SVN r462 (trunk)
This commit is contained in:
Randy Heit 2007-01-23 01:43:47 +00:00
commit 36839136fb
3 changed files with 5 additions and 2 deletions

View file

@ -1222,7 +1222,7 @@ void C_DrawConsole ()
{
player = player->camera->player;
}
if (player->BlendA != 0)
if (player->BlendA != 0 && (gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL))
{
screen->Dim (PalEntry ((unsigned char)(player->BlendR*255), (unsigned char)(player->BlendG*255), (unsigned char)(player->BlendB*255)),
player->BlendA, 0, ConBottom, screen->GetWidth(), screen->GetHeight() - ConBottom);