mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reduce duplicated code in IniReader

This commit is contained in:
Ted John 2017-02-22 17:58:50 +00:00
parent d72ced4ea9
commit 40eb2c55fd
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/openrct2/config/IniReader.cpp
View File

@ -93,49 +93,45 @@ public:
bool GetBoolean(const std::string &name, bool defaultValue) const override
{
auto it = _values.find(name);
if (it == _values.end())
bool result = defaultValue;
std::string value;
if (TryGetString(name, &value))
{
return defaultValue;
result = String::Equals(value, "true", true);
}
std::string value = it->second;
return String::Equals(value, "true", true);
return result;
}
sint32 GetSint32(const std::string &name, sint32 defaultValue) const override
{
auto it = _values.find(name);
if (it == _values.end())
sint32 result = defaultValue;
std::string value;
if (TryGetString(name, &value))
{
return defaultValue;
result = std::stoi(value);
}
std::string value = it->second;
return std::stoi(value);
return result;
}
float GetFloat(const std::string &name, float defaultValue) const override
{
auto it = _values.find(name);
if (it == _values.end())
float result = defaultValue;
std::string value;
if (TryGetString(name, &value))
{
return defaultValue;
result = std::stof(value);
}
std::string value = it->second;
return std::stof(value);
return result;
}
std::string GetString(const std::string &name, const std::string &defaultValue) const override
{
auto it = _values.find(name);
if (it == _values.end())
std::string result;
if (TryGetString(name, &result))
{
return defaultValue;
result = defaultValue;
}
return it->second;
return result;
}
bool TryGetString(const std::string &name, std::string * outValue) const override