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

[Client] Add Files::Collections to Main::init() arguments

Browse source
This commit is contained in:
Koncord 2017-03-04 13:11:46 +08:00
parent c353e18645
commit 9199446edd
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -657,7 +657,7 @@ private:
void OMW::Engine::go() void OMW::Engine::go()
{ {
assert (!mContentFiles.empty()); assert (!mContentFiles.empty());
if(!mwmp::Main::init(mContentFiles)) if(!mwmp::Main::init(mContentFiles, mFileCollections))
return; return;
std::cout << "OSG version: " << osgGetVersion() << std::endl; std::cout << "OSG version: " << osgGetVersion() << std::endl;

2
apps/openmw/mwmp/Main.cpp
View file

@ -122,7 +122,7 @@ void RestoreMgr(Settings::Manager &mgr)
mgr.mChangedSettings = saveChangedSettings; mgr.mChangedSettings = saveChangedSettings;
} }
bool Main::init(std::vector<std::string> &content) bool Main::init(std::vector<std::string> &content, Files::Collections &collections)
{ {
assert(!pMain); assert(!pMain);
pMain = new Main(); pMain = new Main();

3
apps/openmw/mwmp/Main.hpp
View file

@ -1,5 +1,6 @@
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <components/files/collections.hpp>
namespace mwmp namespace mwmp
{ {
@ -16,7 +17,7 @@ namespace mwmp
static void optionsDesc(boost::program_options::options_description *desc); static void optionsDesc(boost::program_options::options_description *desc);
static void configure(const boost::program_options::variables_map &variables); static void configure(const boost::program_options::variables_map &variables);
static bool init(std::vector<std::string> &content); static bool init(std::vector<std::string> &content, Files::Collections &collections);
static void postInit(); static void postInit();
static void destroy(); static void destroy();
static const Main &get(); static const Main &get();