diff --git a/stepmania/src/smpackage/ChangeGameSettings.cpp b/stepmania/src/smpackage/ChangeGameSettings.cpp index ce4fac7842..f9918018d9 100644 --- a/stepmania/src/smpackage/ChangeGameSettings.cpp +++ b/stepmania/src/smpackage/ChangeGameSettings.cpp @@ -90,19 +90,21 @@ BOOL ChangeGameSettings::OnInitDialog() else CheckDlgButton( IDC_RADIO_SOUND_DEFAULT, BST_CHECKED ); - - bool bValue; - - - bValue = false; - ini.GetValue( "Options", "LogToDisk", bValue ); - CheckDlgButton( IDC_CHECK_LOG_TO_DISK, bValue ? BST_CHECKED : BST_UNCHECKED ); - - - bValue = false; - ini.GetValue( "Options", "ShowLogOutput", bValue ); - CheckDlgButton( IDC_CHECK_SHOW_LOG_WINDOW, bValue ? BST_CHECKED : BST_UNCHECKED ); - + { + int iValue = 0; + ini.GetValue( "Options", "RefreshRate", iValue ); + CheckDlgButton( IDC_CHECK_FORCE_60HZ, iValue == 60 ? BST_CHECKED : BST_UNCHECKED ); + } + { + bool bValue = false; + ini.GetValue( "Options", "LogToDisk", bValue ); + CheckDlgButton( IDC_CHECK_LOG_TO_DISK, bValue ? BST_CHECKED : BST_UNCHECKED ); + } + { + bool bValue = false; + ini.GetValue( "Options", "ShowLogOutput", bValue ); + CheckDlgButton( IDC_CHECK_SHOW_LOG_WINDOW, bValue ? BST_CHECKED : BST_UNCHECKED ); + } return TRUE; // return TRUE unless you set the focus to a control // EXCEPTION: OCX Property Pages should return FALSE @@ -136,6 +138,17 @@ void ChangeGameSettings::OnOK() ini.SetValue( "Options", "SoundDrivers", RString() ); + if( BST_CHECKED == IsDlgButtonChecked(IDC_CHECK_FORCE_60HZ) ) + { + ini.SetValue( "Options", "RefreshRate", 60 ); + } + else + { + int iRefresh = 0; + ini.GetValue( "Options", "RefreshRate", iRefresh ); + if( iRefresh == 60 ) + ini.SetValue( "Options", "RefreshRate", 0 ); + } ini.SetValue( "Options", "LogToDisk", BST_CHECKED == IsDlgButtonChecked(IDC_CHECK_LOG_TO_DISK) ); ini.SetValue( "Options", "ShowLogOutput", BST_CHECKED == IsDlgButtonChecked(IDC_CHECK_SHOW_LOG_WINDOW) ); diff --git a/stepmania/src/smpackage/resource.h b/stepmania/src/smpackage/resource.h index 5a4c3bcd36..585f628d15 100644 --- a/stepmania/src/smpackage/resource.h +++ b/stepmania/src/smpackage/resource.h @@ -17,7 +17,6 @@ #define IDD_LANGUAGES 150 #define IDD_CREATE_LANGUAGE 151 #define IDB_BITMAP1 153 -#define IDB_BITMAP2 154 #define IDC_LIST_SONGS 1000 #define IDC_LIST 1000 #define IDC_BUTTON_PLAY 1001 @@ -83,6 +82,8 @@ #define IDC_RADIO_SOUND_WAVEOUT 1057 #define IDC_BUTTON_CREATE 1057 #define IDC_LIST_LANGUAGES 1058 +#define IDC_CHECK_SHOW_LOG_WINDOW2 1058 +#define IDC_CHECK_FORCE_60HZ 1058 #define IDC_STATIC_TOTAL_STRINGS 1060 #define IDC_STATIC_NEED_TRANSLATION 1061 #define IDC_COMBO_LANGUAGES 1065 diff --git a/stepmania/src/smpackage/smpackage.rc b/stepmania/src/smpackage/smpackage.rc index 9640018587..5cb092f3ba 100644 --- a/stepmania/src/smpackage/smpackage.rc +++ b/stepmania/src/smpackage/smpackage.rc @@ -239,13 +239,13 @@ BEGIN CTEXT "Delete old packages?",IDC_STATIC,55,119,166,12 END -IDD_CHANGE_GAME_SETTINGS DIALOGEX 0, 0, 162, 287 +IDD_CHANGE_GAME_SETTINGS DIALOGEX 0, 0, 162, 298 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Change Game Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK",IDOK,49,265,50,14 - PUSHBUTTON "Cancel",IDCANCEL,104,265,50,14 + DEFPUSHBUTTON "OK",IDOK,49,276,50,14 + PUSHBUTTON "Cancel",IDCANCEL,104,276,50,14 GROUPBOX "Graphics API",IDC_STATIC,7,7,147,66 CONTROL "Default (recommended)",IDC_RADIO_DEFAULT,"Button", BS_AUTORADIOBUTTON | WS_GROUP,21,22,129,12 @@ -266,13 +266,15 @@ BEGIN BS_AUTORADIOBUTTON,21,140,129,12 CONTROL "Null (no sound)",IDC_RADIO_SOUND_NULL,"Button", BS_AUTORADIOBUTTON,21,156,129,12 - GROUPBOX "Logging",IDC_STATIC,7,181,147,50 + GROUPBOX "Other",IDC_STATIC,7,181,147,62 CONTROL "Log to Disk",IDC_CHECK_LOG_TO_DISK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,21,197,129,10 + BS_AUTOCHECKBOX | WS_TABSTOP,21,210,129,10 CONTROL "Show Log Window",IDC_CHECK_SHOW_LOG_WINDOW,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,21,213,129,10 + BS_AUTOCHECKBOX | WS_TABSTOP,21,225,129,10 LTEXT "Tip: Change these only if you experience problems when using the default settings.", - IDC_STATIC,7,234,147,26 + IDC_STATIC,7,247,147,26 + CONTROL "Force 60Hz Refresh",IDC_CHECK_FORCE_60HZ,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,21,195,129,10 END IDD_LANGUAGES DIALOGEX 0, 0, 337, 189 @@ -434,7 +436,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 154 TOPMARGIN, 7 - BOTTOMMARGIN, 279 + BOTTOMMARGIN, 290 END IDD_LANGUAGES, DIALOG