teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move loading of settings.cfg to before video init so that it can respect r_togglecomposition.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5518 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-01-08 01:32:50 +00:00
parent c2b5ae8256
commit aafb01ab33
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
polymer/eduke32/source/game.c
View file

@ -11902,6 +11902,16 @@ int32_t app_main(int32_t argc, const char **argv)
system_getcvars(); system_getcvars();
char *ptr = Xstrdup(setupfilename), *p = strtok(ptr, ".");
if (!Bstrcmp(setupfilename, SETUPFILENAME))
Bsprintf(tempbuf, "settings.cfg");
else
Bsprintf(tempbuf, "%s_settings.cfg", p);
OSD_Exec(tempbuf);
Bfree(ptr);
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)
@ -11948,16 +11958,6 @@ int32_t app_main(int32_t argc, const char **argv)
} }
// loadtmb(); // loadtmb();
char *ptr = Xstrdup(setupfilename), *p = strtok(ptr, ".");
if (!Bstrcmp(setupfilename, SETUPFILENAME))
Bsprintf(tempbuf, "settings.cfg");
else
Bsprintf(tempbuf, "%s_settings.cfg", p);
OSD_Exec(tempbuf);
Bfree(ptr);
OSD_Exec("autoexec.cfg"); OSD_Exec("autoexec.cfg");
M_Init(); M_Init();