diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 3797b84004..8c2d853385 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -94,6 +94,7 @@ void Profile::InitGeneralData() m_iTotalTapsAndHolds = 0; m_iTotalJumps = 0; m_iTotalHolds = 0; + m_iTotalRolls = 0; m_iTotalMines = 0; m_iTotalHands = 0; @@ -889,6 +890,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const pGeneralDataNode->AppendChild( "TotalTapsAndHolds", m_iTotalTapsAndHolds ); pGeneralDataNode->AppendChild( "TotalJumps", m_iTotalJumps ); pGeneralDataNode->AppendChild( "TotalHolds", m_iTotalHolds ); + pGeneralDataNode->AppendChild( "TotalRolls", m_iTotalRolls ); pGeneralDataNode->AppendChild( "TotalMines", m_iTotalMines ); pGeneralDataNode->AppendChild( "TotalHands", m_iTotalHands ); pGeneralDataNode->AppendChild( "Data", m_SavedLuaData.Serialize() ); @@ -1048,6 +1050,7 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) pNode->GetChildValue( "TotalTapsAndHolds", m_iTotalTapsAndHolds ); pNode->GetChildValue( "TotalJumps", m_iTotalJumps ); pNode->GetChildValue( "TotalHolds", m_iTotalHolds ); + pNode->GetChildValue( "TotalRolls", m_iTotalRolls ); pNode->GetChildValue( "TotalMines", m_iTotalMines ); pNode->GetChildValue( "TotalHands", m_iTotalHands ); @@ -1149,11 +1152,12 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) } -void Profile::AddStepTotals( int iTotalTapsAndHolds, int iTotalJumps, int iTotalHolds, int iTotalMines, int iTotalHands, float fCaloriesBurned ) +void Profile::AddStepTotals( int iTotalTapsAndHolds, int iTotalJumps, int iTotalHolds, int iTotalRolls, int iTotalMines, int iTotalHands, float fCaloriesBurned ) { m_iTotalTapsAndHolds += iTotalTapsAndHolds; m_iTotalJumps += iTotalJumps; m_iTotalHolds += iTotalHolds; + m_iTotalRolls += iTotalRolls; m_iTotalMines += iTotalMines; m_iTotalHands += iTotalHands; m_fTotalCaloriesBurned += fCaloriesBurned; diff --git a/stepmania/src/Profile.h b/stepmania/src/Profile.h index 3bed69781f..b5694e3019 100644 --- a/stepmania/src/Profile.h +++ b/stepmania/src/Profile.h @@ -83,7 +83,7 @@ public: void SetDefaultModifiers( const Game* pGameType, const CString &sModifiers ); bool IsCodeUnlocked( int iCode ) const; - void AddStepTotals( int iNumTapsAndHolds, int iNumJumps, int iNumHolds, int iNumMines, int iNumHands, float fCaloriesBurned ); + void AddStepTotals( int iNumTapsAndHolds, int iNumJumps, int iNumHolds, int iNumRolls, int iNumMines, int iNumHands, float fCaloriesBurned ); bool IsMachine() const; @@ -121,6 +121,7 @@ public: int m_iTotalTapsAndHolds; int m_iTotalJumps; int m_iTotalHolds; + int m_iTotalRolls; int m_iTotalMines; int m_iTotalHands; set m_UnlockedSongs; diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp index 17d71d4ae8..0e0d08e5b0 100644 --- a/stepmania/src/ProfileManager.cpp +++ b/stepmania/src/ProfileManager.cpp @@ -445,11 +445,11 @@ void ProfileManager::IncrementToastiesCount( PlayerNumber pn ) ++PROFILEMAN->GetMachineProfile()->m_iNumToasties; } -void ProfileManager::AddStepTotals( PlayerNumber pn, int iNumTapsAndHolds, int iNumJumps, int iNumHolds, int iNumMines, int iNumHands, float fCaloriesBurned ) +void ProfileManager::AddStepTotals( PlayerNumber pn, int iNumTapsAndHolds, int iNumJumps, int iNumHolds, int iNumRolls, int iNumMines, int iNumHands, float fCaloriesBurned ) { if( PROFILEMAN->IsUsingProfile(pn) ) - PROFILEMAN->GetProfile(pn)->AddStepTotals( iNumTapsAndHolds, iNumJumps, iNumHolds, iNumMines, iNumHands, fCaloriesBurned ); - PROFILEMAN->GetMachineProfile()->AddStepTotals( iNumTapsAndHolds, iNumJumps, iNumHolds, iNumMines, iNumHands, fCaloriesBurned ); + PROFILEMAN->GetProfile(pn)->AddStepTotals( iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned ); + PROFILEMAN->GetMachineProfile()->AddStepTotals( iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned ); } // diff --git a/stepmania/src/ProfileManager.h b/stepmania/src/ProfileManager.h index c646a46571..c63cc0bd00 100644 --- a/stepmania/src/ProfileManager.h +++ b/stepmania/src/ProfileManager.h @@ -38,7 +38,7 @@ public: // General data // void IncrementToastiesCount( PlayerNumber pn ); - void AddStepTotals( PlayerNumber pn, int iNumTapsAndHolds, int iNumJumps, int iNumHolds, int iNumMines, int iNumHands, float fCaloriesBurned ); + void AddStepTotals( PlayerNumber pn, int iNumTapsAndHolds, int iNumJumps, int iNumHolds, int iNumRolls, int iNumMines, int iNumHands, float fCaloriesBurned ); // diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index 2a74e68960..0d420f75a5 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -135,10 +135,11 @@ void StatsManager::CommitStatsToProfiles() int iNumTapsAndHolds = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_TAPS_AND_HOLDS]; int iNumJumps = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_JUMPS]; int iNumHolds = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_HOLDS]; + int iNumRolls = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_ROLLS]; int iNumMines = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_MINES]; int iNumHands = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_HANDS]; float fCaloriesBurned = m_CurStageStats.m_player[pn].fCaloriesBurned; - PROFILEMAN->AddStepTotals( pn, iNumTapsAndHolds, iNumJumps, iNumHolds, iNumMines, iNumHands, fCaloriesBurned ); + PROFILEMAN->AddStepTotals( pn, iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned ); } // Update profile stats