ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Go back to the overworld in losing challenges (#3192)

Browse Source
This commit is contained in:
Alayan-stk-2 2018-04-15 02:38:23 +02:00 committed by auriamg
parent 45aa9c2e3a
commit f16ed91bd5
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/states_screens/race_result_gui.cpp
View File

@ -387,18 +387,26 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
return; return;
} }
// This is a normal race, nothing was unlocked
// -------------------------------------------
StateManager::get()->popMenu(); StateManager::get()->popMenu();
if (name == "top") // Setup new race if (name == "top") // Setup new race
{ {
race_manager->exitRace(); race_manager->exitRace();
race_manager->setAIKartOverride(""); race_manager->setAIKartOverride("");
//If pressing continue quickly in a losing challenge
if (race_manager->raceWasStartedFromOverworld())
{
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
OverWorld::enterOverWorld();
}
else
{
Screen* newStack[] = { MainMenuScreen::getInstance(), Screen* newStack[] = { MainMenuScreen::getInstance(),
RaceSetupScreen::getInstance(), RaceSetupScreen::getInstance(),
NULL }; NULL };
StateManager::get()->resetAndSetStack(newStack); StateManager::get()->resetAndSetStack(newStack);
} }
}
else if (name == "middle") // Restart else if (name == "middle") // Restart
{ {
race_manager->rerunRace(); race_manager->rerunRace();