From af732e66aae819b907a3ee49c6d55fdf020191df Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 27 Jan 2006 06:46:41 +0000 Subject: [PATCH] solo single -> centered single --- stepmania/src/PrefsManager.cpp | 2 +- stepmania/src/PrefsManager.h | 2 +- stepmania/src/ScreenGameplay.cpp | 4 ++-- stepmania/src/ScreenOptionsMasterPrefs.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 198b90c083..b70cd06304 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_bSoloSingle ( "SoloSingle", false ), + m_bCenteredSingle ( "CenteredSingle", 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 4f22b9fd97..149059ac27 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_bSoloSingle; + Preference m_bCenteredSingle; Preference m_bDancePointsForOni; Preference m_bPercentageScoring; Preference m_fMinPercentageForMachineSongHighScore; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index ec14c50ec2..1a7090f318 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 SoloSingles when it's Battle or Rave + * but for now just ignore CenteredSingle when it's Battle or Rave * Mode. This doesn't begin to address two-player solo (6 arrows) */ - if( PREFSMAN->m_bSoloSingle && + if( PREFSMAN->m_bCenteredSingle && 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 e98ca66a61..36298b140b 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( "SoloSingle", MovePref, "Off","On" ) ); + ADD( ConfOption( "CenteredSingle", MovePref, "Off","On" ) ); ADD( ConfOption( "HiddenSongs", MovePref, "Off","On" ) ); ADD( ConfOption( "EasterEggs", MovePref, "Off","On" ) ); ADD( ConfOption( "AllowW1", AllowW1, "Never","Courses Only","Always" ) );