core/CoreConfig.cpp
changeset 669 ce01c2eb020c
parent 665 74fa35a4c27c
child 729 110c14c99545
     1.1 --- a/core/CoreConfig.cpp	Thu Apr 05 07:59:27 2007 +0000
     1.2 +++ b/core/CoreConfig.cpp	Thu Apr 05 10:55:40 2007 +0000
     1.3 @@ -47,13 +47,13 @@
     1.4  
     1.5  		char error[255];
     1.6  
     1.7 -		ConfigResult err = SetConfigOption(option, value, ConfigSource_Console, error, sizeof(error));
     1.8 +		ConfigResult res = SetConfigOption(option, value, ConfigSource_Console, error, sizeof(error));
     1.9  
    1.10 -		if (err == ConfigResult_Reject)
    1.11 +		if (res == ConfigResult_Reject)
    1.12  		{
    1.13 -			g_RootMenu.ConsolePrint("Could not set config option \"%s\" to \"%s\" (%s)", option, value, error);
    1.14 -		} else if (err == ConfigResult_Ignore) {
    1.15 -			g_RootMenu.ConsolePrint("No such config option \"%s\" exists.", option);
    1.16 +			g_RootMenu.ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\" (%s)", option, value, error);
    1.17 +		} else if (res == ConfigResult_Ignore) {
    1.18 +			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
    1.19  		} else {
    1.20  			g_RootMenu.ConsolePrint("Config option \"%s\" successfully set to \"%s.\"", option, value);
    1.21  		}
    1.22 @@ -82,8 +82,7 @@
    1.23  	g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetModPath(), corecfg);
    1.24  
    1.25  	/* Parse config file */
    1.26 -	if ((err=g_TextParser.ParseFile_SMC(filePath, this, NULL, NULL))
    1.27 -		!= SMCParse_Okay)
    1.28 +	if ((err=g_TextParser.ParseFile_SMC(filePath, this, NULL, NULL)) != SMCParse_Okay)
    1.29  	{
    1.30   		/* :TODO: This won't actually log or print anything :( - So fix that somehow */
    1.31  		const char *error = g_TextParser.GetSMCErrorString(err);