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

Init -> LoadMenu, to maintain the normal virtual Init(), and allow calling LoadMenu again without reloading the whole screen

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-19 21:35:38 +00:00
parent c84ff55345
commit 798c100457
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMiniMenu.cpp
+3 -2
View File
@@ -19,7 +19,8 @@ vector<int> ScreenMiniMenu::s_viLastAnswers;
void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel, float fX, float fY ) void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel, float fX, float fY )
{ {
ScreenMiniMenu *pNewScreen = new ScreenMiniMenu( pDef->sClassName ); ScreenMiniMenu *pNewScreen = new ScreenMiniMenu( pDef->sClassName );
pNewScreen->Init( pDef, SM_SendOnOK, SM_SendOnCancel ); pNewScreen->Init();
pNewScreen->LoadMenu( pDef, SM_SendOnOK, SM_SendOnCancel );
pNewScreen->SetXY( fX, fY ); pNewScreen->SetXY( fX, fY );
SCREENMAN->ZeroNextUpdate(); SCREENMAN->ZeroNextUpdate();
SCREENMAN->PushScreen( pNewScreen, true ); SCREENMAN->PushScreen( pNewScreen, true );
@@ -30,7 +31,7 @@ ScreenMiniMenu::ScreenMiniMenu( CString sClassName ) :ScreenOptions( sClassName
{ {
} }
void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel ) void ScreenMiniMenu::LoadMenu( const MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel )
{ {
ScreenOptions::Init(); ScreenOptions::Init();
stepmania/src/ScreenMiniMenu.h
+1 -1
View File
@@ -79,7 +79,7 @@ public:
static void MiniMenu( MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 ); static void MiniMenu( MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 );
ScreenMiniMenu( CString sScreenClass ); ScreenMiniMenu( CString sScreenClass );
void Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel ); void LoadMenu( const MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel );
void HandleScreenMessage( const ScreenMessage SM ); void HandleScreenMessage( const ScreenMessage SM );
protected: protected: