OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- load the hex font as early as possible.

Browse source
This commit is contained in:
Christoph Oelckers 2022-05-01 14:03:49 +02:00
commit 010f41a3aa
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/d_main.cpp
View file

@ -173,6 +173,7 @@ void FreeSBarInfoScript();
void I_UpdateWindowTitle();
void S_ParseMusInfo();
void D_GrabCVarDefaults();
void LoadHexFont(const char* filename);
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
@ -3474,6 +3475,15 @@ static int D_DoomMain_Internal (void)
std::set_new_handler(NewFailure);
const char *batchout = Args->CheckValue("-errorlog");
// [RH] Make sure zdoom.pk3 is always loaded,
// as it contains magic stuff we need.
wad = BaseFileSearch(BASEWAD, NULL, true, GameConfig);
if (wad == NULL)
{
I_FatalError("Cannot find " BASEWAD);
}
LoadHexFont(wad); // load hex font early so we have it during startup.
C_InitConsole(80*8, 25*8, false);
I_DetectOS();
@ -3503,13 +3513,6 @@ static int D_DoomMain_Internal (void)
extern void D_ConfirmSendStats();
D_ConfirmSendStats();
// [RH] Make sure zdoom.pk3 is always loaded,
// as it contains magic stuff we need.
wad = BaseFileSearch (BASEWAD, NULL, true, GameConfig);
if (wad == NULL)
{
I_FatalError ("Cannot find " BASEWAD);
}
FString basewad = wad;
FString optionalwad = BaseFileSearch(OPTIONALWAD, NULL, true, GameConfig);