World : do not self-destruct until everything completely done

This commit is contained in:
Marianne Gagnon
2014-10-26 19:05:07 -04:00
parent ef2cf3b17d
commit 32c5d79e26

View File

@@ -825,7 +825,7 @@ void World::updateWorld(float dt)
if (m_schedule_exit_race)
{
m_schedule_exit_race = false;
race_manager->exitRace();
race_manager->exitRace(false);
race_manager->setAIKartOverride("");
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
@@ -863,12 +863,16 @@ void World::updateWorld(float dt)
input_manager->getDeviceList()
->setSinglePlayer( StateManager::get()->getActivePlayer(0) );
delete this;
StateManager::get()->enterGameState();
race_manager->setupPlayerKartInfo();
race_manager->startNew(true);
}
else
{
delete this;
if (race_manager->raceWasStartedFromOverworld())
{
OverWorld::enterOverWorld();