commited Robert's menu stack patch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
bd56ada2a4
commit
b02992455f
@ -17,7 +17,7 @@ namespace StateManager
|
||||
{
|
||||
void showTrackSelectionScreen()
|
||||
{
|
||||
GUIEngine::switchToScreen("tracks.stkgui");
|
||||
pushMenu("tracks.stkgui");
|
||||
GUIEngine::RibbonGridWidget* w = dynamic_cast<GUIEngine::RibbonGridWidget*>(GUIEngine::getCurrentScreen()->getWidget("tracks"));
|
||||
assert( w != NULL );
|
||||
|
||||
@ -43,7 +43,7 @@ namespace StateManager
|
||||
std::string selection = ((GUIEngine::RibbonWidget*)widget)->getSelectionName().c_str();
|
||||
if(selection == "new")
|
||||
{
|
||||
GUIEngine::switchToScreen("karts.stkgui");
|
||||
StateManager::pushMenu("karts.stkgui");
|
||||
GUIEngine::RibbonGridWidget* w = dynamic_cast<GUIEngine::RibbonGridWidget*>(GUIEngine::getCurrentScreen()->getWidget("karts"));
|
||||
assert( w != NULL );
|
||||
|
||||
@ -88,12 +88,16 @@ namespace StateManager
|
||||
main_loop->abort();
|
||||
return;
|
||||
}
|
||||
else if (selection == "options")
|
||||
{
|
||||
pushMenu("options.stkgui");
|
||||
}
|
||||
}
|
||||
|
||||
// -- kart selection screen
|
||||
if(name == "karts")
|
||||
{
|
||||
GUIEngine::switchToScreen("racesetup.stkgui");
|
||||
StateManager::pushMenu("racesetup.stkgui");
|
||||
}
|
||||
|
||||
// -- race setup screen
|
||||
@ -249,4 +253,4 @@ namespace StateManager
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user