overly abstracted
This commit is contained in:
@@ -812,17 +812,11 @@ void ScreenOptions::MenuBack( PlayerNumber pn )
|
|||||||
Cancel( SM_GoToPrevScreen );
|
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
|
bool ScreenOptions::AllAreOnLastRow() const
|
||||||
{
|
{
|
||||||
FOREACH_HumanPlayer( p )
|
FOREACH_HumanPlayer( p )
|
||||||
{
|
{
|
||||||
if( !IsOnLastRow(p) )
|
if( m_iCurrentRow[p] != (int)(m_pRows.size()-1) )
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -87,7 +87,6 @@ protected:
|
|||||||
|
|
||||||
/* Returns -1 if on a row with no OptionRowDefinition (eg. EXIT). */
|
/* 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;
|
||||||
bool IsOnLastRow( PlayerNumber pn ) const;
|
|
||||||
bool AllAreOnLastRow() const;
|
bool AllAreOnLastRow() const;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|||||||
Reference in New Issue
Block a user