Use SCREENMAN->MakeNewScreen, so we obey the class of the

loaded screen.  We don't require anything special of it.
This commit is contained in:
Glenn Maynard
2005-07-19 23:58:51 +00:00
parent e996181415
commit 39d42a9db4
2 changed files with 2 additions and 4 deletions
+1 -2
View File
@@ -672,8 +672,7 @@ void ScreenEdit::Init()
m_pPrefsMenu = LoadEditMiniMenu( &g_Prefs ); m_pPrefsMenu = LoadEditMiniMenu( &g_Prefs );
m_pInsertAttackMenu = LoadEditMiniMenu( &g_InsertAttack ); m_pInsertAttackMenu = LoadEditMiniMenu( &g_InsertAttack );
m_pCourseModeMenu = LoadEditMiniMenu( &g_CourseMode ); m_pCourseModeMenu = LoadEditMiniMenu( &g_CourseMode );
m_pScreenPlayerOptions = new ScreenPlayerOptions( "ScreenPlayerOptionsEdit" ); m_pScreenPlayerOptions = SCREENMAN->MakeNewScreen( "ScreenPlayerOptionsEdit" );
m_pScreenPlayerOptions->Init();
m_soundMusic.Load( m_pSong->GetMusicPath() ); m_soundMusic.Load( m_pSong->GetMusicPath() );
+1 -2
View File
@@ -18,7 +18,6 @@
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "PlayerState.h" #include "PlayerState.h"
#include "ScreenMiniMenu.h" #include "ScreenMiniMenu.h"
#include "ScreenPlayerOptions.h"
const int NUM_EDIT_BUTTON_COLUMNS = 10; const int NUM_EDIT_BUTTON_COLUMNS = 10;
struct MenuDef; struct MenuDef;
@@ -425,7 +424,7 @@ public:
ScreenMiniMenu *m_pPrefsMenu; ScreenMiniMenu *m_pPrefsMenu;
ScreenMiniMenu *m_pInsertAttackMenu; ScreenMiniMenu *m_pInsertAttackMenu;
ScreenMiniMenu *m_pCourseModeMenu; ScreenMiniMenu *m_pCourseModeMenu;
ScreenOptions *m_pScreenPlayerOptions; Screen *m_pScreenPlayerOptions;
}; };
#endif #endif