mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-04 02:41:19 +00:00
Merge branch 'passivestorage' into 'master'
Activate global storage when setting up the player See merge request OpenMW/openmw!4413
This commit is contained in:
commit
cdf7bd74d5
@ -373,7 +373,6 @@ namespace MWLua
|
||||
mGlobalScripts.addAutoStartedScripts();
|
||||
mGlobalScriptsStarted = true;
|
||||
mNewGameStarted = true;
|
||||
mMenuScripts.stateChanged();
|
||||
}
|
||||
|
||||
void LuaManager::gameLoaded()
|
||||
|
@ -178,7 +178,7 @@ void MWState::StateManager::newGame(bool bypass)
|
||||
MWBase::Environment::get().getWorld()->startNewGame(bypass);
|
||||
|
||||
mState = State_Running;
|
||||
MWBase::Environment::get().getLuaManager()->newGameStarted();
|
||||
MWBase::Environment::get().getLuaManager()->gameLoaded();
|
||||
|
||||
MWBase::Environment::get().getWindowManager()->fadeScreenOut(0);
|
||||
MWBase::Environment::get().getWindowManager()->fadeScreenIn(1);
|
||||
|
@ -352,6 +352,8 @@ namespace MWWorld
|
||||
else
|
||||
mGlobalVariables[Globals::sCharGenState].setInteger(-1);
|
||||
|
||||
MWBase::Environment::get().getLuaManager()->newGameStarted();
|
||||
|
||||
if (bypass && !mStartCell.empty())
|
||||
{
|
||||
ESM::Position pos;
|
||||
|
Loading…
Reference in New Issue
Block a user