From 67cb967ad3c359a2bfd32285ea0a942d107ddd35 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 04:44:29 +0000 Subject: [PATCH] overly abstracted --- stepmania/src/ScreenOptions.cpp | 8 +------- stepmania/src/ScreenOptions.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index d4c76794bb..2d1febde6d 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -812,17 +812,11 @@ void ScreenOptions::MenuBack( PlayerNumber pn ) Cancel( SM_GoToPrevScreen ); } -bool ScreenOptions::IsOnLastRow( PlayerNumber pn ) const -{ - int iCurRow = m_iCurrentRow[pn]; - return iCurRow == (int)(m_pRows.size()-1); -} - bool ScreenOptions::AllAreOnLastRow() const { FOREACH_HumanPlayer( p ) { - if( !IsOnLastRow(p) ) + if( m_iCurrentRow[p] != (int)(m_pRows.size()-1) ) return false; } return true; diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index d679176fe9..f600065687 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -87,7 +87,6 @@ protected: /* Returns -1 if on a row with no OptionRowDefinition (eg. EXIT). */ int GetCurrentRow(PlayerNumber pn = PLAYER_1) const; - bool IsOnLastRow( PlayerNumber pn ) const; bool AllAreOnLastRow() const; public: