remove VC6 scoping hacks

This commit is contained in:
Chris Danford
2004-09-21 07:53:39 +00:00
parent f97eaed01d
commit 03fbb915f3
55 changed files with 162 additions and 266 deletions
+2 -3
View File
@@ -406,8 +406,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
/* This player is currently on a choice that is no longer available due to
* the selection just made. */
int iSwitchToIndex = -1;
int i;
for( i=m_iChoiceOnPage[p]+1; iSwitchToIndex == -1 && i < (int) m_ModeChoices[m_CurrentPage].size(); ++i )
for( int i=m_iChoiceOnPage[p]+1; iSwitchToIndex == -1 && i < (int) m_ModeChoices[m_CurrentPage].size(); ++i )
{
const ModeChoice &mc = m_ModeChoices[m_CurrentPage][i];
if( mc.IsPlayable() && !BothPlayersModeChoice(mc) )
@@ -415,7 +414,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
}
if( iSwitchToIndex == -1 ) /* couldn't find a spot looking up; look down */
{
for( i=m_iChoiceOnPage[p]-1; iSwitchToIndex == -1 && i >= 0; --i )
for( int i=m_iChoiceOnPage[p]-1; iSwitchToIndex == -1 && i >= 0; --i )
{
const ModeChoice &mc = m_ModeChoices[m_CurrentPage][i];
if( mc.IsPlayable() && !BothPlayersModeChoice(mc) )