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

Clear AI-override when appropriate, fixing #829

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12198 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-12-07 00:24:20 +00:00
parent 92fea12684
commit 4838a1eb2f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/states_screens/dialogs/race_paused_dialog.cpp
View File

@ -121,6 +121,7 @@ GUIEngine::EventPropagation
{ {
ModalDialog::dismiss(); ModalDialog::dismiss();
race_manager->exitRace(); race_manager->exitRace();
race_manager->setAIKartOverride("");
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance()); StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
if (race_manager->raceWasStartedFromOverworld()) if (race_manager->raceWasStartedFromOverworld())

4
src/states_screens/race_result_gui.cpp
View File

@ -205,6 +205,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
StateManager::get()->popMenu(); StateManager::get()->popMenu();
World::deleteWorld(); World::deleteWorld();
StateManager::get()->pushScreen(scene); StateManager::get()->pushScreen(scene);
race_manager->setAIKartOverride("");
} }
return; return;
} }
@ -228,6 +229,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
cleanupGPProgress(); cleanupGPProgress();
StateManager::get()->popMenu(); StateManager::get()->popMenu();
race_manager->exitRace(); race_manager->exitRace();
race_manager->setAIKartOverride("");
StateManager::get()->resetAndGoToScreen( StateManager::get()->resetAndGoToScreen(
MainMenuScreen::getInstance()); MainMenuScreen::getInstance());
@ -251,6 +253,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
if(name=="top") // Setup new race if(name=="top") // Setup new race
{ {
race_manager->exitRace(); race_manager->exitRace();
race_manager->setAIKartOverride("");
Screen* newStack[] = {MainMenuScreen::getInstance(), Screen* newStack[] = {MainMenuScreen::getInstance(),
RaceSetupScreen::getInstance(), RaceSetupScreen::getInstance(),
NULL}; NULL};
@ -263,6 +266,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
else if (name=="bottom") // Back to main else if (name=="bottom") // Back to main
{ {
race_manager->exitRace(); race_manager->exitRace();
race_manager->setAIKartOverride("");
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance()); StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
if (race_manager->raceWasStartedFromOverworld()) if (race_manager->raceWasStartedFromOverworld())