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

Preserve "startedFromOverworld" flag value properly. Fixes #1683

Browse Source
This commit is contained in:
Marianne Gagnon
2014-11-17 19:07:37 -05:00
parent af35bce41d
commit 229a43a692
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modes/cutscene_world.cpp
View File

@@ -429,7 +429,7 @@ void CutsceneWorld::enterRaceOverState()
race_manager->setNumKarts(0);
race_manager->setNumPlayers(0);
race_manager->setNumLocalPlayers(0);
race_manager->startSingleRace("featunlocked", 999, false);
race_manager->startSingleRace("featunlocked", 999, race_manager->raceWasStartedFromOverworld());
FeatureUnlockedCutScene* scene =
FeatureUnlockedCutScene::getInstance();
@@ -482,7 +482,7 @@ void CutsceneWorld::enterRaceOverState()
race_manager->setNumKarts(0);
race_manager->setNumPlayers(0);
race_manager->setNumLocalPlayers(0);
race_manager->startSingleRace("featunlocked", 999, false);
race_manager->startSingleRace("featunlocked", 999, race_manager->raceWasStartedFromOverworld());
FeatureUnlockedCutScene* scene =
FeatureUnlockedCutScene::getInstance();
@@ -563,7 +563,7 @@ void CutsceneWorld::enterRaceOverState()
std::string next_part = m_parts[partId + 1];
race_manager->exitRace();
race_manager->startSingleRace(next_part, 999, false);
race_manager->startSingleRace(next_part, 999, race_manager->raceWasStartedFromOverworld());
}
}

4
src/race/race_manager.cpp
View File

@@ -701,14 +701,14 @@ void RaceManager::exitRace(bool delete_world)
if (someHumanPlayerWon)
{
race_manager->startSingleRace("gpwin", 999, false);
race_manager->startSingleRace("gpwin", 999, race_manager->raceWasStartedFromOverworld());
GrandPrixWin* scene = GrandPrixWin::getInstance();
scene->push();
scene->setKarts(winners);
}
else
{
race_manager->startSingleRace("gplose", 999, false);
race_manager->startSingleRace("gplose", 999, race_manager->raceWasStartedFromOverworld());
GrandPrixLose* scene = GrandPrixLose::getInstance();
scene->push();

2
src/states_screens/race_result_gui.cpp
View File

@@ -283,7 +283,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
race_manager->setNumKarts(0);
race_manager->setNumPlayers(0);
race_manager->setNumLocalPlayers(0);
race_manager->startSingleRace("featunlocked", 999, false);
race_manager->startSingleRace("featunlocked", 999, race_manager->raceWasStartedFromOverworld());
FeatureUnlockedCutScene* scene =
FeatureUnlockedCutScene::getInstance();