replace gotos with do/while logic where appropriate

src/RageThreads.cpp

@@ -751,12 +751,11 @@ void RageSemaphore::Post()
 
 void RageSemaphore::Wait( bool bFailOnTimeout )
 {
-retry:
+	do
+	{
 		if( m_pSema->Wait() )
 			return;
-
+	} while( !bFailOnTimeout || RageThread::GetIsShowingDialog() );
-	if( !bFailOnTimeout || RageThread::GetIsShowingDialog() )
-		goto retry;
 
 	/* We waited too long.  We're probably deadlocked, though unlike mutexes, we can't
 	 * tell which thread we're stuck on. */

src/ScreenSelectMaster.cpp

@@ -390,8 +390,9 @@ bool ScreenSelectMaster::Move( PlayerNumber pn, MenuDir dir )
 
 	int iSwitchToIndex = m_iChoice[pn];
 	set<int> seen;
-try_again:
 
+	do
+	{
 		map<int,int>::const_iterator iter = m_mapCurrentChoiceToNextChoice[dir].find( iSwitchToIndex );
 		if( iter != m_mapCurrentChoiceToNextChoice[dir].end() )
 			iSwitchToIndex = iter->second;
@@ -401,9 +402,7 @@ try_again:
 		if( seen.find(iSwitchToIndex) != seen.end() )
 			return false; // went full circle and none found
 		seen.insert( iSwitchToIndex );
-
+	} while( !m_aGameCommands[iSwitchToIndex].IsPlayable() && !DO_SWITCH_ANYWAYS );
-	if( !m_aGameCommands[iSwitchToIndex].IsPlayable() && !DO_SWITCH_ANYWAYS )
-		goto try_again;
 
 	return ChangeSelection( pn, dir, iSwitchToIndex );
 }

src/smpackage/SMPackageInstallDlg.cpp

@@ -332,8 +332,9 @@ void CSMPackageInstallDlg::OnOK()
 			ProgressInit = 1;
 		}
 
-retry_unzip:
+		Dialog::Result result;
-
+		do
+		{
 			// Extract the files
 			const RString sFile = vs[i];
 			LOG->Trace( "Extracting: "+sFile );
@@ -367,23 +368,22 @@ retry_unzip:
 				SAFE_DELETE( pFileTo );
 			}
 
-		goto done_with_file;
+			break;
 
 show_error:
-		switch( Dialog::AbortRetryIgnore(sError) )
+			Dialog::Result result = Dialog::AbortRetryIgnore(sError);
+			switch( result )
 			{
 			case Dialog::abort:
 				exit(1);	// better way to exit?
 				break;
 			case Dialog::retry:
-			goto retry_unzip;
 				break;
 			case Dialog::ignore:
 				// do nothing
 				break;
 			}
-
+		} while( result == Dialog::retry );
-done_with_file:
 
 		pProgress1->StepIt(); //increase the progress bar of 1 step
 	}