From c90e4435cd99d145b3eeea2edb4edb5570801820 Mon Sep 17 00:00:00 2001 From: elsid Date: Sun, 19 Mar 2023 00:45:50 +0100 Subject: [PATCH] Remove unused startup script argument --- apps/openmw/engine.cpp | 2 +- apps/openmw/mwworld/worldimp.cpp | 2 +- apps/openmw/mwworld/worldimp.hpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 409f530d0b..8153f71a44 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -770,7 +770,7 @@ void OMW::Engine::prepareEngine() // Create the world mWorld = std::make_unique(mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(), *mUnrefQueue, mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder.get(), mActivationDistanceOverride, mCellName, - mStartupScript, mCfgMgr.getUserDataPath()); + mCfgMgr.getUserDataPath()); mWorld->setupPlayer(); mWorld->setRandomSeed(mRandomSeed); mEnvironment.setWorld(*mWorld); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index b9aee0665d..e792faf018 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -246,7 +246,7 @@ namespace MWWorld SceneUtil::WorkQueue* workQueue, SceneUtil::UnrefQueue& unrefQueue, const Files::Collections& fileCollections, const std::vector& contentFiles, const std::vector& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, int activationDistanceOverride, const std::string& startCell, - const std::string& startupScript, const std::filesystem::path& userDataPath) + const std::filesystem::path& userDataPath) : mResourceSystem(resourceSystem) , mLocalScripts(mStore) , mWorldModel(mStore, mReaders) diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp index f246728fe1..59b308e388 100644 --- a/apps/openmw/mwworld/worldimp.hpp +++ b/apps/openmw/mwworld/worldimp.hpp @@ -200,8 +200,7 @@ namespace MWWorld SceneUtil::WorkQueue* workQueue, SceneUtil::UnrefQueue& unrefQueue, const Files::Collections& fileCollections, const std::vector& contentFiles, const std::vector& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, - int activationDistanceOverride, const std::string& startCell, const std::string& startupScript, - const std::filesystem::path& userDataPath); + int activationDistanceOverride, const std::string& startCell, const std::filesystem::path& userDataPath); virtual ~World();