From 9e9aa237e9c356c8c0d7119f327431bf9e510524 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 24 Jan 2013 23:00:47 -0500 Subject: [PATCH] More goto removals. --- src/EditMenu.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/EditMenu.cpp b/src/EditMenu.cpp index 18a0336041..c757562818 100644 --- a/src/EditMenu.cpp +++ b/src/EditMenu.cpp @@ -288,10 +288,9 @@ bool EditMenu::RowIsSelectable( EditMenuRow row ) void EditMenu::Up() { EditMenuRow dest = m_SelectedRow; -try_again: - dest = (EditMenuRow)(dest-1); - if( !RowIsSelectable(dest) ) - goto try_again; + do{ + dest = (EditMenuRow)(dest - 1); + } while (!RowIsSelectable(dest)); ASSERT( dest >= 0 ); ChangeToRow( dest ); m_soundChangeRow.Play(); @@ -300,10 +299,10 @@ try_again: void EditMenu::Down() { EditMenuRow dest = m_SelectedRow; -try_again: - dest = (EditMenuRow)(dest+1); - if( !RowIsSelectable(dest) ) - goto try_again; + do + { + dest = (EditMenuRow)(dest + 1); + } while (!RowIsSelectable(dest)); ASSERT( dest < NUM_EditMenuRow ); ChangeToRow( dest ); m_soundChangeRow.Play();