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

Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug.

Browse source
This commit is contained in:
athile 2010-06-30 11:32:40 -07:00
parent 59a2e8dcf7
commit de7087caf4
2 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/engine.cpp
View file

@ -20,18 +20,6 @@ OMW::Engine::Engine()
{ {
} }
// adjust name and load bsa
void OMW::Engine::prepareMaster()
{
std::string::size_type sep = mMaster.find_last_of (".");
if (sep==std::string::npos)
{
mMaster += ".esm";
}
}
// Load all BSA files in data directory. // Load all BSA files in data directory.
void OMW::Engine::loadBSA() void OMW::Engine::loadBSA()
@ -79,6 +67,13 @@ void OMW::Engine::addMaster (const std::string& master)
{ {
assert (mMaster.empty()); assert (mMaster.empty());
mMaster = master; mMaster = master;
// Append .esm if not already there
std::string::size_type sep = mMaster.find_last_of (".");
if (sep == std::string::npos)
{
mMaster += ".esm";
}
} }
// Enables sky rendering // Enables sky rendering
@ -109,7 +104,6 @@ void OMW::Engine::go()
addResourcesDirectory (mDataDir / "Meshes"); addResourcesDirectory (mDataDir / "Meshes");
addResourcesDirectory (mDataDir / "Textures"); addResourcesDirectory (mDataDir / "Textures");
prepareMaster();
loadBSA(); loadBSA();
boost::filesystem::path masterPath (mDataDir); boost::filesystem::path masterPath (mDataDir);

3
apps/openmw/engine.hpp
View file

@ -30,9 +30,6 @@ namespace OMW
Engine (const Engine&); Engine (const Engine&);
Engine& operator= (const Engine&); Engine& operator= (const Engine&);
/// adjust name and load bsa
void prepareMaster();
/// add resources directory /// add resources directory
/// \note This function works recursively. /// \note This function works recursively.
void addResourcesDirectory (const boost::filesystem::path& path); void addResourcesDirectory (const boost::filesystem::path& path);