teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

throw an exception if default value for a setting is not found

Browse source
This commit is contained in:
scrawl 2012-09-02 11:39:54 +02:00
parent 4f1bcb749f
commit 950bf66334
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/objects.cpp
View file

@ -106,7 +106,7 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
extents *= insert->getScale();
float size = std::max(std::max(extents.x, extents.y), extents.z);
bool small = (size < Settings::Manager::getInt("small object size", "Viewing distance")) && Settings::Manager::getBool("limit small object distance", "Objects");
bool small = (size < Settings::Manager::getInt("small object size", "Viewing distance")) && Settings::Manager::getBool("limit small object distance", "Viewing distance");
// do not fade out doors. that will cause holes and look stupid
if (ptr.getTypeName().find("Door") != std::string::npos)

8
components/settings/settings.cpp
View file

@ -75,8 +75,12 @@ const std::string Manager::getString (const std::string& setting, const std::str
if (mNewSettings.find(std::make_pair(category, setting)) != mNewSettings.end())
return mNewSettings[std::make_pair(category, setting)];
std::string defaultval = mDefaultFile.getSetting(setting, category);
return mFile.getSetting(setting, category, defaultval);
std::string defaultval = mDefaultFile.getSetting(setting, category, "NOTFOUND");
std::string val = mFile.getSetting(setting, category, defaultval);
if (val == "NOTFOUND")
throw std::runtime_error("Trying to retrieve a non-existing setting: " + setting + " Make sure the settings-default.cfg file was properly installed.");
return val;
}
const float Manager::getFloat (const std::string& setting, const std::string& category)