From fde711668446d89a43a8db971590e6817e030a8f Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 22 Feb 2004 19:54:59 +0000 Subject: [PATCH] member rename --- stepmania/src/Profile.cpp | 52 +++++++++++++++++------------------ stepmania/src/Profile.h | 10 +++---- stepmania/src/ProfileHtml.cpp | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 0966b9eb8c..188a417a3e 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -78,11 +78,11 @@ void Profile::InitGeneralData() m_iNumToasties = 0; m_UnlockedSongs.clear(); m_sLastMachinePlayed = ""; - m_iNumTapsAndHolds = 0; - m_iNumJumps = 0; - m_iNumHolds = 0; - m_iNumMines = 0; - m_iNumHands = 0; + m_iTotalTapsAndHolds = 0; + m_iTotalJumps = 0; + m_iTotalHolds = 0; + m_iTotalMines = 0; + m_iTotalHands = 0; int i; for( i=0; iAppendChild( "NumExtraStagesPassed", m_iNumExtraStagesPassed ); pGeneralDataNode->AppendChild( "NumExtraStagesFailed", m_iNumExtraStagesFailed ); pGeneralDataNode->AppendChild( "NumToasties", m_iNumToasties ); - pGeneralDataNode->AppendChild( "NumTapsAndHolds", m_iNumTapsAndHolds ); - pGeneralDataNode->AppendChild( "NumJumps", m_iNumJumps ); - pGeneralDataNode->AppendChild( "NumHolds", m_iNumHolds ); - pGeneralDataNode->AppendChild( "NumMines", m_iNumMines ); - pGeneralDataNode->AppendChild( "NumHands", m_iNumHands ); + pGeneralDataNode->AppendChild( "TotalTapsAndHolds", m_iTotalTapsAndHolds ); + pGeneralDataNode->AppendChild( "TotalJumps", m_iTotalJumps ); + pGeneralDataNode->AppendChild( "TotalHolds", m_iTotalHolds ); + pGeneralDataNode->AppendChild( "TotalMines", m_iTotalMines ); + pGeneralDataNode->AppendChild( "TotalHands", m_iTotalHands ); { XNode* pUnlockedSongs = pGeneralDataNode->AppendChild("UnlockedSongs"); @@ -635,11 +635,11 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) pNode->GetChildValue( "NumExtraStagesPassed", m_iNumExtraStagesPassed ); pNode->GetChildValue( "NumExtraStagesFailed", m_iNumExtraStagesFailed ); pNode->GetChildValue( "NumToasties", m_iNumToasties ); - pNode->GetChildValue( "NumTapsAndHolds", m_iNumTapsAndHolds ); - pNode->GetChildValue( "NumJumps", m_iNumJumps ); - pNode->GetChildValue( "NumHolds", m_iNumHolds ); - pNode->GetChildValue( "NumMines", m_iNumMines ); - pNode->GetChildValue( "NumHands", m_iNumHands ); + pNode->GetChildValue( "TotalTapsAndHolds", m_iTotalTapsAndHolds ); + pNode->GetChildValue( "TotalJumps", m_iTotalJumps ); + pNode->GetChildValue( "TotalHolds", m_iTotalHolds ); + pNode->GetChildValue( "TotalMines", m_iTotalMines ); + pNode->GetChildValue( "TotalHands", m_iTotalHands ); { XNode* pUnlockedSongs = pNode->GetChild("UnlockedSongs"); @@ -715,22 +715,22 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) } } -void Profile::AddStepTotals( int iNumTapsAndHolds, int iNumJumps, int iNumHolds, int iNumMines, int iNumHands ) +void Profile::AddStepTotals( int iTotalTapsAndHolds, int iTotalJumps, int iTotalHolds, int iTotalMines, int iTotalHands ) { - m_iNumTapsAndHolds += iNumTapsAndHolds; - m_iNumJumps += iNumJumps; - m_iNumHolds += iNumHolds; - m_iNumMines += iNumMines; - m_iNumHands += iNumHands; + m_iTotalTapsAndHolds += iTotalTapsAndHolds; + m_iTotalJumps += iTotalJumps; + m_iTotalHolds += iTotalHolds; + m_iTotalMines += iTotalMines; + m_iTotalHands += iTotalHands; if( m_fWeightPounds != 0 ) { float fCals = - SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iNumTapsAndHolds + - SCALE( m_fWeightPounds, 100.f, 200.f, 0.111f, 0.193f ) * iNumJumps + - SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iNumHolds + - SCALE( m_fWeightPounds, 100.f, 200.f, 0.000f, 0.000f ) * iNumMines + - SCALE( m_fWeightPounds, 100.f, 200.f, 0.222f, 0.386f ) * iNumHands; + SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iTotalTapsAndHolds + + SCALE( m_fWeightPounds, 100.f, 200.f, 0.111f, 0.193f ) * iTotalJumps + + SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iTotalHolds + + SCALE( m_fWeightPounds, 100.f, 200.f, 0.000f, 0.000f ) * iTotalMines + + SCALE( m_fWeightPounds, 100.f, 200.f, 0.222f, 0.386f ) * iTotalHands; m_fCaloriesBurned += fCals; } } diff --git a/stepmania/src/Profile.h b/stepmania/src/Profile.h index 95a12a0f90..fb6624fa0a 100644 --- a/stepmania/src/Profile.h +++ b/stepmania/src/Profile.h @@ -93,11 +93,11 @@ public: int m_iNumExtraStagesPassed; int m_iNumExtraStagesFailed; int m_iNumToasties; - int m_iNumTapsAndHolds; - int m_iNumJumps; - int m_iNumHolds; - int m_iNumMines; - int m_iNumHands; + int m_iTotalTapsAndHolds; + int m_iTotalJumps; + int m_iTotalHolds; + int m_iTotalMines; + int m_iTotalHands; set m_UnlockedSongs; mutable CString m_sLastMachinePlayed; // mutable because we overwrite this on save, and I don't want to remove const from the whole save chain. -Chris int m_iNumSongsPlayedByPlayMode[NUM_PLAY_MODES]; diff --git a/stepmania/src/ProfileHtml.cpp b/stepmania/src/ProfileHtml.cpp index a0c7f406a8..9ada899cdc 100644 --- a/stepmania/src/ProfileHtml.cpp +++ b/stepmania/src/ProfileHtml.cpp @@ -279,11 +279,11 @@ void PrintStatistics( RageFile &f, const Profile *pProfile, CString sTitle, vect TABLE_LINE2( "CurrentCombo", pProfile->m_iCurrentCombo ); TABLE_LINE2( "CaloriesBurned", pProfile->GetDisplayCaloriesBurned() ); TABLE_LINE2( "LastMachinePlayed", pProfile->m_sLastMachinePlayed ); - TABLE_LINE2( "NumTapsAndHolds", pProfile->m_iNumTapsAndHolds ); - TABLE_LINE2( "NumJumps", pProfile->m_iNumJumps ); - TABLE_LINE2( "NumHolds", pProfile->m_iNumHolds ); - TABLE_LINE2( "NumMines", pProfile->m_iNumMines ); - TABLE_LINE2( "NumHands", pProfile->m_iNumHands ); + TABLE_LINE2( "TotalTapsAndHolds", pProfile->m_iTotalTapsAndHolds ); + TABLE_LINE2( "TotalJumps", pProfile->m_iTotalJumps ); + TABLE_LINE2( "TotalHolds", pProfile->m_iTotalHolds ); + TABLE_LINE2( "TotalMines", pProfile->m_iTotalMines ); + TABLE_LINE2( "TotalHands", pProfile->m_iTotalHands ); END_TABLE; } PRINT_CLOSE(f);