From 7cacbe59f7ab6e0a6f78bed18ff8dd954ebb8be8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 30 Aug 2002 06:18:30 +0000 Subject: [PATCH] Update underline after updating refresh rate. Put the default refresh back to "default"; some systems apparently think they have refresh rates that they don't. Make refresh "0" and max "1", so people with existing INI files keep "default". --- stepmania/src/PrefsManager.cpp | 3 ++- stepmania/src/RageDisplay.h | 2 +- stepmania/src/ScreenGraphicOptions.cpp | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index e6ff10898f..d8745d4dcc 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -15,6 +15,7 @@ #include "GameManager.h" #include "GameState.h" #include "RageException.h" +#include "RageDisplay.h" PrefsManager* PREFSMAN = NULL; // global and accessable from anywhere in our program @@ -29,7 +30,7 @@ PrefsManager::PrefsManager() #endif m_iDisplayResolution = 640; m_iTextureResolution = 1024; - m_iRefreshRate = 0; + m_iRefreshRate = RageDisplay::REFRESH_DEFAULT; m_bIgnoreJoyAxes = false; m_bOnlyDedicatedMenuButtons = false; #ifdef _DEBUG diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h index 60b035dd26..eaa136dcf3 100644 --- a/stepmania/src/RageDisplay.h +++ b/stepmania/src/RageDisplay.h @@ -49,7 +49,7 @@ class RageDisplay public: RageDisplay( HWND hWnd ); ~RageDisplay(); - enum { REFRESH_MAX=0, REFRESH_DEFAULT=1 }; + enum { REFRESH_DEFAULT=0, REFRESH_MAX=1 }; bool SwitchDisplayMode( const bool bWindowed, const int iWidth, const int iHeight, const int iBPP, const int iFullScreenHz ); diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index 8fd7ccb1f4..b05185f7fc 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -39,7 +39,7 @@ OptionLineData g_GraphicOptionsLines[NUM_GRAPHIC_OPTIONS_LINES] = { { "Display", 2, {"FULLSCREEN", "WINDOWED"} }, { "Display Res", 7, {"320","400","512","640","800","1024","1280"} }, { "Texture Res", 3, {"256","512","1024"} }, - { "Refresh Rate", 11, {"MAX","DEFAULT","60","70","72","75","80","85","90","100","120"} }, + { "Refresh Rate", 11, {"DEFAULT","MAX","60","70","72","75","80","85","90","100","120"} }, { "Show Stats", 2, {"OFF","ON"} }, { "BG Mode", 4, {"OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES"} }, { "BG Brightness", 11, {"0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%"} }, @@ -112,12 +112,12 @@ void ScreenGraphicOptions::UpdateRefreshRates() break; } } - /* If current refresh is no longer valid, set it to max. */ + /* If current refresh is no longer valid, set it to default. */ int CurSel = m_iSelectedOption[0][GO_REFRESH_RATE]; if(m_OptionDim[GO_REFRESH_RATE][CurSel]) m_iSelectedOption[0][GO_REFRESH_RATE] = - m_iSelectedOption[1][GO_REFRESH_RATE] = RageDisplay::REFRESH_MAX; -// PositionUnderlines(); + m_iSelectedOption[1][GO_REFRESH_RATE] = RageDisplay::REFRESH_DEFAULT; + PositionUnderlines(); } void ScreenGraphicOptions::OnChange() @@ -152,8 +152,8 @@ void ScreenGraphicOptions::ImportOptions() switch( PREFSMAN->m_iRefreshRate ) { - case RageDisplay::REFRESH_MAX: m_iSelectedOption[0][GO_REFRESH_RATE] = 0; break; - case RageDisplay::REFRESH_DEFAULT: m_iSelectedOption[0][GO_REFRESH_RATE] = 1; break; + case RageDisplay::REFRESH_DEFAULT: m_iSelectedOption[0][GO_REFRESH_RATE] = 0; break; + case RageDisplay::REFRESH_MAX: m_iSelectedOption[0][GO_REFRESH_RATE] = 1; break; case 60: m_iSelectedOption[0][GO_REFRESH_RATE] = 2; break; case 70: m_iSelectedOption[0][GO_REFRESH_RATE] = 3; break; case 72: m_iSelectedOption[0][GO_REFRESH_RATE] = 4; break; @@ -194,8 +194,8 @@ void ScreenGraphicOptions::ExportOptions() switch( m_iSelectedOption[0][GO_REFRESH_RATE] ) { - case 0: PREFSMAN->m_iRefreshRate = RageDisplay::REFRESH_MAX; break; - case 1: PREFSMAN->m_iRefreshRate = RageDisplay::REFRESH_DEFAULT;break; + case 0: PREFSMAN->m_iRefreshRate = RageDisplay::REFRESH_DEFAULT;break; + case 1: PREFSMAN->m_iRefreshRate = RageDisplay::REFRESH_MAX; break; case 2: PREFSMAN->m_iRefreshRate = 60; break; case 3: PREFSMAN->m_iRefreshRate = 70; break; case 4: PREFSMAN->m_iRefreshRate = 72; break;