From 22d3b994d24bc7585b58b549b4b9a585e2df7b18 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 9 Oct 2002 16:55:59 +0000 Subject: [PATCH] Fixed goofiness with default judge window setting. --- stepmania/src/PrefsManager.cpp | 2 +- stepmania/src/ScreenMachineOptions.cpp | 28 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 884d1f50fe..0ee8d4030a 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -45,7 +45,7 @@ PrefsManager::PrefsManager() m_bEventMode = false; m_iNumArcadeStages = 3; m_bAutoPlay = false; - m_fJudgeWindowSeconds = 0.18f; + m_fJudgeWindowSeconds = 0.20f; m_fJudgeWindowPerfectPercent = 0.25f; m_fJudgeWindowGreatPercent = 0.50f; m_fJudgeWindowGoodPercent = 0.75f; diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp index fe5489150a..cec808f927 100644 --- a/stepmania/src/ScreenMachineOptions.cpp +++ b/stepmania/src/ScreenMachineOptions.cpp @@ -88,13 +88,13 @@ void ScreenMachineOptions::ImportOptions() * impossible, and perhaps it *is* justice that even the CPU fails * it. :) */ - if( PREFSMAN->m_fJudgeWindowSeconds == 0.20f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 0; - else if( PREFSMAN->m_fJudgeWindowSeconds == 0.18f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 1; - else if( PREFSMAN->m_fJudgeWindowSeconds == 0.16f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 2; - else if( PREFSMAN->m_fJudgeWindowSeconds == 0.14f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 3; - else if( PREFSMAN->m_fJudgeWindowSeconds == 0.12f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 4; - else if( PREFSMAN->m_fJudgeWindowSeconds == 0.10f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 5; - else if( PREFSMAN->m_fJudgeWindowSeconds == 0.08f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 6; + if( PREFSMAN->m_fJudgeWindowSeconds == 0.29f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 0; + else if( PREFSMAN->m_fJudgeWindowSeconds == 0.26f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 1; + else if( PREFSMAN->m_fJudgeWindowSeconds == 0.23f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 2; + else if( PREFSMAN->m_fJudgeWindowSeconds == 0.20f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 3; + else if( PREFSMAN->m_fJudgeWindowSeconds == 0.17f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 4; + else if( PREFSMAN->m_fJudgeWindowSeconds == 0.12f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 5; + else if( PREFSMAN->m_fJudgeWindowSeconds == 0.09f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 6; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.06f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 7; else m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 3; @@ -120,13 +120,13 @@ void ScreenMachineOptions::ExportOptions() switch( m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] ) { - case 0: PREFSMAN->m_fJudgeWindowSeconds = 0.20f; break; - case 1: PREFSMAN->m_fJudgeWindowSeconds = 0.18f; break; - case 2: PREFSMAN->m_fJudgeWindowSeconds = 0.16f; break; - case 3: PREFSMAN->m_fJudgeWindowSeconds = 0.14f; break; - case 4: PREFSMAN->m_fJudgeWindowSeconds = 0.12f; break; - case 5: PREFSMAN->m_fJudgeWindowSeconds = 0.10f; break; - case 6: PREFSMAN->m_fJudgeWindowSeconds = 0.08f; break; + case 0: PREFSMAN->m_fJudgeWindowSeconds = 0.29f; break; + case 1: PREFSMAN->m_fJudgeWindowSeconds = 0.26f; break; + case 2: PREFSMAN->m_fJudgeWindowSeconds = 0.23f; break; + case 3: PREFSMAN->m_fJudgeWindowSeconds = 0.20f; break; + case 4: PREFSMAN->m_fJudgeWindowSeconds = 0.17f; break; + case 5: PREFSMAN->m_fJudgeWindowSeconds = 0.12f; break; + case 6: PREFSMAN->m_fJudgeWindowSeconds = 0.09f; break; case 7: PREFSMAN->m_fJudgeWindowSeconds = 0.06f; break; default: ASSERT(0); }