actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-17 01:52:17 +00:00
parent 971279f1af
commit 575727fd46
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -656,7 +656,7 @@ void ScreenSelectMusic::CheckBackgroundRequests()
CString sCDTitlePath = sPath; CString sCDTitlePath = sPath;
if( sCDTitlePath.empty() || !IsAFile(sCDTitlePath) ) if( sCDTitlePath.empty() || !IsAFile(sCDTitlePath) )
sCDTitlePath = g_bWantFallbackCdTitle? g_sFallbackCDTitlePath:""; sCDTitlePath = g_bWantFallbackCdTitle? g_sFallbackCDTitlePath:CString("");
if( !sCDTitlePath.empty() ) if( !sCDTitlePath.empty() )
{ {
stepmania/src/TitleSubstitution.cpp
+6 -6
View File
@@ -56,21 +56,21 @@ void TitleSubst::Subst( TitleFields &tf )
{ {
if( ttab[i]->translit ) if( ttab[i]->translit )
tf.TitleTranslit = tf.Title; tf.TitleTranslit = tf.Title;
tf.Title = (ttab[i]->Dest.Title != "-erase-")? ttab[i]->Dest.Title: ""; tf.Title = (ttab[i]->Dest.Title != "-erase-")? ttab[i]->Dest.Title: CString("");
FontCharAliases::ReplaceMarkers( tf.Title ); FontCharAliases::ReplaceMarkers( tf.Title );
} }
if( !ttab[i]->Dest.Subtitle.empty() && tf.Subtitle != ttab[i]->Dest.Subtitle ) if( !ttab[i]->Dest.Subtitle.empty() && tf.Subtitle != ttab[i]->Dest.Subtitle )
{ {
if( ttab[i]->translit ) if( ttab[i]->translit )
tf.SubtitleTranslit = tf.Subtitle; tf.SubtitleTranslit = tf.Subtitle;
tf.Subtitle = (ttab[i]->Dest.Subtitle != "-erase-")? ttab[i]->Dest.Subtitle: ""; tf.Subtitle = (ttab[i]->Dest.Subtitle != "-erase-")? ttab[i]->Dest.Subtitle: CString("");
FontCharAliases::ReplaceMarkers( tf.Subtitle ); FontCharAliases::ReplaceMarkers( tf.Subtitle );
} }
if( !ttab[i]->Dest.Artist.empty() && tf.Artist != ttab[i]->Dest.Artist ) if( !ttab[i]->Dest.Artist.empty() && tf.Artist != ttab[i]->Dest.Artist )
{ {
if( ttab[i]->translit ) if( ttab[i]->translit )
tf.ArtistTranslit = tf.Artist; tf.ArtistTranslit = tf.Artist;
tf.Artist = (ttab[i]->Dest.Artist != "-erase-")? ttab[i]->Dest.Artist: ""; tf.Artist = (ttab[i]->Dest.Artist != "-erase-")? ttab[i]->Dest.Artist: CString("");
FontCharAliases::ReplaceMarkers( tf.Artist ); FontCharAliases::ReplaceMarkers( tf.Artist );
} }
@@ -78,17 +78,17 @@ void TitleSubst::Subst( TitleFields &tf )
* correct data. Should be used sparingly. */ * correct data. Should be used sparingly. */
if( !ttab[i]->Dest.TitleTranslit.empty() ) if( !ttab[i]->Dest.TitleTranslit.empty() )
{ {
tf.TitleTranslit = (ttab[i]->Dest.TitleTranslit != "-erase-")? ttab[i]->Dest.TitleTranslit: ""; tf.TitleTranslit = (ttab[i]->Dest.TitleTranslit != "-erase-")? ttab[i]->Dest.TitleTranslit: CString("");
FontCharAliases::ReplaceMarkers( tf.TitleTranslit ); FontCharAliases::ReplaceMarkers( tf.TitleTranslit );
} }
if( !ttab[i]->Dest.SubtitleTranslit.empty() ) if( !ttab[i]->Dest.SubtitleTranslit.empty() )
{ {
tf.SubtitleTranslit = (ttab[i]->Dest.SubtitleTranslit != "-erase-")? ttab[i]->Dest.SubtitleTranslit: ""; tf.SubtitleTranslit = (ttab[i]->Dest.SubtitleTranslit != "-erase-")? ttab[i]->Dest.SubtitleTranslit: CString("");
FontCharAliases::ReplaceMarkers( tf.SubtitleTranslit ); FontCharAliases::ReplaceMarkers( tf.SubtitleTranslit );
} }
if( !ttab[i]->Dest.ArtistTranslit.empty() ) if( !ttab[i]->Dest.ArtistTranslit.empty() )
{ {
tf.ArtistTranslit = (ttab[i]->Dest.ArtistTranslit != "-erase-")? ttab[i]->Dest.ArtistTranslit: ""; tf.ArtistTranslit = (ttab[i]->Dest.ArtistTranslit != "-erase-")? ttab[i]->Dest.ArtistTranslit: CString("");
FontCharAliases::ReplaceMarkers( tf.ArtistTranslit ); FontCharAliases::ReplaceMarkers( tf.ArtistTranslit );
} }
} }