zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move autoexec.cfg execution to directly after settings.cfg execution

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6498 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-11-22 05:23:23 +00:00
parent 212a318f4d
commit fe9c6d25f4
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/duke3d/src/game.cpp
View file

@ -6464,9 +6464,11 @@ int app_main(int argc, char const * const * argv)
else else
Bsprintf(tempbuf, "%s_settings.cfg", p); Bsprintf(tempbuf, "%s_settings.cfg", p);
OSD_Exec(tempbuf);
Bfree(setupFileName); Bfree(setupFileName);
OSD_Exec(tempbuf);
OSD_Exec("autoexec.cfg");
if (g_networkMode != NET_DEDICATED_SERVER) if (g_networkMode != NET_DEDICATED_SERVER)
{ {
if (setgamemode(ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP) < 0) if (setgamemode(ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP) < 0)
@ -6509,12 +6511,8 @@ int app_main(int argc, char const * const * argv)
S_MusicStartup(); S_MusicStartup();
S_SoundStartup(); S_SoundStartup();
Menu_Init();
} }
// loadtmb();
OSD_Exec("autoexec.cfg");
Menu_Init();
if (ud.warp_on > 1 && (!g_netServer && ud.multimode < 2)) if (ud.warp_on > 1 && (!g_netServer && ud.multimode < 2))
{ {