diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index f75d8e0f13..8b52673de3 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -74,7 +74,7 @@ PrefsManager::PrefsManager() : m_iMovieColorDepth ( Options, "MovieColorDepth", 16 ), m_iMaxTextureResolution ( Options, "MaxTextureResolution", 2048 ), m_iRefreshRate ( Options, "RefreshRate", REFRESH_DEFAULT ), - m_fAspectRatio ( Options, "AspectRatio", 4/3.0f ), + m_fDisplayAspectRatio ( Options, "DisplayAspectRatio", 4/3.0f ), m_bShowStats ( Options, "ShowStats", #ifdef DEBUG true diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 209546d297..4e30bc93c7 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -27,7 +27,7 @@ public: Preference m_iMovieColorDepth; Preference m_iMaxTextureResolution; Preference m_iRefreshRate; - Preference m_fAspectRatio; + Preference m_fDisplayAspectRatio; Preference m_bShowStats; Preference m_bShowBanners; diff --git a/stepmania/src/ScreenDimensions.cpp b/stepmania/src/ScreenDimensions.cpp index 2ea4b0c756..c3d7d6a9ff 100644 --- a/stepmania/src/ScreenDimensions.cpp +++ b/stepmania/src/ScreenDimensions.cpp @@ -23,8 +23,8 @@ ThemeMetric THEME_SCREEN_HEIGHT("Common","ScreenHeight"); float ScreenWidth() { float fScale = 1; - if( PREFSMAN->m_fAspectRatio > ASPECT_4_TO_3 ) - fScale = PREFSMAN->m_fAspectRatio / ASPECT_4_TO_3; + if( PREFSMAN->m_fDisplayAspectRatio > ASPECT_4_TO_3 ) + fScale = PREFSMAN->m_fDisplayAspectRatio / ASPECT_4_TO_3; ASSERT( fScale >= 1 ); return THEME_SCREEN_WIDTH * fScale; } @@ -32,8 +32,8 @@ float ScreenWidth() float ScreenHeight() { float fScale = 1; - if( PREFSMAN->m_fAspectRatio < ASPECT_4_TO_3 ) - fScale = ASPECT_4_TO_3 / PREFSMAN->m_fAspectRatio; + if( PREFSMAN->m_fDisplayAspectRatio < ASPECT_4_TO_3 ) + fScale = ASPECT_4_TO_3 / PREFSMAN->m_fDisplayAspectRatio; ASSERT( fScale >= 1 ); return THEME_SCREEN_HEIGHT * fScale; } diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 3445380aa3..168a5542d4 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -447,7 +447,7 @@ static void RefreshRate( int &sel, bool ToSel, const ConfOption *pConfOption ) static void AspectRatio( int &sel, bool ToSel, const ConfOption *pConfOption ) { const float mapping[] = { 3/4.f,1,4/3.0f,16/10.0f,16/9.f, 8/3.f }; - MoveMap( sel, PREFSMAN->m_fAspectRatio.Value(), ToSel, mapping, ARRAYSIZE(mapping) ); + MoveMap( sel, PREFSMAN->m_fDisplayAspectRatio.Value(), ToSel, mapping, ARRAYSIZE(mapping) ); } /* Sound options */ diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 10c1941516..18115d34c4 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -93,7 +93,7 @@ static RageDisplay::VideoModeParams GetCurVideoModeParams() WINDOW_TITLE, THEME->GetPathToG("Common window icon"), PREFSMAN->m_bPAL, - PREFSMAN->m_fAspectRatio + PREFSMAN->m_fDisplayAspectRatio ); }