zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Properly read settings from cfg

Browse source
This commit is contained in:
nukeykt 2019-11-21 22:37:09 +09:00 committed by Christoph Oelckers
parent 2fe0a6c496
commit 47b8dd509b
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/exhumed/src/exhumed.cpp
View file

@ -2538,6 +2538,25 @@ int app_main(int argc, char const* const* argv)
OSD_SetParameters(0, 0, 0, 0, 0, 0, OSD_ERROR, OSDTEXT_RED, gamefunctions[gamefunc_Show_Console][0] == '\0' ? OSD_PROTECTED : 0); OSD_SetParameters(0, 0, 0, 0, 0, 0, OSD_ERROR, OSDTEXT_RED, gamefunctions[gamefunc_Show_Console][0] == '\0' ? OSD_PROTECTED : 0);
registerosdcommands(); registerosdcommands();
SetupInput();
char *const setupFileName = Xstrdup(setupfilename);
char *const p = strtok(setupFileName, ".");
if (!p || !Bstrcmp(setupfilename, kSetupFilename))
Bsprintf(tempbuf, "settings.cfg");
else
Bsprintf(tempbuf, "%s_settings.cfg", p);
Xfree(setupFileName);
OSD_Exec(tempbuf);
OSD_Exec("autoexec.cfg");
CONFIG_SetDefaultKeys(keydefaults, true);
system_getcvars();
if (nNetPlayerCount == -1) if (nNetPlayerCount == -1)
{ {
nNetPlayerCount = nCfgNetPlayers - 1; nNetPlayerCount = nCfgNetPlayers - 1;
@ -2601,7 +2620,6 @@ int app_main(int argc, char const* const* argv)
FadeOut(0); FadeOut(0);
// InstallEngine(); // InstallEngine();
KB_Startup(); KB_Startup();
SetupInput();
InitView(); InitView();
myloadconfig(); myloadconfig();
InitFX(); InitFX();