From 0d5f75e736e3f2192a6776e6edff6e2ba2de8cc1 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 20:30:19 +0000 Subject: [PATCH] const --- stepmania/src/ScreenOptions.cpp | 6 +++--- stepmania/src/ScreenOptions.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index af1084492d..baf4adf679 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -360,7 +360,7 @@ ScreenOptions::~ScreenOptions() CString ScreenOptions::GetExplanationText( int iRow ) const { - OptionRow &row = *m_pRows[iRow]; + const OptionRow &row = *m_pRows[iRow]; bool bAllowExplanation = row.GetRowDef().m_bAllowExplanation; bool bShowExplanations = bAllowExplanation && SHOW_EXPLANATIONS.GetValue(); @@ -375,10 +375,10 @@ CString ScreenOptions::GetExplanationText( int iRow ) const return OPTION_EXPLANATION(sExplanationName); } -void ScreenOptions::GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ) +void ScreenOptions::GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ) const { ASSERT_M( iRow < (int)m_pRows.size(), ssprintf("%i < %i", iRow, (int)m_pRows.size() ) ); - OptionRow &row = *m_pRows[iRow]; + const OptionRow &row = *m_pRows[iRow]; row.GetWidthXY( pn, iChoiceOnRow, iWidthOut, iXOut, iYOut ); } diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index ccf9572edc..11948de66a 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -47,7 +47,7 @@ protected: virtual void ImportOptions( int iRow, const vector &vpns ) = 0; virtual void ExportOptions( int iRow, const vector &vpns ) = 0; - void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ); + void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ) const; CString GetExplanationText( int iRow ) const; void PositionUnderlines( int iRow, PlayerNumber pn ); void PositionAllUnderlines();