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

always use ScreenMiniMenu::MiniMenu, not LoadMenu directly

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-30 07:18:34 +00:00
parent 608bd48087
commit 012c3f5d46
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMiniMenu.cpp
+6 -7
View File
@@ -39,13 +39,12 @@ REGISTER_SCREEN_CLASS( ScreenMiniMenu );
void ScreenMiniMenu::BeginScreen()
{
if( g_pMenuDef != NULL )
{
LoadMenu( g_pMenuDef );
SetOKMessage( g_SendOnOK );
SetCancelMessage( g_SendOnCancel );
g_pMenuDef = NULL;
}
ASSERT( g_pMenuDef != NULL );
LoadMenu( g_pMenuDef );
SetOKMessage( g_SendOnOK );
SetCancelMessage( g_SendOnCancel );
g_pMenuDef = NULL;
ScreenOptions::BeginScreen();
stepmania/src/ScreenMiniMenu.h
+2 -1
View File
@@ -89,7 +89,6 @@ public:
static void MiniMenu( const MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 );
void BeginScreen();
void LoadMenu( const MenuDef* pDef );
void HandleScreenMessage( const ScreenMessage SM );
void SetOKMessage( ScreenMessage SM_SendOnOK ) { m_SMSendOnOK = SM_SendOnOK; }
@@ -99,6 +98,8 @@ protected:
virtual void AfterChangeValueOrRow( PlayerNumber pn );
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
void LoadMenu( const MenuDef* pDef );
ScreenMessage m_SMSendOnOK;
ScreenMessage m_SMSendOnCancel;