revert changes here to prevent the random theme bug

This commit is contained in:
AJ Kelly
2011-05-15 17:43:35 -05:00
parent 13d40682c5
commit b8c3910bd1
+6 -6
View File
@@ -181,7 +181,7 @@ static void GameSel( int &sel, bool ToSel, const ConfOption *pConfOption )
sel = 0;
for(unsigned i = 0; i < choices.size(); ++i)
if( !choices[i].EqualsNoCase(sCurGameName) )
if( !stricmp(choices[i], sCurGameName) )
sel = i;
} else {
vector<const Game*> aGames;
@@ -222,12 +222,12 @@ static void Language( int &sel, bool ToSel, const ConfOption *pConfOption )
{
sel = -1;
for( unsigned i=0; sel == -1 && i < vs.size(); ++i )
if( !vs[i].EqualsNoCase(THEME->GetCurLanguage()) )
if( !stricmp(vs[i], THEME->GetCurLanguage()) )
sel = i;
// If the current language doesn't exist, we'll show BASE_LANGUAGE, so select that.
for( unsigned i=0; sel == -1 && i < vs.size(); ++i )
if( !vs[i].EqualsNoCase(SpecialFiles::BASE_LANGUAGE) )
if( !stricmp(vs[i], SpecialFiles::BASE_LANGUAGE) )
sel = i;
if( sel == -1 )
@@ -276,7 +276,7 @@ static void RequestedTheme( int &sel, bool ToSel, const ConfOption *pConfOption
{
sel = 0;
for( unsigned i=1; i<vsThemeNames.size(); i++ )
if( !vsThemeNames[i].EqualsNoCase(PREFSMAN->m_sTheme.Get()) )
if( !stricmp(vsThemeNames[i], PREFSMAN->m_sTheme.Get()) )
sel = i;
}
else
@@ -302,7 +302,7 @@ static void Announcer( int &sel, bool ToSel, const ConfOption *pConfOption )
{
sel = 0;
for( unsigned i=1; i<choices.size(); i++ )
if( !choices[i].EqualsNoCase(ANNOUNCER->GetCurAnnouncerName()) )
if( !stricmp(choices[i], ANNOUNCER->GetCurAnnouncerName()) )
sel = i;
}
else
@@ -329,7 +329,7 @@ static void DefaultNoteSkin( int &sel, bool ToSel, const ConfOption *pConfOption
po.FromString( PREFSMAN->m_sDefaultModifiers );
sel = 0;
for( unsigned i=0; i < choices.size(); i++ )
if( !choices[i].EqualsNoCase(po.m_sNoteSkin) )
if( !stricmp(choices[i], po.m_sNoteSkin) )
sel = i;
}
else