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

member rename

Browse Source
This commit is contained in:
Chris Danford
2004-02-22 19:54:59 +00:00
parent 6154c14f86
commit fde7116684
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Profile.cpp
+26 -26
View File
@@ -78,11 +78,11 @@ void Profile::InitGeneralData()
m_iNumToasties = 0; m_iNumToasties = 0;
m_UnlockedSongs.clear(); m_UnlockedSongs.clear();
m_sLastMachinePlayed = ""; m_sLastMachinePlayed = "";
m_iNumTapsAndHolds = 0; m_iTotalTapsAndHolds = 0;
m_iNumJumps = 0; m_iTotalJumps = 0;
m_iNumHolds = 0; m_iTotalHolds = 0;
m_iNumMines = 0; m_iTotalMines = 0;
m_iNumHands = 0; m_iTotalHands = 0;
int i; int i;
for( i=0; i<NUM_PLAY_MODES; i++ ) for( i=0; i<NUM_PLAY_MODES; i++ )
@@ -502,11 +502,11 @@ XNode* Profile::SaveGeneralDataCreateNode() const
pGeneralDataNode->AppendChild( "NumExtraStagesPassed", m_iNumExtraStagesPassed ); pGeneralDataNode->AppendChild( "NumExtraStagesPassed", m_iNumExtraStagesPassed );
pGeneralDataNode->AppendChild( "NumExtraStagesFailed", m_iNumExtraStagesFailed ); pGeneralDataNode->AppendChild( "NumExtraStagesFailed", m_iNumExtraStagesFailed );
pGeneralDataNode->AppendChild( "NumToasties", m_iNumToasties ); pGeneralDataNode->AppendChild( "NumToasties", m_iNumToasties );
pGeneralDataNode->AppendChild( "NumTapsAndHolds", m_iNumTapsAndHolds ); pGeneralDataNode->AppendChild( "TotalTapsAndHolds", m_iTotalTapsAndHolds );
pGeneralDataNode->AppendChild( "NumJumps", m_iNumJumps ); pGeneralDataNode->AppendChild( "TotalJumps", m_iTotalJumps );
pGeneralDataNode->AppendChild( "NumHolds", m_iNumHolds ); pGeneralDataNode->AppendChild( "TotalHolds", m_iTotalHolds );
pGeneralDataNode->AppendChild( "NumMines", m_iNumMines ); pGeneralDataNode->AppendChild( "TotalMines", m_iTotalMines );
pGeneralDataNode->AppendChild( "NumHands", m_iNumHands ); pGeneralDataNode->AppendChild( "TotalHands", m_iTotalHands );
{ {
XNode* pUnlockedSongs = pGeneralDataNode->AppendChild("UnlockedSongs"); XNode* pUnlockedSongs = pGeneralDataNode->AppendChild("UnlockedSongs");
@@ -635,11 +635,11 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
pNode->GetChildValue( "NumExtraStagesPassed", m_iNumExtraStagesPassed ); pNode->GetChildValue( "NumExtraStagesPassed", m_iNumExtraStagesPassed );
pNode->GetChildValue( "NumExtraStagesFailed", m_iNumExtraStagesFailed ); pNode->GetChildValue( "NumExtraStagesFailed", m_iNumExtraStagesFailed );
pNode->GetChildValue( "NumToasties", m_iNumToasties ); pNode->GetChildValue( "NumToasties", m_iNumToasties );
pNode->GetChildValue( "NumTapsAndHolds", m_iNumTapsAndHolds ); pNode->GetChildValue( "TotalTapsAndHolds", m_iTotalTapsAndHolds );
pNode->GetChildValue( "NumJumps", m_iNumJumps ); pNode->GetChildValue( "TotalJumps", m_iTotalJumps );
pNode->GetChildValue( "NumHolds", m_iNumHolds ); pNode->GetChildValue( "TotalHolds", m_iTotalHolds );
pNode->GetChildValue( "NumMines", m_iNumMines ); pNode->GetChildValue( "TotalMines", m_iTotalMines );
pNode->GetChildValue( "NumHands", m_iNumHands ); pNode->GetChildValue( "TotalHands", m_iTotalHands );
{ {
XNode* pUnlockedSongs = pNode->GetChild("UnlockedSongs"); 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_iTotalTapsAndHolds += iTotalTapsAndHolds;
m_iNumJumps += iNumJumps; m_iTotalJumps += iTotalJumps;
m_iNumHolds += iNumHolds; m_iTotalHolds += iTotalHolds;
m_iNumMines += iNumMines; m_iTotalMines += iTotalMines;
m_iNumHands += iNumHands; m_iTotalHands += iTotalHands;
if( m_fWeightPounds != 0 ) if( m_fWeightPounds != 0 )
{ {
float fCals = float fCals =
SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iNumTapsAndHolds + SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iTotalTapsAndHolds +
SCALE( m_fWeightPounds, 100.f, 200.f, 0.111f, 0.193f ) * iNumJumps + SCALE( m_fWeightPounds, 100.f, 200.f, 0.111f, 0.193f ) * iTotalJumps +
SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iNumHolds + SCALE( m_fWeightPounds, 100.f, 200.f, 0.029f, 0.052f ) * iTotalHolds +
SCALE( m_fWeightPounds, 100.f, 200.f, 0.000f, 0.000f ) * iNumMines + SCALE( m_fWeightPounds, 100.f, 200.f, 0.000f, 0.000f ) * iTotalMines +
SCALE( m_fWeightPounds, 100.f, 200.f, 0.222f, 0.386f ) * iNumHands; SCALE( m_fWeightPounds, 100.f, 200.f, 0.222f, 0.386f ) * iTotalHands;
m_fCaloriesBurned += fCals; m_fCaloriesBurned += fCals;
} }
} }
stepmania/src/Profile.h
+5 -5
View File
@@ -93,11 +93,11 @@ public:
int m_iNumExtraStagesPassed; int m_iNumExtraStagesPassed;
int m_iNumExtraStagesFailed; int m_iNumExtraStagesFailed;
int m_iNumToasties; int m_iNumToasties;
int m_iNumTapsAndHolds; int m_iTotalTapsAndHolds;
int m_iNumJumps; int m_iTotalJumps;
int m_iNumHolds; int m_iTotalHolds;
int m_iNumMines; int m_iTotalMines;
int m_iNumHands; int m_iTotalHands;
set<int> m_UnlockedSongs; set<int> 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 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]; int m_iNumSongsPlayedByPlayMode[NUM_PLAY_MODES];
stepmania/src/ProfileHtml.cpp
+5 -5
View File
@@ -279,11 +279,11 @@ void PrintStatistics( RageFile &f, const Profile *pProfile, CString sTitle, vect
TABLE_LINE2( "CurrentCombo", pProfile->m_iCurrentCombo ); TABLE_LINE2( "CurrentCombo", pProfile->m_iCurrentCombo );
TABLE_LINE2( "CaloriesBurned", pProfile->GetDisplayCaloriesBurned() ); TABLE_LINE2( "CaloriesBurned", pProfile->GetDisplayCaloriesBurned() );
TABLE_LINE2( "LastMachinePlayed", pProfile->m_sLastMachinePlayed ); TABLE_LINE2( "LastMachinePlayed", pProfile->m_sLastMachinePlayed );
TABLE_LINE2( "NumTapsAndHolds", pProfile->m_iNumTapsAndHolds ); TABLE_LINE2( "TotalTapsAndHolds", pProfile->m_iTotalTapsAndHolds );
TABLE_LINE2( "NumJumps", pProfile->m_iNumJumps ); TABLE_LINE2( "TotalJumps", pProfile->m_iTotalJumps );
TABLE_LINE2( "NumHolds", pProfile->m_iNumHolds ); TABLE_LINE2( "TotalHolds", pProfile->m_iTotalHolds );
TABLE_LINE2( "NumMines", pProfile->m_iNumMines ); TABLE_LINE2( "TotalMines", pProfile->m_iTotalMines );
TABLE_LINE2( "NumHands", pProfile->m_iNumHands ); TABLE_LINE2( "TotalHands", pProfile->m_iTotalHands );
END_TABLE; END_TABLE;
} }
PRINT_CLOSE(f); PRINT_CLOSE(f);