OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Add startscreen_console cvar for showing the console during loading instead of the start screen

Browse source
This commit is contained in:
dpjudas 2024-05-14 00:19:52 +02:00
commit 147a136e27
3 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -563,6 +563,9 @@ void C_DrawConsole ()
static int oldbottom = 0;
int lines, left, offset;
if (!CurrentConsoleFont)
return;
int textScale = active_con_scale(twod);
left = LEFTMARGIN;

35
src/common/startscreen/startscreen.cpp
View file

@ -49,6 +49,9 @@
#include "v_draw.h"
#include "g_input.h"
#include "texturemanager.h"
#include "c_console.h"
CVAR(Bool, startscreen_console, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
// Text mode color values
enum{
@ -670,22 +673,30 @@ void FStartScreen::Render(bool force)
float displayheight;
twod->Begin(screen->GetWidth(), screen->GetHeight());
// At this point the shader for untextured rendering has not been loaded yet, so we got to clear the screen by rendering a texture with black color.
DrawTexture(twod, StartupTexture, 0, 0, DTA_VirtualWidthF, StartupTexture->GetDisplayWidth(), DTA_VirtualHeightF, StartupTexture->GetDisplayHeight(), DTA_KeepRatio, true, DTA_Color, PalEntry(255,0,0,0), TAG_END);
if (HeaderTexture)
if (startscreen_console)
{
displaywidth = HeaderTexture->GetDisplayWidth();
displayheight = HeaderTexture->GetDisplayHeight() + StartupTexture->GetDisplayHeight();
DrawTexture(twod, HeaderTexture, 0, 0, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
DrawTexture(twod, StartupTexture, 0, 32, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
if (NetMaxPos >= 0) DrawTexture(twod, NetTexture, 0, displayheight - 16, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
C_FullConsole();
C_DrawConsole();
}
else
{
displaywidth = StartupTexture->GetDisplayWidth();
displayheight = StartupTexture->GetDisplayHeight();
DrawTexture(twod, StartupTexture, 0, 0, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
// At this point the shader for untextured rendering has not been loaded yet, so we got to clear the screen by rendering a texture with black color.
DrawTexture(twod, StartupTexture, 0, 0, DTA_VirtualWidthF, StartupTexture->GetDisplayWidth(), DTA_VirtualHeightF, StartupTexture->GetDisplayHeight(), DTA_KeepRatio, true, DTA_Color, PalEntry(255, 0, 0, 0), TAG_END);
if (HeaderTexture)
{
displaywidth = HeaderTexture->GetDisplayWidth();
displayheight = HeaderTexture->GetDisplayHeight() + StartupTexture->GetDisplayHeight();
DrawTexture(twod, HeaderTexture, 0, 0, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
DrawTexture(twod, StartupTexture, 0, 32, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
if (NetMaxPos >= 0) DrawTexture(twod, NetTexture, 0, displayheight - 16, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
}
else
{
displaywidth = StartupTexture->GetDisplayWidth();
displayheight = StartupTexture->GetDisplayHeight();
DrawTexture(twod, StartupTexture, 0, 0, DTA_VirtualWidthF, displaywidth, DTA_VirtualHeightF, displayheight, TAG_END);
}
}
twod->End();

7
src/d_main.cpp
View file

@ -3307,7 +3307,11 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
}
TexMan.Init();
// Init fonts and console earlier as the start screen might display it
V_InitFonts();
C_InitConsole(SCREENWIDTH, SCREENHEIGHT, false);
if (!batchrun) Printf ("V_Init: allocate screen.\n");
if (!restart)
{
@ -3376,7 +3380,6 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
StartWindow->Progress();
if (StartScreen) StartScreen->Progress(1);
V_InitFonts();
InitDoomFonts();
V_LoadTranslations();
UpdateGenericUI(false);