From 64ad1d14afb974a1d02cfbb18b82e8a62483d6ab Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Mon, 22 Jan 2007 23:55:46 +0000 Subject: [PATCH] - Fixed: The simulated palette blend used when the console is down needs to force a full screen update the next frame. SVN r460 (trunk) --- docs/rh-log.txt | 2 ++ src/c_console.cpp | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index d0fcefec9a..5ec9411ca9 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ January 22, 2007 +- Fixed: The simulated palette blend used when the console is down needs to + force a full screen update the next frame. - Fixed: LocalViewPitch could overflow and wrap around when a netgame stalls. - Changed the vertheight and rounding-error-checking code in DCanvas::DrawTexture() to calculate off the actual bottom of the image diff --git a/src/c_console.cpp b/src/c_console.cpp index 745cb0542f..3fa5eca2b8 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -1217,8 +1217,13 @@ void C_DrawConsole () { player = player->camera->player; } - 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); + if (player->BlendA != 0) + { + 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); + SB_state = screen->GetPageCount (); + BorderNeedRefresh = screen->GetPageCount (); + } } }