More goto removals.
This commit is contained in:
+5
-6
@@ -288,10 +288,9 @@ bool EditMenu::RowIsSelectable( EditMenuRow row )
|
|||||||
void EditMenu::Up()
|
void EditMenu::Up()
|
||||||
{
|
{
|
||||||
EditMenuRow dest = m_SelectedRow;
|
EditMenuRow dest = m_SelectedRow;
|
||||||
try_again:
|
do{
|
||||||
dest = (EditMenuRow)(dest - 1);
|
dest = (EditMenuRow)(dest - 1);
|
||||||
if( !RowIsSelectable(dest) )
|
} while (!RowIsSelectable(dest));
|
||||||
goto try_again;
|
|
||||||
ASSERT( dest >= 0 );
|
ASSERT( dest >= 0 );
|
||||||
ChangeToRow( dest );
|
ChangeToRow( dest );
|
||||||
m_soundChangeRow.Play();
|
m_soundChangeRow.Play();
|
||||||
@@ -300,10 +299,10 @@ try_again:
|
|||||||
void EditMenu::Down()
|
void EditMenu::Down()
|
||||||
{
|
{
|
||||||
EditMenuRow dest = m_SelectedRow;
|
EditMenuRow dest = m_SelectedRow;
|
||||||
try_again:
|
do
|
||||||
|
{
|
||||||
dest = (EditMenuRow)(dest + 1);
|
dest = (EditMenuRow)(dest + 1);
|
||||||
if( !RowIsSelectable(dest) )
|
} while (!RowIsSelectable(dest));
|
||||||
goto try_again;
|
|
||||||
ASSERT( dest < NUM_EditMenuRow );
|
ASSERT( dest < NUM_EditMenuRow );
|
||||||
ChangeToRow( dest );
|
ChangeToRow( dest );
|
||||||
m_soundChangeRow.Play();
|
m_soundChangeRow.Play();
|
||||||
|
|||||||
Reference in New Issue
Block a user