From e09e5020387b4319c0d74f5ad3d47131f18a05f5 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 27 Jan 2006 07:09:43 +0000 Subject: [PATCH] CenteredSingle->Center1Player --- stepmania/Themes/default/Languages/en.ini | 4 ++-- stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/PrefsManager.cpp | 2 +- stepmania/src/PrefsManager.h | 2 +- stepmania/src/ScreenGameplay.cpp | 4 ++-- stepmania/src/ScreenOptionsMasterPrefs.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index a9f19edb75..6d27557369 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -315,7 +315,7 @@ ShowSelectGroup=Toggle whether the Select Group screen is shown. ShowSongOptions=Select the availability of the Song Options screen. When HIDE, it can not be accessed. When SHOW, it will always be shown. When set to ASK, it can be accessed by pressing START a second time after the Player Options screen. ShowStats=Display Performance Statistics in the upper right corner of the screen. FPS = frames per second. TPF = triangles per frame. DPF = draws per frame. SmoothLines=Toggle whether the Groove Radar is drawn with antialiased lines. -SoloSingle=Turn this option &oq;ON&cq; to enable Solo-Style for 4-panel single play. +Centered1Player=Turn this option &oq;ON&cq; to center the display for 1 player styles. SongsPerPlay=The number of songs a player can play in Regular mode. Sound Options=Change volume and resampling options. SoundResampleQuality=Advanced: Select the resampling quality to use. @@ -778,7 +778,7 @@ ShowSelectGroup=Song\nGroup ShowSongOptions=Show Song\nOptions ShowStats=Show\nStats SmoothLines=SmoothLines -SoloSingle=Solo\nSingles +Center1Player=Center\n1 Player Song Options=Song Options SongsPerPlay=Songs Per\nPlay Sound Options=Sound Options diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index e25b0bcebc..a8ee6997b3 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3212,7 +3212,7 @@ Line14=conf,ShowBanners [ScreenGameplayOptions] Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5,6 -Line1=conf,SoloSingle +Line1=conf,Center1Player Line2=conf,HiddenSongs Line3=conf,EasterEggs Line4=conf,AllowExtraStage diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index b70cd06304..5e5f01c58f 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -233,7 +233,7 @@ PrefsManager::PrefsManager() : m_fLongVerSongSeconds ( "LongVerSongSeconds", 60*2.5f ), // Dynamite Rave is 2:55 m_fMarathonVerSongSeconds ( "MarathonVerSongSeconds", 60*5.f ), m_ShowSongOptions ( "ShowSongOptions", YES ), - m_bCenteredSingle ( "CenteredSingle", false ), + m_bCenter1Player ( "Center1Player", false ), m_bDancePointsForOni ( "DancePointsForOni", false ), m_bPercentageScoring ( "PercentageScoring", false ), m_fMinPercentageForMachineSongHighScore ( "MinPercentageForMachineSongHighScore", 0.5f ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 149059ac27..c8d5f158e9 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -138,7 +138,7 @@ public: Preference m_fMarathonVerSongSeconds; enum Maybe { ASK = -1, NO = 0, YES = 1 }; Preference m_ShowSongOptions; - Preference m_bCenteredSingle; + Preference m_bCenter1Player; Preference m_bDancePointsForOni; Preference m_bPercentageScoring; Preference m_fMinPercentageForMachineSongHighScore; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 1a7090f318..f5eecd5525 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -458,9 +458,9 @@ void ScreenGameplay::Init() /* Perhaps this should be handled better by defining a new * StyleType for ONE_PLAYER_ONE_CREDIT_AND_ONE_COMPUTER, - * but for now just ignore CenteredSingle when it's Battle or Rave + * but for now just ignore Center1Player when it's Battle or Rave * Mode. This doesn't begin to address two-player solo (6 arrows) */ - if( PREFSMAN->m_bCenteredSingle && + if( PREFSMAN->m_bCenter1Player && GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE && GAMESTATE->m_PlayMode != PLAY_MODE_RAVE && GAMESTATE->GetCurrentStyle()->m_StyleType == ONE_PLAYER_ONE_SIDE ) diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 36298b140b..a95d366c36 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -569,7 +569,7 @@ static void InitializeConfOptions() ADD( ConfOption( "MusicWheelSwitchSpeed", MusicWheelSwitchSpeed, "Slow","Normal","Fast","Really Fast" ) ); /* Gameplay options */ - ADD( ConfOption( "CenteredSingle", MovePref, "Off","On" ) ); + ADD( ConfOption( "Center1Player", MovePref, "Off","On" ) ); ADD( ConfOption( "HiddenSongs", MovePref, "Off","On" ) ); ADD( ConfOption( "EasterEggs", MovePref, "Off","On" ) ); ADD( ConfOption( "AllowW1", AllowW1, "Never","Courses Only","Always" ) );