mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-23 09:41:33 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'lazydev/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-02-22 08:46:41 +01:00
commit 0c8c28e10c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/engine.cpp
View file

@ -215,7 +215,7 @@ void OMW::Engine::addMaster (const std::string& master)
{ {
mMaster.push_back(master); mMaster.push_back(master);
std::string &str = mMaster.back(); std::string &str = mMaster.back();
// Append .esm if not already there // Append .esm if not already there
std::string::size_type sep = str.find_last_of ("."); std::string::size_type sep = str.find_last_of (".");
if (sep == std::string::npos) if (sep == std::string::npos)
@ -303,7 +303,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
} }
mOgre = new OEngine::Render::OgreRenderer; mOgre = new OEngine::Render::OgreRenderer;
mOgre->configure( mOgre->configure(
mCfgMgr.getLogPath().string(), mCfgMgr.getLogPath().string(),
renderSystem, renderSystem,
@ -345,7 +345,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
//Load translation data //Load translation data
mTranslationDataStorage.setEncoder(mEncoder); mTranslationDataStorage.setEncoder(mEncoder);
mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[0]); for (size_t i = 0; i < mMaster.size(); i++)
mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[i]);
// Create window manager - this manages all the MW-specific GUI windows // Create window manager - this manages all the MW-specific GUI windows
MWScript::registerExtensions (mExtensions); MWScript::registerExtensions (mExtensions);