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

Don't show end race button before the GO.

Browse Source 
Ending before the GO gave you a time of 0:00:00.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11181 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
wardje
2012-05-01 20:48:52 +00:00
parent 49c5f1a093
commit 8f073e66e5
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ RacePausedDialog::RacePausedDialog(const float percentWidth,
ModalDialog(percentWidth, percentHeight)
{
loadFromFile("race_paused_dialog.stkgui");
World::getWorld()->schedulePause(WorldStatus::IN_GAME_MENU_PHASE);
IconButtonWidget* back_btn = getWidget<IconButtonWidget>("backbtn");
@@ -69,14 +69,15 @@ void RacePausedDialog::loadedFromFile()
{
GUIEngine::RibbonWidget* choice_ribbon =
getWidget<GUIEngine::RibbonWidget>("choiceribbon");
const bool success = choice_ribbon->deleteChild("restart");
assert(success);
}
// Remove "endrace" button for types not (yet?) implemented
if (race_manager->getMinorMode() != RaceManager::MINOR_MODE_NORMAL_RACE &&
race_manager->getMinorMode() != RaceManager::MINOR_MODE_TIME_TRIAL )
// Also don't show it unless the race has started. Prevents finishing in
// a time of 0:00:00.
if ((race_manager->getMinorMode() != RaceManager::MINOR_MODE_NORMAL_RACE &&
race_manager->getMinorMode() != RaceManager::MINOR_MODE_TIME_TRIAL ) ||
World::getWorld()->isStartPhase())
{
GUIEngine::RibbonWidget* choice_ribbon =
getWidget<GUIEngine::RibbonWidget>("choiceribbon");
@@ -98,7 +99,7 @@ GUIEngine::EventPropagation
{
GUIEngine::RibbonWidget* chocie_ribbon =
getWidget<GUIEngine::RibbonWidget>("choiceribbon");
if (eventSource == "backbtn")
{
// unpausing is done in the destructor so nothing more to do here
@@ -115,12 +116,12 @@ GUIEngine::EventPropagation
ModalDialog::dismiss();
race_manager->exitRace();
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
if (race_manager->raceWasStartedFromOverworld())
{
OverWorld::enterOverWorld();
}
return GUIEngine::EVENT_BLOCK;
}
else if (selection == "help")