stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'load-graphics-after-startuppwads' into 'next'

Browse source 
Fix graphics replacements not taking effect via -file

See merge request STJr/SRB2!1168
This commit is contained in:
James R 2020-10-02 20:22:11 -04:00
commit a0759816e5
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_main.c
View file

@ -1383,8 +1383,6 @@ void D_SRB2Main(void)
// setup loading screen // setup loading screen
SCR_Startup(); SCR_Startup();
// we need the font of the console
CONS_Printf("HU_Init(): Setting up heads up display.\n");
HU_Init(); HU_Init();
CON_Init(); CON_Init();
@ -1400,6 +1398,9 @@ void D_SRB2Main(void)
W_InitMultipleFiles(startuppwads); W_InitMultipleFiles(startuppwads);
D_CleanFile(startuppwads); D_CleanFile(startuppwads);
CONS_Printf("HU_LoadGraphics()...\n");
HU_LoadGraphics();
//--------------------------------------------------------- CONFIG.CFG //--------------------------------------------------------- CONFIG.CFG
M_FirstLoadConfig(); // WARNING : this do a "COM_BufExecute()" M_FirstLoadConfig(); // WARNING : this do a "COM_BufExecute()"

2
src/hu_stuff.c
View file

@ -330,8 +330,6 @@ void HU_Init(void)
// set shift translation table // set shift translation table
shiftxform = english_shiftxform; shiftxform = english_shiftxform;
HU_LoadGraphics();
} }
static inline void HU_Stop(void) static inline void HU_Stop(void)