immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unnecessary variable

1008-fix
tomangelo2 2017-10-15 23:35:09 +02:00
parent 52d9330114
commit 1e614d64d0
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/font_config.cpp
View File

@ -39,7 +39,6 @@ namespace bp = boost::property_tree;
CFontConfigFile::CFontConfigFile() CFontConfigFile::CFontConfigFile()
: m_needsSave(false) : m_needsSave(false)
, m_useCurrentDirectory(false)
, m_loaded(false) , m_loaded(false)
{ {
} }
@ -54,18 +53,9 @@ bool CFontConfigFile::Init()
{ {
std::unique_ptr<std::istream> stream; std::unique_ptr<std::istream> stream;
bool good; bool good;
if (m_useCurrentDirectory) auto inputStream = MakeUnique<CInputStream>("/fonts/fonts.ini");
{ good = inputStream->is_open();
auto inputStream = MakeUnique<std::ifstream>("/fonts/fonts.ini"); stream = std::move(inputStream);
good = inputStream->good();
stream = std::move(inputStream);
}
else
{
auto inputStream = MakeUnique<CInputStream>("/fonts/fonts.ini");
good = inputStream->is_open();
stream = std::move(inputStream);
}
if (good) if (good)
{ {

1
src/common/font_config.h
View File

@ -58,7 +58,6 @@ public:
private: private:
boost::property_tree::ptree m_propertyTree; boost::property_tree::ptree m_propertyTree;
bool m_needsSave; bool m_needsSave;
bool m_useCurrentDirectory;
bool m_loaded; bool m_loaded;
}; };