diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index d57b420ed4..8346e22ac2 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -32,6 +32,7 @@ enum { GO_REFRESH_RATE, GO_MOVIEDECODEMS, GO_VSYNC, + GO_SHOWSTATS, NUM_GRAPHIC_OPTIONS_LINES }; OptionRow g_GraphicOptionsLines[NUM_GRAPHIC_OPTIONS_LINES] = { @@ -44,6 +45,7 @@ OptionRow g_GraphicOptionsLines[NUM_GRAPHIC_OPTIONS_LINES] = { OptionRow( "Refresh\nRate", true, "DEFAULT","60","70","72","75","80","85","90","100","120","150" ), OptionRow( "Movie\nDecode", true, "1ms","2ms","3ms","4ms" ), OptionRow( "Wait For\nVsync", true, "NO", "YES" ), + OptionRow( "Show\nStats", true, "OFF","ON" ), }; static const int HorizRes[] = { @@ -120,8 +122,9 @@ void ScreenGraphicOptions::ImportOptions() } } - m_iSelectedOption[0][GO_MOVIEDECODEMS] = PREFSMAN->m_iMovieDecodeMS-1; - m_iSelectedOption[0][GO_VSYNC] = PREFSMAN->m_bVsync ? 1:0; + m_iSelectedOption[0][GO_MOVIEDECODEMS] = PREFSMAN->m_iMovieDecodeMS-1; + m_iSelectedOption[0][GO_VSYNC] = PREFSMAN->m_bVsync ? 1:0; + m_iSelectedOption[0][GO_SHOWSTATS] = PREFSMAN->m_bShowStats ? 1:0; } void ScreenGraphicOptions::ExportOptions() @@ -164,6 +167,7 @@ void ScreenGraphicOptions::ExportOptions() PREFSMAN->m_iMovieDecodeMS = m_iSelectedOption[0][GO_MOVIEDECODEMS]+1; PREFSMAN->m_bVsync = m_iSelectedOption[0][GO_VSYNC] == 1; + PREFSMAN->m_bShowStats = m_iSelectedOption[0][GO_SHOWSTATS] == 1; } void ScreenGraphicOptions::GoToPrevState() diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp index 0728d9f3d5..bfc6bb3ef2 100644 --- a/stepmania/src/ScreenMachineOptions.cpp +++ b/stepmania/src/ScreenMachineOptions.cpp @@ -35,7 +35,6 @@ enum { MO_PROG_STAGE_LIFEBAR, MO_PROG_NONSTOP_LIFEBAR, MO_FAIL, - MO_SHOWSTATS, MO_COINS_PER_CREDIT, MO_JOINT_PREMIUM, MO_SHOW_SONG_OPTIONS, @@ -53,7 +52,6 @@ OptionRow g_MachineOptionsLines[NUM_MACHINE_OPTIONS_LINES] = { OptionRow( "Progressive\nStage Lifebar", true, "OFF","1","2","3","4","5","6","7","8","INSANITY"), OptionRow( "Progressive\nNonstop Lifebar", true, "OFF","1","2","3","4","5","6","7","8","INSANITY"), OptionRow( "Default\nFail Type", true, "ARCADE","END OF SONG","OFF" ), - OptionRow( "Show\nStats", true, "OFF","ON" ), OptionRow( "Coins Per\nCredit", true, "1","2","3","4","5","6","7","8" ), OptionRow( "Joint\nPremium", true, "OFF","ON" ), OptionRow( "Song\nOptions", true, "HIDE","SHOW","ASK" ), @@ -115,7 +113,6 @@ void ScreenMachineOptions::ImportOptions() m_iSelectedOption[0][MO_PROG_NONSTOP_LIFEBAR] = PREFSMAN->m_iProgressiveNonstopLifebar; m_iSelectedOption[0][MO_PROG_STAGE_LIFEBAR] = PREFSMAN->m_iProgressiveStageLifebar; m_iSelectedOption[0][MO_FAIL] = so.m_FailType; - m_iSelectedOption[0][MO_SHOWSTATS] = PREFSMAN->m_bShowStats ? 1:0; m_iSelectedOption[0][MO_COINS_PER_CREDIT] = PREFSMAN->m_iCoinsPerCredit - 1; m_iSelectedOption[0][MO_JOINT_PREMIUM] = PREFSMAN->m_bJointPremium ? 1:0; switch(PREFSMAN->m_ShowSongOptions) @@ -185,7 +182,6 @@ void ScreenMachineOptions::ExportOptions() if( so.GetString() != "" ) as.push_back( so.GetString() ); PREFSMAN->m_sDefaultModifiers = join(", ",as); - PREFSMAN->m_bShowStats = m_iSelectedOption[0][MO_SHOWSTATS] == 1; PREFSMAN->m_iCoinsPerCredit = m_iSelectedOption[0][MO_COINS_PER_CREDIT] + 1; PREFSMAN->m_bJointPremium = m_iSelectedOption[0][MO_JOINT_PREMIUM] == 1;