teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix not returning to main menu on failed loads when using quickload

Browse source
This commit is contained in:
scrawl 2014-05-20 17:11:26 +02:00
parent 7ab98f0c6f
commit abd6b6ab33
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/savegamedialog.cpp
View file

@ -222,12 +222,6 @@ namespace MWGui
MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, mCurrentSlot); MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, mCurrentSlot);
} }
} }
if (MWBase::Environment::get().getStateManager()->getState()==
MWBase::StateManager::State_NoGame)
{
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
}
} }
void SaveGameDialog::onOkButtonClicked(MyGUI::Widget *sender) void SaveGameDialog::onOkButtonClicked(MyGUI::Widget *sender)

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

@ -371,6 +371,8 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
{ {
std::cerr << "failed to load saved game: " << e.what() << std::endl; std::cerr << "failed to load saved game: " << e.what() << std::endl;
cleanup (true); cleanup (true);
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
} }
} }

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

@ -233,6 +233,10 @@ namespace MWWorld
if (!bypass) if (!bypass)
MWBase::Environment::get().getWindowManager()->playVideo(mFallback.getFallbackString("Movies_New_Game"), true); MWBase::Environment::get().getWindowManager()->playVideo(mFallback.getFallbackString("Movies_New_Game"), true);
// enable collision
if (!mPhysics->toggleCollisionMode())
mPhysics->toggleCollisionMode();
// we don't want old weather to persist on a new game // we don't want old weather to persist on a new game
delete mWeatherManager; delete mWeatherManager;
mWeatherManager = 0; mWeatherManager = 0;
@ -248,10 +252,6 @@ namespace MWWorld
mLocalScripts.clear(); mLocalScripts.clear();
mPlayer->clear(); mPlayer->clear();
// enable collision
if (!mPhysics->toggleCollisionMode())
mPhysics->toggleCollisionMode();
mWorldScene->changeToVoid(); mWorldScene->changeToVoid();
mStore.clearDynamic(); mStore.clearDynamic();