From 991fc1acaad2b912ce60f1a460b19c1e5e97f1ca Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 26 Jun 2004 17:28:02 +0000 Subject: [PATCH] naming cleanup --- stepmania/src/PrefsManager.cpp | 10 +++++----- stepmania/src/PrefsManager.h | 2 +- stepmania/src/ScreenGameplay.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 2ee75535b1..aa43dcab31 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -92,7 +92,7 @@ void PrefsManager::Init() m_iMaxRegenComboAfterMiss = 10; m_bTwoPlayerRecovery = true; m_bMercifulDrain = true; - m_bMin1FullSongInCourses = false; + m_bMinimum1FullSongInCourses = false; m_iPercentScoreWeightMarvelous = 3; m_iPercentScoreWeightPerfect = 2; @@ -385,7 +385,7 @@ void PrefsManager::ReadPrefsFromFile( CString sIni ) ini.GetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss ); ini.GetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery ); ini.GetValue( "Options", "MercifulDrain", m_bMercifulDrain ); - ini.GetValue( "Options", "Min1FullSongInCourses", m_bMin1FullSongInCourses ); + ini.GetValue( "Options", "Minimum1FullSongInCourses", m_bMinimum1FullSongInCourses ); ini.GetValue( "Options", "PercentScoreWeightMarvelous", m_iPercentScoreWeightMarvelous ); ini.GetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect ); @@ -541,7 +541,7 @@ void PrefsManager::ReadPrefsFromFile( CString sIni ) ini.GetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.GetValue( "Options", "SignProfileData", m_bSignProfileData ); ini.GetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml ); - ini.GetValue( "Options", "WriteProfileStatsHtml", m_bWritePlayerStatsHtml ); + ini.GetValue( "Options", "WritePlayerStatsHtml", m_bWritePlayerStatsHtml ); ini.GetValue( "Editor", "ShowBGChangesPlay", m_bEditorShowBGChangesPlay ); @@ -617,7 +617,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss ); ini.SetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery ); ini.SetValue( "Options", "MercifulDrain", m_bMercifulDrain ); - ini.SetValue( "Options", "Min1FullSongInCourses", m_bMin1FullSongInCourses ); + ini.SetValue( "Options", "Minimum1FullSongInCourses", m_bMinimum1FullSongInCourses ); ini.SetValue( "Options", "PercentScoreWeightMarvelous", m_iPercentScoreWeightMarvelous ); ini.SetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect ); @@ -773,7 +773,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.SetValue( "Options", "SignProfileData", m_bSignProfileData ); ini.SetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml ); - ini.SetValue( "Options", "WriteProfileStatsHtml", m_bWritePlayerStatsHtml ); + ini.SetValue( "Options", "WritePlayerStatsHtml", m_bWritePlayerStatsHtml ); ini.SetValue( "Options", "SoundWriteAhead", m_iSoundWriteAhead ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 4033cb3548..2bb89c7321 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -89,7 +89,7 @@ public: int m_iMaxRegenComboAfterMiss; bool m_bTwoPlayerRecovery; bool m_bMercifulDrain; // negative life deltas are scaled by the players life percentage - bool m_bMin1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter + bool m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter // percent score (the number that is shown on the screen and saved to memory card) int m_iPercentScoreWeightMarvelous; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 0a17dbfe41..950dbb3040 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1299,7 +1299,7 @@ void ScreenGameplay::Update( float fDeltaTime ) /* If FAIL_IMMEDIATE and everyone is failing, start SM_BeginFailed. */ if( GAMESTATE->AllAreDead() && GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_IMMEDIATE ) { - if( PREFSMAN->m_bMin1FullSongInCourses && GAMESTATE->GetCourseSongIndex()==0 ) + if( PREFSMAN->m_bMinimum1FullSongInCourses && GAMESTATE->GetCourseSongIndex()==0 ) ; // do nothing else SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 );