From 643d264ce03b5c6843062d4938a54b857768d359 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 12 Aug 2005 03:14:50 +0000 Subject: [PATCH] cleanup, de-interleace accessors --- stepmania/src/HighScore.cpp | 27 ++++++++++++++------------- stepmania/src/HighScore.h | 35 ++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/stepmania/src/HighScore.cpp b/stepmania/src/HighScore.cpp index 48e9be7dbf..0fab71d1cd 100644 --- a/stepmania/src/HighScore.cpp +++ b/stepmania/src/HighScore.cpp @@ -154,33 +154,34 @@ void HighScore::Unset() } CString HighScore::GetName() const { return m_Impl->sName; } -void HighScore::SetName( const CString &sName ) { m_Impl->sName = sName; } Grade HighScore::GetGrade() const { return m_Impl->grade; } -void HighScore::SetGrade( Grade g ) { m_Impl->grade = g; } int HighScore::GetScore() const { return m_Impl->iScore; } -void HighScore::SetScore( int iScore ) { m_Impl->iScore = iScore; } float HighScore::GetPercentDP() const { return m_Impl->fPercentDP; } -void HighScore::SetPercentDP( float f ) { m_Impl->fPercentDP = f; } float HighScore::GetSurviveSeconds() const { return m_Impl->fSurviveSeconds; } -void HighScore::SetSurviveSeconds( float f ) { m_Impl->fSurviveSeconds = f; } float HighScore::GetSurvivalSeconds() const { return GetSurviveSeconds() + GetLifeRemainingSeconds(); } CString HighScore::GetModifiers() const { return m_Impl->sModifiers; } -void HighScore::SetModifiers( CString s ) { m_Impl->sModifiers = s; } DateTime HighScore::GetDateTime() const { return m_Impl->dateTime; } -void HighScore::SetDateTime( DateTime d ) { m_Impl->dateTime = d; } CString HighScore::GetPlayerGuid() const { return m_Impl->sPlayerGuid; } -void HighScore::SetPlayerGuid( CString s ) { m_Impl->sPlayerGuid = s; } CString HighScore::GetMachineGuid() const { return m_Impl->sMachineGuid; } -void HighScore::SetMachineGuid( CString s ) { m_Impl->sMachineGuid = s; } int HighScore::GetProductID() const { return m_Impl->iProductID; } -void HighScore::SetProductID( int i ) { m_Impl->iProductID = i; } int HighScore::GetTapNoteScore( TapNoteScore tns ) const { return m_Impl->iTapNoteScores[tns]; } -void HighScore::SetTapNoteScore( TapNoteScore tns, int i ) { m_Impl->iTapNoteScores[tns] = i; } int HighScore::GetHoldNoteScore( HoldNoteScore hns ) const { return m_Impl->iHoldNoteScores[hns]; } -void HighScore::SetHoldNoteScore( HoldNoteScore hns, int i ) { m_Impl->iHoldNoteScores[hns] = i; } const RadarValues &HighScore::GetRadarValues() const { return m_Impl->radarValues; } -void HighScore::SetRadarValues( const RadarValues &rv ) { m_Impl->radarValues = rv; } float HighScore::GetLifeRemainingSeconds() const { return m_Impl->fLifeRemainingSeconds; } + +void HighScore::SetName( const CString &sName ) { m_Impl->sName = sName; } +void HighScore::SetGrade( Grade g ) { m_Impl->grade = g; } +void HighScore::SetScore( int iScore ) { m_Impl->iScore = iScore; } +void HighScore::SetPercentDP( float f ) { m_Impl->fPercentDP = f; } +void HighScore::SetSurviveSeconds( float f ) { m_Impl->fSurviveSeconds = f; } +void HighScore::SetModifiers( CString s ) { m_Impl->sModifiers = s; } +void HighScore::SetDateTime( DateTime d ) { m_Impl->dateTime = d; } +void HighScore::SetPlayerGuid( CString s ) { m_Impl->sPlayerGuid = s; } +void HighScore::SetMachineGuid( CString s ) { m_Impl->sMachineGuid = s; } +void HighScore::SetProductID( int i ) { m_Impl->iProductID = i; } +void HighScore::SetTapNoteScore( TapNoteScore tns, int i ) { m_Impl->iTapNoteScores[tns] = i; } +void HighScore::SetHoldNoteScore( HoldNoteScore hns, int i ) { m_Impl->iHoldNoteScores[hns] = i; } +void HighScore::SetRadarValues( const RadarValues &rv ) { m_Impl->radarValues = rv; } void HighScore::SetLifeRemainingSeconds( float f ) { m_Impl->fLifeRemainingSeconds = f; } /* We normally don't give direct access to the members. We need this one diff --git a/stepmania/src/HighScore.h b/stepmania/src/HighScore.h index 97eaf8a3d5..9231219efb 100644 --- a/stepmania/src/HighScore.h +++ b/stepmania/src/HighScore.h @@ -14,40 +14,41 @@ struct XNode; struct HighScoreImpl; struct HighScore { - CString GetName() const; - void SetName( const CString &sName ); - CString *GetNameMutable(); - const CString *GetNameMutable() const { return const_cast (const_cast(this)->GetNameMutable()); } + HighScore(); + CString GetName() const; Grade GetGrade() const; - void SetGrade( Grade g ); int GetScore() const; - void SetScore( int iScore ); float GetPercentDP() const; - void SetPercentDP( float f ); float GetSurviveSeconds() const; - void SetSurviveSeconds( float f ); float GetSurvivalSeconds() const; CString GetModifiers() const; - void SetModifiers( CString s ); DateTime GetDateTime() const; - void SetDateTime( DateTime d ); CString GetPlayerGuid() const; - void SetPlayerGuid( CString s ); CString GetMachineGuid() const; - void SetMachineGuid( CString s ); int GetProductID() const; - void SetProductID( int i ); int GetTapNoteScore( TapNoteScore tns ) const; - void SetTapNoteScore( TapNoteScore tns, int i ); int GetHoldNoteScore( HoldNoteScore tns ) const; - void SetHoldNoteScore( HoldNoteScore tns, int i ); const RadarValues &GetRadarValues() const; - void SetRadarValues( const RadarValues &rv ); float GetLifeRemainingSeconds() const; + + void SetName( const CString &sName ); + void SetGrade( Grade g ); + void SetScore( int iScore ); + void SetPercentDP( float f ); + void SetSurviveSeconds( float f ); + void SetModifiers( CString s ); + void SetDateTime( DateTime d ); + void SetPlayerGuid( CString s ); + void SetMachineGuid( CString s ); + void SetProductID( int i ); + void SetTapNoteScore( TapNoteScore tns, int i ); + void SetHoldNoteScore( HoldNoteScore tns, int i ); + void SetRadarValues( const RadarValues &rv ); void SetLifeRemainingSeconds( float f ); - HighScore(); + CString *GetNameMutable(); + const CString *GetNameMutable() const { return const_cast (const_cast(this)->GetNameMutable()); } void Unset();