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

move some prefs out of PrefsMan

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-19 00:26:43 +00:00
parent 856705d215
commit 302b978b34
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
-1
View File
@@ -350,7 +350,6 @@ PrefsManager::PrefsManager() :
m_bAnisotropicFiltering ( "AnisotropicFiltering", 0 ), m_bAnisotropicFiltering ( "AnisotropicFiltering", 0 ),
m_bSignProfileData ( "SignProfileData", false ), m_bSignProfileData ( "SignProfileData", false ),
m_bEditorShowBGChangesPlay ( "EditorShowBGChangesPlay", false ),
m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ), m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ),
m_bMoveRandomToEnd ( "MoveRandomToEnd", false ), m_bMoveRandomToEnd ( "MoveRandomToEnd", false ),
m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), m_bSubSortByNumSteps ( "SubSortByNumSteps", false ),
stepmania/src/PrefsManager.h
+1 -4
View File
@@ -207,9 +207,6 @@ public:
// have the same key, or else the profile's data will be discarded. // have the same key, or else the profile's data will be discarded.
Preference<bool> m_bSignProfileData; Preference<bool> m_bSignProfileData;
/* Editor prefs: */
Preference<bool> m_bEditorShowBGChangesPlay;
// course ranking // course ranking
enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK }; enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK };
Preference<CourseSortOrders,int> m_CourseSortOrder; Preference<CourseSortOrders,int> m_CourseSortOrder;
@@ -312,7 +309,7 @@ protected:
/* This is global, because it can be accessed by crash handlers and error handlers /* 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). */ * pointer anyway). */
extern bool g_bAutoRestart; extern bool g_bAutoRestart;
stepmania/src/ScreenEdit.cpp
+4 -3
View File
@@ -35,6 +35,7 @@
#include "NotesWriterSM.h" #include "NotesWriterSM.h"
static Preference<float> g_iDefaultRecordLength( "DefaultRecordLength", 4 ); static Preference<float> g_iDefaultRecordLength( "DefaultRecordLength", 4 );
static Preference<bool> g_bEditorShowBGChangesPlay( "EditorShowBGChangesPlay", false );
// //
// Defines specific to ScreenEdit // Defines specific to ScreenEdit
@@ -2050,7 +2051,7 @@ void ScreenEdit::TransitionEditState( EditState em )
m_Player.Load( m_NoteDataEdit ); m_Player.Load( m_NoteDataEdit );
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PREFSMAN->m_AutoPlay; 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) /* FirstBeat affects backgrounds, so commit changes to memory (not to disk)
* and recalc it. */ * and recalc it. */
@@ -2089,7 +2090,7 @@ void ScreenEdit::TransitionEditState( EditState em )
m_sprOverlay->PlayCommand( EditStateToString(em) ); m_sprOverlay->PlayCommand( EditStateToString(em) );
m_sprUnderlay->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_autoHeader->SetHidden( em != STATE_EDITING );
m_textInputTips.SetHidden( em != STATE_EDITING ); m_textInputTips.SetHidden( em != STATE_EDITING );
m_textInfo.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_NoteFieldEdit.SetHidden( em != STATE_EDITING );
m_NoteFieldRecord.SetHidden( em != STATE_RECORDING && em != STATE_RECORDING_PAUSED ); m_NoteFieldRecord.SetHidden( em != STATE_RECORDING && em != STATE_RECORDING_PAUSED );
m_Player.SetHidden( em != STATE_PLAYING ); 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 ) switch( em )
{ {