Skip to content

Commit

Permalink
Fixed|Console: Do not warn about non-existent autoexec/startup config…
Browse files Browse the repository at this point in the history
… files
  • Loading branch information
danij-deng committed Jan 9, 2014
1 parent 1a26e85 commit c4df0bb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doomsday/client/src/con_config.cpp
Expand Up @@ -242,7 +242,7 @@ bool Con_ParseCommands(char const *fileName, int flags)
filehandle_s *file = F_Open(fileName, "rt");
if(!file)
{
LOG_SCR_WARNING("Could not open \"%s\"") << fileName;
LOG_SCR_WARNING("Failed to open \"%s\" for write") << fileName;
return false;
}

Expand Down
12 changes: 10 additions & 2 deletions doomsday/client/src/dd_main.cpp
Expand Up @@ -1880,7 +1880,11 @@ boolean DD_Init(void)
// Try to load the autoexec file. This is done here to make sure everything is
// initialized: the user can do here anything that s/he'd be able to do in-game
// provided a game was loaded during startup.
Con_ParseCommands("autoexec.cfg");
char const *autoexecConfig = "autoexec.cfg";
if(F_FileExists(autoexecConfig))
{
Con_ParseCommands(autoexecConfig);
}

// Read additional config files that should be processed post engine init.
if(CommandLine_CheckWith("-parse", 1))
Expand Down Expand Up @@ -2056,7 +2060,11 @@ static int DD_StartupWorker(void * /*context*/)
Con_SetProgress(60);

// Execute the startup script (Startup.cfg).
Con_ParseCommands("startup.cfg");
char const *startupConfig = "startup.cfg";
if(F_FileExists(startupConfig))
{
Con_ParseCommands(startupConfig);
}
Con_SetProgress(90);

R_BuildTexGammaLut();
Expand Down

0 comments on commit c4df0bb

Please sign in to comment.