From 302b978b34a1a3226af5bd9c332f3ae6ea266ba7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 19 Dec 2005 00:26:43 +0000 Subject: [PATCH] move some prefs out of PrefsMan --- stepmania/src/PrefsManager.cpp | 1 - stepmania/src/PrefsManager.h | 5 +---- stepmania/src/ScreenEdit.cpp | 7 ++++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 28b9ea922e..9ca9679a7c 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -350,7 +350,6 @@ PrefsManager::PrefsManager() : m_bAnisotropicFiltering ( "AnisotropicFiltering", 0 ), m_bSignProfileData ( "SignProfileData", false ), - m_bEditorShowBGChangesPlay ( "EditorShowBGChangesPlay", false ), m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ), m_bMoveRandomToEnd ( "MoveRandomToEnd", false ), m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 6f1af4fe31..491b36133a 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -207,9 +207,6 @@ public: // have the same key, or else the profile's data will be discarded. Preference m_bSignProfileData; - /* Editor prefs: */ - Preference m_bEditorShowBGChangesPlay; - // course ranking enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK }; Preference m_CourseSortOrder; @@ -312,7 +309,7 @@ protected: /* This is global, because it can be accessed by crash handlers and error handlers - * that are run after PREFSMAN shuts down (and probably don't want to deref tht + * that are run after PREFSMAN shuts down (and probably don't want to deref that * pointer anyway). */ extern bool g_bAutoRestart; diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index bd8fa8a97b..aa1928e9b4 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -35,6 +35,7 @@ #include "NotesWriterSM.h" static Preference g_iDefaultRecordLength( "DefaultRecordLength", 4 ); +static Preference g_bEditorShowBGChangesPlay( "EditorShowBGChangesPlay", false ); // // Defines specific to ScreenEdit @@ -2050,7 +2051,7 @@ void ScreenEdit::TransitionEditState( EditState em ) m_Player.Load( m_NoteDataEdit ); GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PREFSMAN->m_AutoPlay; - if( PREFSMAN->m_bEditorShowBGChangesPlay ) + if( g_bEditorShowBGChangesPlay ) { /* FirstBeat affects backgrounds, so commit changes to memory (not to disk) * and recalc it. */ @@ -2089,7 +2090,7 @@ void ScreenEdit::TransitionEditState( EditState em ) m_sprOverlay->PlayCommand( EditStateToString(em) ); m_sprUnderlay->PlayCommand( EditStateToString(em) ); - m_Background.SetHidden( !PREFSMAN->m_bEditorShowBGChangesPlay || em == STATE_EDITING ); + m_Background.SetHidden( !g_bEditorShowBGChangesPlay || em == STATE_EDITING ); m_autoHeader->SetHidden( em != STATE_EDITING ); m_textInputTips.SetHidden( em != STATE_EDITING ); m_textInfo.SetHidden( em != STATE_EDITING ); @@ -2104,7 +2105,7 @@ void ScreenEdit::TransitionEditState( EditState em ) m_NoteFieldEdit.SetHidden( em != STATE_EDITING ); m_NoteFieldRecord.SetHidden( em != STATE_RECORDING && em != STATE_RECORDING_PAUSED ); m_Player.SetHidden( em != STATE_PLAYING ); - m_Foreground.SetHidden( !PREFSMAN->m_bEditorShowBGChangesPlay || em == STATE_EDITING ); + m_Foreground.SetHidden( !g_bEditorShowBGChangesPlay || em == STATE_EDITING ); switch( em ) {