diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 70836c776f..333153bc58 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -159,7 +159,6 @@ PrefsManager::PrefsManager() : m_iMovieColorDepth ( "MovieColorDepth", 16 ), m_iMaxTextureResolution ( "MaxTextureResolution", 2048 ), m_iRefreshRate ( "RefreshRate", REFRESH_DEFAULT ), - m_fDisplayAspectRatio ( "DisplayAspectRatio", ASPECT_AUTO ), m_bAllowMultitexture ( "AllowMultitexture", true ), m_bShowStats ( "ShowStats", TRUE_IF_DEBUG), m_bShowBanners ( "ShowBanners", true ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 26d039c2e0..c3ddfb876d 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -9,7 +9,6 @@ class IniFile; const int MAX_SONGS_PER_PLAY = 7; -#define ASPECT_AUTO -1 class PrefsManager { @@ -49,7 +48,6 @@ public: Preference m_iMovieColorDepth; Preference m_iMaxTextureResolution; Preference m_iRefreshRate; - Preference m_fDisplayAspectRatio; // -1 == auto Preference m_bAllowMultitexture; Preference m_bShowStats; Preference m_bShowBanners; diff --git a/stepmania/src/ScreenDimensions.cpp b/stepmania/src/ScreenDimensions.cpp index 57354fc96e..8028c25457 100644 --- a/stepmania/src/ScreenDimensions.cpp +++ b/stepmania/src/ScreenDimensions.cpp @@ -1,6 +1,7 @@ #include "global.h" #include "ScreenDimensions.h" #include "PrefsManager.h" +#include "Preference.h" #include "LuaManager.h" #include "LuaFunctions.h" #include "ThemeManager.h" @@ -25,9 +26,12 @@ static ThemeMetric THEME_SCREEN_HEIGHT("Common","ScreenHeight"); */ #define THEME_NATIVE_ASPECT (THEME_SCREEN_WIDTH/THEME_SCREEN_HEIGHT) +#define ASPECT_AUTO -1 +static Preference g_fDisplayAspectRatio( "DisplayAspectRatio", ASPECT_AUTO ); + float ScreenDimensions::GetScreenAspectRatio() { - float fAspect = PREFSMAN->m_fDisplayAspectRatio; + float fAspect = g_fDisplayAspectRatio; if( fAspect == ASPECT_AUTO ) { /* Most PC monitor resolutions have square pixels (PAR 1:1), so the DAR