From 359b416fab1ceb31dd2b0681f1ddebc7f80d0527 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 3 Feb 2006 08:49:02 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenOptions.cpp | 7 ------- stepmania/src/ScreenOptions.h | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 2a58c64a2c..6d07597dab 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -1276,13 +1276,6 @@ void ScreenOptions::MenuUpDown( const InputEventPlus &input, int iDir ) } } - -int ScreenOptions::GetCurrentRow( PlayerNumber pn ) const -{ - const int r = m_iCurrentRow[pn]; - return r; -} - // lua start #include "LuaBinding.h" diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 9ce009e875..0ad2488e5d 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -88,8 +88,7 @@ protected: virtual void MenuSelect( const InputEventPlus &input ); virtual void MenuUpDown( const InputEventPlus &input, int iDir ); // iDir == -1 or iDir == +1 - /* Returns -1 if on a row with no OptionRowDefinition (eg. EXIT). */ - int GetCurrentRow(PlayerNumber pn = PLAYER_1) const; + int GetCurrentRow( PlayerNumber pn = PLAYER_1 ) const { return m_iCurrentRow[pn]; } bool AllAreOnLastRow() const; protected: // derived classes need access to these