From 219461a3f1fa01183c2e5414a46f8ad4a41fb04c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 20 Jul 2005 00:40:01 +0000 Subject: [PATCH] ScreenPlayerOptionsEdit -> ScreenEditOptions --- .../Themes/default/Graphics/ScreenEditOptions header.redir | 1 + stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/ScreenEdit.cpp | 6 +++--- stepmania/src/ScreenEdit.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/ScreenEditOptions header.redir diff --git a/stepmania/Themes/default/Graphics/ScreenEditOptions header.redir b/stepmania/Themes/default/Graphics/ScreenEditOptions header.redir new file mode 100644 index 0000000000..fbc3a81c07 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenEditOptions header.redir @@ -0,0 +1 @@ +_shared options header diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index fcf73b4e83..7eba2ff674 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -4207,7 +4207,7 @@ PlayRecordHelpX=SCREEN_LEFT+20 PlayRecordHelpY=SCREEN_BOTTOM-20 PlayRecordHelpOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0 -[ScreenPlayerOptionsEdit] +[ScreenEditOptions] Fallback=ScreenOptions Class=ScreenOptionsMaster NextScreen=none diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index acbc89d51d..1867def27b 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -662,7 +662,7 @@ void ScreenEdit::Init() m_pBackgroundChangeMenu = LoadEditMiniMenu( &g_BackgroundChange ); m_pInsertAttackMenu = LoadEditMiniMenu( &g_InsertAttack ); m_pCourseModeMenu = LoadEditMiniMenu( &g_CourseMode ); - m_pScreenPlayerOptions = SCREENMAN->MakeNewScreen( "ScreenPlayerOptionsEdit" ); + m_pScreenOptions = SCREENMAN->MakeNewScreen( "ScreenEditOptions" ); m_soundMusic.Load( m_pSong->GetMusicPath() ); @@ -688,7 +688,7 @@ ScreenEdit::~ScreenEdit() SAFE_DELETE( m_pBackgroundChangeMenu ); SAFE_DELETE( m_pInsertAttackMenu ); SAFE_DELETE( m_pCourseModeMenu ); - SAFE_DELETE( m_pScreenPlayerOptions ); + SAFE_DELETE( m_pScreenOptions ); } // play assist ticks @@ -2075,7 +2075,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns PROMPT_YES_NO, ANSWER_NO ); break; case options: - SCREENMAN->PushScreen( m_pScreenPlayerOptions, false, SM_BackFromOptions ); + SCREENMAN->PushScreen( m_pScreenOptions, false, SM_BackFromOptions ); break; case edit_song_info: { diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index ee4f6566d4..31b8d0282f 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -417,7 +417,7 @@ public: ScreenMiniMenu *m_pBackgroundChangeMenu; ScreenMiniMenu *m_pInsertAttackMenu; ScreenMiniMenu *m_pCourseModeMenu; - Screen *m_pScreenPlayerOptions; + Screen *m_pScreenOptions; }; #endif