From 2fd80d65512052e8fa3561d30242e9e3c2c46b5a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 12 Feb 2003 20:20:11 +0000 Subject: [PATCH] use alternates --- stepmania/src/MusicList.cpp | 20 ++++++++++++++------ stepmania/src/ScreenMusicScroll.cpp | 2 +- stepmania/src/TransitionOniFade.cpp | 3 ++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/stepmania/src/MusicList.cpp b/stepmania/src/MusicList.cpp index 65cdb67e66..40751251e5 100644 --- a/stepmania/src/MusicList.cpp +++ b/stepmania/src/MusicList.cpp @@ -59,13 +59,21 @@ void MusicList::AddSongsToGroup(const vector &Songs) CString sTitle = Songs[iIndex]->GetFullDisplayTitle(); // TODO: Move this crop threshold into a theme metric or make automatic based on column width if( sTitle.GetLength() > 40 ) - { - sTitle = sTitle.Left( 37 ); - sTitle += "..."; - } - sText += sTitle + "\n"; + sTitle = sTitle.Left( 37 ) + "..."; + + CString sTrTitle = Songs[iIndex]->GetFullTranslitTitle(); + if( sTrTitle.GetLength() > 40 ) + sTrTitle = sTrTitle.Left( 37 ) + "..."; + + /* If the main title isn't complete for this font, and we have a translit, + * use it. */ + if(m_textTitles[c].StringWillUseAlternate(sTitle, sTrTitle)) + sText += sTrTitle; + else + sText += sTitle; + sText += "\n"; } - m_ContentsText[m_ContentsText.size()-1].ContentsText[c] = sText; + m_ContentsText[group].ContentsText[c] = sText; } } diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp index 902b822e56..c067312d35 100644 --- a/stepmania/src/ScreenMusicScroll.cpp +++ b/stepmania/src/ScreenMusicScroll.cpp @@ -159,7 +159,7 @@ ScreenMusicScroll::ScreenMusicScroll() { Song* pSong = arraySongs[i]; m_textLines[m_iNumLines].LoadFromFont( THEME->GetPathTo("Fonts","music scroll") ); - m_textLines[m_iNumLines].SetText( pSong->GetFullDisplayTitle() ); + m_textLines[m_iNumLines].SetText( pSong->GetFullDisplayTitle(), pSong->GetFullTranslitTitle() ); m_textLines[m_iNumLines].SetDiffuse( SONGMAN->GetSongColor(pSong) ); m_textLines[m_iNumLines].SetZoom( TEXT_ZOOM ); diff --git a/stepmania/src/TransitionOniFade.cpp b/stepmania/src/TransitionOniFade.cpp index f0df4d0a75..2e44015f7a 100644 --- a/stepmania/src/TransitionOniFade.cpp +++ b/stepmania/src/TransitionOniFade.cpp @@ -104,6 +104,7 @@ void TransitionOniFade::UpdateSongText() { Song* pSong = GAMESTATE->m_pCurSong; ASSERT( pSong ); - m_textSongInfo.SetText( pSong->GetFullDisplayTitle() + "\n" + pSong->m_sArtist + "\n"); + m_textSongInfo.SetText( pSong->GetFullDisplayTitle() + "\n" + pSong->GetDisplayArtist(), + pSong->GetFullTranslitTitle() + "\n" + pSong->GetTranslitArtist() ); m_Banner.LoadFromSong( pSong ); }