zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
parent 9b72e34223
commit 36839136fb
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,4 +1,7 @@
January 22, 2007 January 22, 2007
- 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.)
- Added a range check for the PNG grAb chunks. - Added a range check for the PNG grAb chunks.
- Fixed: AddLine() could corrupt memory if the length of the text being - Fixed: AddLine() could corrupt memory if the length of the text being
added was longer than the console buffer. added was longer than the console buffer.

2
src/c_console.cpp
View file

@ -1222,7 +1222,7 @@ void C_DrawConsole ()
{ {
player = player->camera->player; 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)), 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); player->BlendA, 0, ConBottom, screen->GetWidth(), screen->GetHeight() - ConBottom);

2
src/m_menu.cpp
View file

@ -3085,7 +3085,7 @@ void M_Drawer ()
PalEntry fade = 0; PalEntry fade = 0;
const player_t *player = &players[consoleplayer]; const player_t *player = &players[consoleplayer];
if (player->camera != NULL) if (player->camera != NULL && (gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL))
{ {
if (player->camera->player != NULL) if (player->camera->player != NULL)
{ {