From 473a9855124d974476a649b509cfefeac57abb9a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Jan 2006 05:24:42 +0000 Subject: [PATCH] const --- stepmania/src/OptionRow.cpp | 8 ++++---- stepmania/src/Trail.cpp | 2 +- stepmania/src/Trail.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 60f3c5871d..6cb83f9018 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -198,7 +198,7 @@ CString OptionRow::GetRowTitle() const if( GAMESTATE->m_pCurCourse ) { - Trail* pTrail = GAMESTATE->m_pCurTrail[GAMESTATE->m_MasterPlayerNumber]; + const Trail* pTrail = GAMESTATE->m_pCurTrail[GAMESTATE->m_MasterPlayerNumber]; ASSERT( pTrail != NULL ); const int iNumCourseEntries = pTrail->m_vEntries.size(); if( iNumCourseEntries > CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS ) @@ -210,14 +210,14 @@ CString OptionRow::GetRowTitle() const DisplayBpms bpms; if( GAMESTATE->m_pCurSong ) { - Song* pSong = GAMESTATE->m_pCurSong; + const Song* pSong = GAMESTATE->m_pCurSong; pSong->GetDisplayBpms( bpms ); } else if( GAMESTATE->m_pCurCourse ) { - Course *pCourse = GAMESTATE->m_pCurCourse; + const Course *pCourse = GAMESTATE->m_pCurCourse; StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; - Trail* pTrail = pCourse->GetTrail( st ); + const Trail* pTrail = pCourse->GetTrail( st ); ASSERT( pTrail ); pTrail->GetDisplayBpms( bpms ); } diff --git a/stepmania/src/Trail.cpp b/stepmania/src/Trail.cpp index 3d89ec20e2..9b279d1614 100644 --- a/stepmania/src/Trail.cpp +++ b/stepmania/src/Trail.cpp @@ -134,7 +134,7 @@ float Trail::GetLengthSeconds() const return fSecs; } -void Trail::GetDisplayBpms( DisplayBpms &AddTo ) +void Trail::GetDisplayBpms( DisplayBpms &AddTo ) const { FOREACH_CONST( TrailEntry, m_vEntries, e ) { diff --git a/stepmania/src/Trail.h b/stepmania/src/Trail.h index b6cbe30669..d7561fafdd 100644 --- a/stepmania/src/Trail.h +++ b/stepmania/src/Trail.h @@ -68,7 +68,7 @@ public: int GetMeter() const; int GetTotalMeter() const; float GetLengthSeconds() const; - void GetDisplayBpms( DisplayBpms &AddTo ); + void GetDisplayBpms( DisplayBpms &AddTo ) const; bool IsSecret() const; bool ContainsSong( Song* pSong ) const;