Clean up the cleanup code

11 months ago · 784459a652
parent 5bd641d2dd
commit 784459a652
1 changed files with 2 additions and 7 deletions
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@ -68,6 +68,8 @@ void MWState::StateManager::cleanup(bool force)
        mLastSavegame.clear();

        MWMechanics::CreatureStats::cleanup();
+
+        endGame();
    }
    MWBase::Environment::get().getLuaManager()->clear();
 }
@ -449,13 +451,6 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
 {
    try
    {
-        if (mState != State_Ended)
-        {
-            // let menu scripts do cleanup
-            mState = State_Ended;
-            MWBase::Environment::get().getLuaManager()->gameEnded();
-        }
-
        cleanup();

        Log(Debug::Info) << "Reading save file " << filepath.filename();