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

Merge remote-tracking branch 'Flakebi/fixes'

Browse Source
This commit is contained in:
Marianne Gagnon 2014-12-27 18:25:03 -05:00
commit 2c5a4a4ffa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modes/cutscene_world.cpp
View File

@ -408,7 +408,6 @@ void CutsceneWorld::enterRaceOverState()
GUIEngine::Screen* newStack[] = { mainMenu, credits, NULL };
race_manager->exitRace();
StateManager::get()->resetAndSetStack(newStack);
credits->push();
}
// TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
else if (m_parts.size() == 1 && m_parts[0] == "gpwin")
@ -519,13 +518,17 @@ void CutsceneWorld::enterRaceOverState()
{
race_manager->exitRace();
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
player->setFirstTime(false);
PlayerManager::get()->save();
KartSelectionScreen* s = OfflineKartSelectionScreen::getInstance();
s->setMultiplayer(false);
s->setGoToOverworldNext();
s->push();
} else
{
race_manager->exitRace();
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
OverWorld::enterOverWorld();
}
}
// TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably