From 575727fd46db28fdd870aaa2df792648d84a4014 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 17 Sep 2004 01:52:17 +0000 Subject: [PATCH] minor fix --- stepmania/src/ScreenSelectMusic.cpp | 2 +- stepmania/src/TitleSubstitution.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index e4c1e0959d..a5ae176d41 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -656,7 +656,7 @@ void ScreenSelectMusic::CheckBackgroundRequests() CString sCDTitlePath = sPath; if( sCDTitlePath.empty() || !IsAFile(sCDTitlePath) ) - sCDTitlePath = g_bWantFallbackCdTitle? g_sFallbackCDTitlePath:""; + sCDTitlePath = g_bWantFallbackCdTitle? g_sFallbackCDTitlePath:CString(""); if( !sCDTitlePath.empty() ) { diff --git a/stepmania/src/TitleSubstitution.cpp b/stepmania/src/TitleSubstitution.cpp index e7036479cc..f0e610f7e0 100644 --- a/stepmania/src/TitleSubstitution.cpp +++ b/stepmania/src/TitleSubstitution.cpp @@ -56,21 +56,21 @@ void TitleSubst::Subst( TitleFields &tf ) { if( ttab[i]->translit ) 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 ); } if( !ttab[i]->Dest.Subtitle.empty() && tf.Subtitle != ttab[i]->Dest.Subtitle ) { if( ttab[i]->translit ) 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 ); } if( !ttab[i]->Dest.Artist.empty() && tf.Artist != ttab[i]->Dest.Artist ) { if( ttab[i]->translit ) 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 ); } @@ -78,17 +78,17 @@ void TitleSubst::Subst( TitleFields &tf ) * correct data. Should be used sparingly. */ 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 ); } 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 ); } 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 ); } }