OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Version bump to 2.2.0.

Browse source 
- Disabled console alpha when the console is fullscreen.
- Re-enabled maybedrawnow for the software renderer. This should be replaced
  with a different progress bar implementation at some point that can work
  with hardware graphics.


SVN r747 (trunk)
This commit is contained in:
Randy Heit 2008-02-14 22:58:56 +00:00
commit 0acbbb3a8e
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c_console.cpp
View file

@ -229,7 +229,7 @@ CUSTOM_CVAR (Int, msgmidcolor2, 4, CVAR_ARCHIVE)
static void maybedrawnow (bool tick, bool force)
{
// FIXME: Does not work right with hw2d
if (ConsoleDrawing || !gotconback || screen->IsLocked () || 1)
if (ConsoleDrawing || !gotconback || screen->IsLocked () || screen->Accel2D)
{
return;
}
@ -1146,7 +1146,7 @@ void C_DrawConsole (bool hw2d)
DTA_DestWidth, screen->GetWidth(),
DTA_DestHeight, screen->GetHeight(),
DTA_ColorOverlay, conshade,
DTA_Alpha, hw2d ? FLOAT2FIXED(con_alpha) : FRACUNIT,
DTA_Alpha, (hw2d && gamestate != GS_FULLCONSOLE) ? FLOAT2FIXED(con_alpha) : FRACUNIT,
DTA_Masked, false,
TAG_DONE);
if (conline && visheight < screen->GetHeight())