From 798c1004572b07f8881e4cd71ba1721cb01335f2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 19 Jul 2005 21:35:38 +0000 Subject: [PATCH] Init -> LoadMenu, to maintain the normal virtual Init(), and allow calling LoadMenu again without reloading the whole screen --- stepmania/src/ScreenMiniMenu.cpp | 5 +++-- stepmania/src/ScreenMiniMenu.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp index c38583522f..d00db5d2f2 100644 --- a/stepmania/src/ScreenMiniMenu.cpp +++ b/stepmania/src/ScreenMiniMenu.cpp @@ -19,7 +19,8 @@ vector ScreenMiniMenu::s_viLastAnswers; void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel, float fX, float fY ) { 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 ); SCREENMAN->ZeroNextUpdate(); 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(); diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h index 637c0b3d9f..5acdc8610b 100644 --- a/stepmania/src/ScreenMiniMenu.h +++ b/stepmania/src/ScreenMiniMenu.h @@ -79,7 +79,7 @@ public: static void MiniMenu( MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 ); 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 ); protected: