Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Revert to 0.45.0 comments-in-the-middle settings behavior

Browse source
This commit is contained in:
Capostrophic 2019-09-30 18:51:11 +03:00
parent 9f039fac87
commit f7d2cdb782
2 changed files with 22 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/fallback/fallback.cpp
View file

@ -1,8 +1,8 @@
#include "fallback.hpp"
#include <components/debug/debuglog.hpp>
#include <sstream>
#include <boost/lexical_cast.hpp>
#include <components/debug/debuglog.hpp>
namespace Fallback
{
@ -28,16 +28,10 @@ namespace Fallback
const std::string& fallback = getString(fall);
if (!fallback.empty())
{
try
{
// We have to rely on Boost because std::stof from C++11 uses the current locale
// for separators (which is undesired) and it often silently ignores parsing errors.
return boost::lexical_cast<float>(fallback);
}
catch (boost::bad_lexical_cast&)
{
Log(Debug::Error) << "Error: '" << fall << "' setting value (" << fallback << ") is not a valid number, using 0 as a fallback";
}
std::stringstream stream(fallback);
float number = 0.f;
stream >> number;
return number;
}
return 0;
@ -48,18 +42,10 @@ namespace Fallback
const std::string& fallback = getString(fall);
if (!fallback.empty())
{
try
{
return std::stoi(fallback);
}
catch (const std::invalid_argument&)
{
Log(Debug::Error) << "Error: '" << fall << "' setting value (" << fallback << ") is not a valid number, using 0 as a fallback";
}
catch (const std::out_of_range&)
{
Log(Debug::Error) << "Error: '" << fall << "' setting value (" << fallback << ") is out of range, using 0 as a fallback";
}
std::stringstream stream(fallback);
int number = 0;
stream >> number;
return number;
}
return 0;