zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-25 21:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- some minor adjustments to the console init interface.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-25 15:40:58 +01:00
parent e3d21d09c9
commit 14776aebb6
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/console/c_console.cpp
View file

@ -212,14 +212,14 @@ CUSTOM_CVAR (Int, msgmidcolor2, CR_BROWN, CVAR_ARCHIVE)
setmsgcolor (PRINTLEVELS+1, self); setmsgcolor (PRINTLEVELS+1, self);
} }
void C_InitConback(FTextureID fallback, bool tile) void C_InitConback(FTextureID fallback, bool tile, double brightness)
{ {
conback = TexMan.CheckForTexture ("CONBACK", ETextureType::MiscPatch); conback = TexMan.CheckForTexture ("CONBACK", ETextureType::MiscPatch);
conflat = fallback; conflat = fallback;
if (!conback.isValid()) if (!conback.isValid())
{ {
conback.SetInvalid(); conback.SetInvalid();
conshade = MAKEARGB(175,0,0,0); conshade = MAKEARGB(uint8_t(255 - 255*brightness),0,0,0);
conline = true; conline = true;
if (!tile) conback = fallback; if (!tile) conback = fallback;
} }
@ -616,7 +616,8 @@ void C_DrawConsole ()
{ {
if (conflat.isValid()) if (conflat.isValid())
{ {
PalEntry pe((uint8_t(255 * con_alpha)), 64, 64, 64); int conbright = 255 - APART(conshade);
PalEntry pe((uint8_t(255 * con_alpha)), conbright, conbright, conbright);
twod->AddFlatFill(0, visheight - screen->GetHeight(), screen->GetWidth(), visheight, TexMan.GetGameTexture(conflat), 1, CleanXfac, pe, STYLE_Shaded); twod->AddFlatFill(0, visheight - screen->GetHeight(), screen->GetWidth(), visheight, TexMan.GetGameTexture(conflat), 1, CleanXfac, pe, STYLE_Shaded);
} }
else else

2
src/common/console/c_console.h
View file

@ -58,7 +58,7 @@ extern constate_e ConsoleState;
// Initialize the console // Initialize the console
void C_InitConsole (int width, int height, bool ingame); void C_InitConsole (int width, int height, bool ingame);
void C_DeinitConsole (); void C_DeinitConsole ();
void C_InitConback(FTextureID fallback, bool tile); void C_InitConback(FTextureID fallback, bool tile, double lightlevel = 1.);
// Adjust the console for a new screen mode // Adjust the console for a new screen mode
void C_NewModeAdjust (void); void C_NewModeAdjust (void);

2
src/d_main.cpp
View file

@ -3366,7 +3366,7 @@ static int D_DoomMain_Internal (void)
TexMan.Init([]() { StartScreen->Progress(); }, CheckForHacks); TexMan.Init([]() { StartScreen->Progress(); }, CheckForHacks);
PatchTextures(); PatchTextures();
TexAnim.Init(); TexAnim.Init();
C_InitConback(TexMan.CheckForTexture(gameinfo.BorderFlat, ETextureType::Flat), true); C_InitConback(TexMan.CheckForTexture(gameinfo.BorderFlat, ETextureType::Flat), true, 0.25);
FixWideStatusBar(); FixWideStatusBar();