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

naming cleanup

Browse Source
This commit is contained in:
Chris Danford
2004-06-26 17:28:02 +00:00
parent 80ebe589ac
commit 991fc1acaa
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
+5 -5
View File
@@ -92,7 +92,7 @@ void PrefsManager::Init()
m_iMaxRegenComboAfterMiss = 10; m_iMaxRegenComboAfterMiss = 10;
m_bTwoPlayerRecovery = true; m_bTwoPlayerRecovery = true;
m_bMercifulDrain = true; m_bMercifulDrain = true;
m_bMin1FullSongInCourses = false; m_bMinimum1FullSongInCourses = false;
m_iPercentScoreWeightMarvelous = 3; m_iPercentScoreWeightMarvelous = 3;
m_iPercentScoreWeightPerfect = 2; m_iPercentScoreWeightPerfect = 2;
@@ -385,7 +385,7 @@ void PrefsManager::ReadPrefsFromFile( CString sIni )
ini.GetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss ); ini.GetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss );
ini.GetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery ); ini.GetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery );
ini.GetValue( "Options", "MercifulDrain", m_bMercifulDrain ); 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", "PercentScoreWeightMarvelous", m_iPercentScoreWeightMarvelous );
ini.GetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect ); ini.GetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect );
@@ -541,7 +541,7 @@ void PrefsManager::ReadPrefsFromFile( CString sIni )
ini.GetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.GetValue( "Options", "AutoRestart", g_bAutoRestart );
ini.GetValue( "Options", "SignProfileData", m_bSignProfileData ); ini.GetValue( "Options", "SignProfileData", m_bSignProfileData );
ini.GetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml ); ini.GetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml );
ini.GetValue( "Options", "WriteProfileStatsHtml", m_bWritePlayerStatsHtml ); ini.GetValue( "Options", "WritePlayerStatsHtml", m_bWritePlayerStatsHtml );
ini.GetValue( "Editor", "ShowBGChangesPlay", m_bEditorShowBGChangesPlay ); ini.GetValue( "Editor", "ShowBGChangesPlay", m_bEditorShowBGChangesPlay );
@@ -617,7 +617,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss ); ini.SetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss );
ini.SetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery ); ini.SetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery );
ini.SetValue( "Options", "MercifulDrain", m_bMercifulDrain ); 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", "PercentScoreWeightMarvelous", m_iPercentScoreWeightMarvelous );
ini.SetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect ); ini.SetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect );
@@ -773,7 +773,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.SetValue( "Options", "AutoRestart", g_bAutoRestart );
ini.SetValue( "Options", "SignProfileData", m_bSignProfileData ); ini.SetValue( "Options", "SignProfileData", m_bSignProfileData );
ini.SetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml ); ini.SetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml );
ini.SetValue( "Options", "WriteProfileStatsHtml", m_bWritePlayerStatsHtml ); ini.SetValue( "Options", "WritePlayerStatsHtml", m_bWritePlayerStatsHtml );
ini.SetValue( "Options", "SoundWriteAhead", m_iSoundWriteAhead ); ini.SetValue( "Options", "SoundWriteAhead", m_iSoundWriteAhead );
stepmania/src/PrefsManager.h
+1 -1
View File
@@ -89,7 +89,7 @@ public:
int m_iMaxRegenComboAfterMiss; int m_iMaxRegenComboAfterMiss;
bool m_bTwoPlayerRecovery; bool m_bTwoPlayerRecovery;
bool m_bMercifulDrain; // negative life deltas are scaled by the players life percentage 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) // percent score (the number that is shown on the screen and saved to memory card)
int m_iPercentScoreWeightMarvelous; int m_iPercentScoreWeightMarvelous;
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -1299,7 +1299,7 @@ void ScreenGameplay::Update( float fDeltaTime )
/* If FAIL_IMMEDIATE and everyone is failing, start SM_BeginFailed. */ /* If FAIL_IMMEDIATE and everyone is failing, start SM_BeginFailed. */
if( GAMESTATE->AllAreDead() && GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_IMMEDIATE ) 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 ; // do nothing
else else
SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 ); SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 );