From 8f9b19a83ad1e27538c2b210f488bbefd7182fbb Mon Sep 17 00:00:00 2001 From: auria Date: Sun, 21 Feb 2010 02:40:59 +0000 Subject: [PATCH] Moved 'continue GP' button above 'abort GP' button to please Hiker ;) git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4786 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- .../dialogs/race_over_dialog.cpp | 59 ++++++++++++------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/src/states_screens/dialogs/race_over_dialog.cpp b/src/states_screens/dialogs/race_over_dialog.cpp index ba28fce22..3d8462177 100644 --- a/src/states_screens/dialogs/race_over_dialog.cpp +++ b/src/states_screens/dialogs/race_over_dialog.cpp @@ -217,43 +217,58 @@ RaceOverDialog::RaceOverDialog(const float percentWidth, race_again_btn->setParent(m_irrlicht_window); m_children.push_back(race_again_btn); race_again_btn->add(); + + ButtonWidget* whats_next_btn = new ButtonWidget(); + whats_next_btn->x = 15; + whats_next_btn->y = m_area.getHeight() - (button_h + margin_between_buttons); + whats_next_btn->w = m_area.getWidth() - 30; + whats_next_btn->h = button_h; + whats_next_btn->setParent(m_irrlicht_window); + + whats_next_btn->m_text = _("Back to the main menu"); + whats_next_btn->m_properties[PROP_ID] = "backtomenu"; + + m_children.push_back(whats_next_btn); + whats_next_btn->add(); + + whats_next_btn->setFocusForPlayer( GUI_PLAYER_ID ); } - else + else if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX) { - // grand prix + ButtonWidget* whats_next_btn = new ButtonWidget(); + whats_next_btn->x = 15; + whats_next_btn->y = m_area.getHeight() - (button_h + margin_between_buttons)*2; + whats_next_btn->w = m_area.getWidth() - 30; + whats_next_btn->h = button_h; + whats_next_btn->setParent(m_irrlicht_window); + + whats_next_btn->m_text = _("Continue Grand Prix"); + whats_next_btn->m_properties[PROP_ID] = "continuegp"; + + m_children.push_back(whats_next_btn); + whats_next_btn->add(); + + whats_next_btn->setFocusForPlayer( GUI_PLAYER_ID ); + + ButtonWidget* abort_gp = new ButtonWidget(); abort_gp->m_properties[PROP_ID] = "backtomenu"; abort_gp->x = 15; - abort_gp->y = m_area.getHeight() - (button_h + margin_between_buttons)*2; + abort_gp->y = m_area.getHeight() - (button_h + margin_between_buttons); abort_gp->w = m_area.getWidth() - 30; abort_gp->h = button_h; abort_gp->m_text = _("Abort Grand Prix"); abort_gp->setParent(m_irrlicht_window); m_children.push_back(abort_gp); abort_gp->add(); - } - - ButtonWidget* whats_next_btn = new ButtonWidget(); - whats_next_btn->x = 15; - whats_next_btn->y = m_area.getHeight() - (button_h + margin_between_buttons); - whats_next_btn->w = m_area.getWidth() - 30; - whats_next_btn->h = button_h; - whats_next_btn->setParent(m_irrlicht_window); - - if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX) - { - whats_next_btn->m_text = _("Continue Grand Prix"); - whats_next_btn->m_properties[PROP_ID] = "continuegp"; + + } else { - whats_next_btn->m_text = _("Back to the main menu"); - whats_next_btn->m_properties[PROP_ID] = "backtomenu"; + assert(false); } - m_children.push_back(whats_next_btn); - whats_next_btn->add(); - - whats_next_btn->setFocusForPlayer( GUI_PLAYER_ID ); + } // ------------------------------------------------------------------------------------------------------