From 4149ac1ef29cc610db0c2503191dc4a33ed790b8 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 3 Jul 2003 08:12:06 +0000 Subject: [PATCH] wrap row movement on ScreenOptions fix FDB compile error --- stepmania/src/ScreenOptions.cpp | 12 ++++++------ stepmania/src/ThemeManager.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 15dd125b85..cce3af5b0e 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -764,9 +764,9 @@ void ScreenOptions::MenuUp( PlayerNumber pn ) continue; // skip if( m_iCurrentRow[p] == 0 ) // on first row - return; // can't go up any more - - m_iCurrentRow[p]--; + m_iCurrentRow[p] = m_iNumOptionRows; // on exit + else + m_iCurrentRow[p]--; } m_SoundPrevRow.Play(); OnChange(); @@ -781,9 +781,9 @@ void ScreenOptions::MenuDown( PlayerNumber pn ) continue; // skip if( m_iCurrentRow[p] == m_iNumOptionRows ) // on exit - return; // can't go down any more - - m_iCurrentRow[p]++; + m_iCurrentRow[p] = 0; // on first row + else + m_iCurrentRow[p]++; } m_SoundNextRow.Play(); OnChange(); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index bdddc17dfa..db5644c10f 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -243,7 +243,7 @@ try_element_again: switch( MessageBox(NULL, sMessage, "ThemeManager", MB_RETRYCANCEL ) ) { case IDRETRY: - FDB.FlushDirCache(); + FlushDirCache(); goto try_element_again; case IDCANCEL: RageException::Throw( "Theme element '%s/%s' could not be found in '%s' or '%s'.",