core/CoreConfig.cpp
changeset 1656 b0b86d57530c
parent 1630 2f2fe925f377
child 1947 e73a1e51833b
     1.1 --- a/core/CoreConfig.cpp	Tue Oct 30 20:43:59 2007 +0000
     1.2 +++ b/core/CoreConfig.cpp	Wed Oct 31 05:04:07 2007 +0000
     1.3 @@ -100,7 +100,7 @@
     1.4  
     1.5  void CoreConfig::Initialize()
     1.6  {
     1.7 -	SMCParseError err;
     1.8 +	SMCError err;
     1.9  	char filePath[PLATFORM_MAX_PATH];
    1.10  
    1.11  	/* Try to get command line value of core config convar */
    1.12 @@ -116,7 +116,7 @@
    1.13  	g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
    1.14  
    1.15  	/* Parse config file */
    1.16 -	if ((err=textparsers->ParseFile_SMC(filePath, this, NULL, NULL)) != SMCParse_Okay)
    1.17 +	if ((err=textparsers->ParseFile_SMC(filePath, this, NULL)) != SMCError_Okay)
    1.18  	{
    1.19   		/* :TODO: This won't actually log or print anything :( - So fix that somehow */
    1.20  		const char *error = textparsers->GetSMCErrorString(err);
    1.21 @@ -124,7 +124,7 @@
    1.22  	}
    1.23  }
    1.24  
    1.25 -SMCParseResult CoreConfig::ReadSMC_KeyValue(const char *key, const char *value, bool key_quotes, bool value_quotes)
    1.26 +SMCResult CoreConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
    1.27  {
    1.28  	char error[255];
    1.29  	ConfigResult err = SetConfigOption(key, value, ConfigSource_File, error, sizeof(error));
    1.30 @@ -135,7 +135,7 @@
    1.31  		g_Logger.LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
    1.32  	}
    1.33  
    1.34 -	return SMCParse_Continue;
    1.35 +	return SMCResult_Continue;
    1.36  }
    1.37  
    1.38  ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value, ConfigSource source, char *error, size_t maxlength)