mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

pull in all bsa files instead of only the bsa file matching the master

Browse Source
This commit is contained in:
Marc Zinnschlag 2010-06-16 20:15:48 +02:00
parent 223d8ffd9b
commit 7e4f655939
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
game/engine.cpp
View File

@ -18,33 +18,30 @@ OMW::Engine::Engine() {}
void OMW::Engine::prepareMaster()
{
assert (!mDataDir.empty());
std::string masterName; // name without extension
std::string::size_type sep = mMaster.find_last_of (".");
if (sep==std::string::npos)
{
masterName = mMaster;
mMaster += ".esm";
}
else
{
masterName = mMaster.substr (0, sep);
}
// bsa
boost::filesystem::path bsa (mDataDir);
bsa /= masterName + ".bsa";
if (boost::filesystem::exists (bsa))
{
std::cout << "Adding " << bsa.string() << std::endl;
addBSA(bsa.file_string());
}
}
// Load all BSA files in data directory.
void OMW::Engine::loadBSA()
{
boost::filesystem::directory_iterator end;
for (boost::filesystem::directory_iterator iter (mDataDir); iter!=end; ++iter)
{
if (boost::filesystem::extension (iter->path())==".bsa")
{
std::cout << "Adding " << iter->path().string() << std::endl;
addBSA(iter->path().file_string());
}
}
}
// add resources directory
// \note This function works recursively.
@ -70,7 +67,6 @@ void OMW::Engine::setCell (const std::string& cellName)
// Set master file (esm)
// - If the given name does not have an extension, ".esm" is added automatically
// - If there is a bsa file with the same name, OpenMW will load it.
// - Currently OpenMW only supports one master at the same time.
void OMW::Engine::addMaster (const std::string& master)
@ -101,6 +97,7 @@ void OMW::Engine::go()
addResourcesDirectory (mDataDir / "Textures");
prepareMaster();
loadBSA();
boost::filesystem::path masterPath (mDataDir);
masterPath /= mMaster;

4
game/engine.hpp
View File

@ -29,6 +29,9 @@ namespace OMW
/// \note This function works recursively.
void addResourcesDirectory (const boost::filesystem::path& path);
/// Load all BSA files in data directory.
void loadBSA();
public:
Engine();
@ -41,7 +44,6 @@ namespace OMW
/// Set master file (esm)
/// - If the given name does not have an extension, ".esm" is added automatically
/// - If there is a bsa file with the same name, OpenMW will load it.
/// - Currently OpenMW only supports one master at the same time.
void addMaster (const std::string& master);