actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-30 06:06:59 +00:00
parent 205d799df2
commit 1e2c3e345b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMiniMenu.cpp
+3 -5
View File
@@ -19,8 +19,7 @@ vector<int> ScreenMiniMenu::s_viLastAnswers;
/* Settings: */ /* Settings: */
namespace namespace
{ {
bool g_bLoaded = false; const MenuDef* g_pMenuDef = NULL;
const MenuDef* g_pMenuDef;
ScreenMessage g_SendOnOK; ScreenMessage g_SendOnOK;
ScreenMessage g_SendOnCancel; ScreenMessage g_SendOnCancel;
}; };
@@ -30,7 +29,6 @@ void ScreenMiniMenu::MiniMenu( const MenuDef* pDef, ScreenMessage SM_SendOnOK, S
g_pMenuDef = pDef; g_pMenuDef = pDef;
g_SendOnOK = SM_SendOnOK; g_SendOnOK = SM_SendOnOK;
g_SendOnCancel = SM_SendOnCancel; g_SendOnCancel = SM_SendOnCancel;
g_bLoaded = true;
SCREENMAN->AddNewScreenToTop( pDef->sClassName ); SCREENMAN->AddNewScreenToTop( pDef->sClassName );
Screen *pNewScreen = SCREENMAN->GetTopScreen(); Screen *pNewScreen = SCREENMAN->GetTopScreen();
@@ -41,12 +39,12 @@ REGISTER_SCREEN_CLASS( ScreenMiniMenu );
void ScreenMiniMenu::BeginScreen() void ScreenMiniMenu::BeginScreen()
{ {
if( g_bLoaded ) if( g_pMenuDef != NULL )
{ {
g_bLoaded = false;
LoadMenu( g_pMenuDef ); LoadMenu( g_pMenuDef );
SetOKMessage( g_SendOnOK ); SetOKMessage( g_SendOnOK );
SetCancelMessage( g_SendOnCancel ); SetCancelMessage( g_SendOnCancel );
g_pMenuDef = NULL;
} }
ScreenOptions::BeginScreen(); ScreenOptions::BeginScreen();