mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'passivestorage' into 'master'

Browse source 
Activate global storage when setting up the player

See merge request OpenMW/openmw!4413
This commit is contained in:
psi29a 2024-10-21 11:01:26 +00:00
commit cdf7bd74d5
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwlua/luamanagerimp.cpp
View file

@ -373,7 +373,6 @@ namespace MWLua
mGlobalScripts.addAutoStartedScripts(); mGlobalScripts.addAutoStartedScripts();
mGlobalScriptsStarted = true; mGlobalScriptsStarted = true;
mNewGameStarted = true; mNewGameStarted = true;
mMenuScripts.stateChanged();
} }
void LuaManager::gameLoaded() void LuaManager::gameLoaded()

2
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -178,7 +178,7 @@ void MWState::StateManager::newGame(bool bypass)
MWBase::Environment::get().getWorld()->startNewGame(bypass); MWBase::Environment::get().getWorld()->startNewGame(bypass);
mState = State_Running; mState = State_Running;
MWBase::Environment::get().getLuaManager()->newGameStarted(); MWBase::Environment::get().getLuaManager()->gameLoaded();
MWBase::Environment::get().getWindowManager()->fadeScreenOut(0); MWBase::Environment::get().getWindowManager()->fadeScreenOut(0);
MWBase::Environment::get().getWindowManager()->fadeScreenIn(1); MWBase::Environment::get().getWindowManager()->fadeScreenIn(1);

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -352,6 +352,8 @@ namespace MWWorld
else else
mGlobalVariables[Globals::sCharGenState].setInteger(-1); mGlobalVariables[Globals::sCharGenState].setInteger(-1);
MWBase::Environment::get().getLuaManager()->newGameStarted();
if (bypass && !mStartCell.empty()) if (bypass && !mStartCell.empty())
{ {
ESM::Position pos; ESM::Position pos;