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

Moved 'continue GP' button above 'abort GP' button to please Hiker ;)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4786 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-02-21 02:40:59 +00:00
parent eec4a21cbe
commit 8f9b19a83a
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/states_screens/dialogs/race_over_dialog.cpp
View File

@ -217,21 +217,6 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
race_again_btn->setParent(m_irrlicht_window); race_again_btn->setParent(m_irrlicht_window);
m_children.push_back(race_again_btn); m_children.push_back(race_again_btn);
race_again_btn->add(); race_again_btn->add();
}
else
{
// grand prix
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->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(); ButtonWidget* whats_next_btn = new ButtonWidget();
whats_next_btn->x = 15; whats_next_btn->x = 15;
@ -240,20 +225,50 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
whats_next_btn->h = button_h; whats_next_btn->h = button_h;
whats_next_btn->setParent(m_irrlicht_window); 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_text = _("Back to the main menu");
whats_next_btn->m_properties[PROP_ID] = "backtomenu"; whats_next_btn->m_properties[PROP_ID] = "backtomenu";
}
m_children.push_back(whats_next_btn); m_children.push_back(whats_next_btn);
whats_next_btn->add(); whats_next_btn->add();
whats_next_btn->setFocusForPlayer( GUI_PLAYER_ID ); whats_next_btn->setFocusForPlayer( GUI_PLAYER_ID );
}
else if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_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);
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();
}
else
{
assert(false);
}
} }
// ------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------