diff --git a/stepmania/src/PlayerStageStats.h b/stepmania/src/PlayerStageStats.h index 773868cefa..5f402a9e74 100644 --- a/stepmania/src/PlayerStageStats.h +++ b/stepmania/src/PlayerStageStats.h @@ -28,16 +28,16 @@ public: vector vpPlayedSteps; vector vpPossibleSteps; - float fAliveSeconds; // how far into the music did they last before failing? Updated by Gameplay, scaled by music rate. + float fAliveSeconds; // how far into the music did they last before failing? Updated by Gameplay, scaled by music rate. /* Set if the player actually failed at any point during the song. This is always * false in FAIL_OFF. If recovery is enabled and two players are playing, * this is only set if both players were failing at the same time. */ - bool bFailed; + bool bFailed; /* This indicates whether the player bottomed out his bar/ran out of lives at some * point during the song. It's set in all fail modes. */ - bool bFailedEarlier; + bool bFailedEarlier; int iPossibleDancePoints; int iCurPossibleDancePoints; int iActualDancePoints; @@ -52,20 +52,20 @@ public: int iMaxScore; int iBonus; // bonus to be added on screeneval RadarValues radarPossible; // filled in by ScreenGameplay on start of notes - RadarValues radarActual; + RadarValues radarActual; /* The number of songs played and passed, respectively. */ int iSongsPassed; int iSongsPlayed; int iTotalError; - float fLifeRemainingSeconds; // used in survival + float fLifeRemainingSeconds; // used in survival // workout - float fCaloriesBurned; + float fCaloriesBurned; - TapNoteScore tnsLast; - HoldNoteScore hnsLast; + TapNoteScore tnsLast; + HoldNoteScore hnsLast; - map fLifeRecord; + map fLifeRecord; void SetLifeRecordAt( float fLife, float fStepsSecond ); void GetLifeRecord( float *fLifeOut, int iNumSamples, float fStepsEndSecond ) const; float GetLifeRecordAt( float fStepsSecond ) const; @@ -91,15 +91,15 @@ public: bool IsZero() const { return fStartSecond < 0; } }; vector ComboList; - float fFirstSecond; - float fLastSecond; + float fFirstSecond; + float fLastSecond; - int GetComboAtStartOfStage() const; + int GetComboAtStartOfStage() const; bool FullComboOfScore( TapNoteScore tnsAllGreaterOrEqual ) const; bool FullCombo() const { return FullComboOfScore(TNS_W3); } bool SingleDigitsOfScore( TapNoteScore tnsAllGreaterOrEqual ) const; bool OneOfScore( TapNoteScore tnsAllGreaterOrEqual ) const; - int GetTotalTaps() const; + int GetTotalTaps() const; float GetPercentageOfTaps( TapNoteScore tns ) const; void UpdateComboList( float fSecond, bool rollover ); Combo_t GetMaxCombo() const; @@ -111,10 +111,10 @@ public: PerDifficultyAward m_pdaToShow; PeakComboAward m_pcaToShow; - int m_iPersonalHighScoreIndex; - int m_iMachineHighScoreIndex; - RankingCategory m_rc; - HighScore m_HighScore; + int m_iPersonalHighScoreIndex; + int m_iMachineHighScoreIndex; + RankingCategory m_rc; + HighScore m_HighScore; // Lua void PushSelf( lua_State *L ); diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index 5f51a5bdeb..07bd3f107d 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -152,11 +152,11 @@ void StatsManager::CommitStatsToProfiles() FOREACH_HumanPlayer( pn ) { int iNumTapsAndHolds = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_TapsAndHolds]; - int iNumJumps = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Jumps]; - int iNumHolds = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Holds]; - int iNumRolls = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Rolls]; - int iNumMines = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Mines]; - int iNumHands = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Hands]; + int iNumJumps = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Jumps]; + int iNumHolds = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Holds]; + int iNumRolls = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Rolls]; + int iNumMines = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Mines]; + int iNumHands = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Hands]; float fCaloriesBurned = m_CurStageStats.m_player[pn].fCaloriesBurned; PROFILEMAN->AddStepTotals( pn, iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned ); }