From 9199446edd945ff59773f69702ec5708bc5b46f6 Mon Sep 17 00:00:00 2001 From: Koncord Date: Sat, 4 Mar 2017 13:11:46 +0800 Subject: [PATCH] [Client] Add Files::Collections to Main::init() arguments --- apps/openmw/engine.cpp | 2 +- apps/openmw/mwmp/Main.cpp | 2 +- apps/openmw/mwmp/Main.hpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 3da83c4b9..cf57f5623 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -657,7 +657,7 @@ private: void OMW::Engine::go() { assert (!mContentFiles.empty()); - if(!mwmp::Main::init(mContentFiles)) + if(!mwmp::Main::init(mContentFiles, mFileCollections)) return; std::cout << "OSG version: " << osgGetVersion() << std::endl; diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp index 9d0de523c..f436b70e3 100644 --- a/apps/openmw/mwmp/Main.cpp +++ b/apps/openmw/mwmp/Main.cpp @@ -122,7 +122,7 @@ void RestoreMgr(Settings::Manager &mgr) mgr.mChangedSettings = saveChangedSettings; } -bool Main::init(std::vector &content) +bool Main::init(std::vector &content, Files::Collections &collections) { assert(!pMain); pMain = new Main(); diff --git a/apps/openmw/mwmp/Main.hpp b/apps/openmw/mwmp/Main.hpp index 673de61e8..9bd17a6ad 100644 --- a/apps/openmw/mwmp/Main.hpp +++ b/apps/openmw/mwmp/Main.hpp @@ -1,5 +1,6 @@ #include "../mwworld/ptr.hpp" #include +#include namespace mwmp { @@ -16,7 +17,7 @@ namespace mwmp static void optionsDesc(boost::program_options::options_description *desc); static void configure(const boost::program_options::variables_map &variables); - static bool init(std::vector &content); + static bool init(std::vector &content, Files::Collections &collections); static void postInit(); static void destroy(); static const Main &get();