From c35710ffbbd0c0a287407ffd3f403cce8afcf8e8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 10 Sep 2002 23:42:41 +0000 Subject: [PATCH] Change "options explanation" to "option explanation", to be consistent with "option XXX" for option screen data. Add cast to get rid of a warning that I forgot to commit a while back. --- stepmania/src/ScreenOptions.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 02181e5af7..fff11b42ab 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -140,7 +140,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRowData[], int iNumO m_framePage.AddChild( &m_textOptions[i][0] ); // add explanation here so it appears on top - m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","options explanation") ); + m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","option explanation") ); m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y ); m_textExplanation.SetZoom( EXPLANATION_ZOOM ); m_textExplanation.SetShadowLength( 2 ); @@ -167,9 +167,9 @@ void ScreenOptions::GetWidthXY( PlayerNumber pn, int iRow, int &iWidthOut, int & int iOptionInRow = m_iSelectedOption[pn][iRow]; BitmapText &option = m_textOptions[iRow][iOptionInRow]; - iWidthOut = roundf( option.GetWidestLineWidthInSourcePixels() * option.GetZoomX() ); - iXOut = roundf( option.GetX() ); - iYOut = roundf( option.GetY() ); + iWidthOut = int(roundf( option.GetWidestLineWidthInSourcePixels() * option.GetZoomX() )); + iXOut = int(roundf( option.GetX() )); + iYOut = int(roundf( option.GetY() )); } void ScreenOptions::InitOptionsText()