few minor bugfixes (subtitles, songentry constructor)

This commit is contained in:
Andrew Wong
2003-07-18 07:34:43 +00:00
parent 32831d5af2
commit 7d85d78ea4
2 changed files with 4 additions and 2 deletions
+2 -2
View File
@@ -115,7 +115,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
if (pSong && pSong->m_pSong != NULL) if (pSong && pSong->m_pSong != NULL)
{ {
CString title = pSong->m_pSong->GetDisplayMainTitle(); CString title = pSong->m_pSong->GetDisplayMainTitle();
CString subtitle = pSong->m_pSong->GetDisplayMainTitle(); CString subtitle = pSong->m_pSong->GetDisplaySubTitle();
if( subtitle != "" ) if( subtitle != "" )
title = title + "\n" + subtitle; title = title + "\n" + subtitle;
text->SetTextMaxWidth( MaxWidth, title ); text->SetTextMaxWidth( MaxWidth, title );
@@ -128,7 +128,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
text->SetTextMaxWidth( MaxWidth, crs->m_sName ); text->SetTextMaxWidth( MaxWidth, crs->m_sName );
text->Command("Diffuse,0,1,0,1"); text->Command("Diffuse,0,1,0,1");
} }
else else // entry isn't a song or course
{ {
text->SetText( "" ); text->SetText( "" );
text->Command("Diffuse,0.5,0,0,1"); text->Command("Diffuse,0.5,0,0,1");
+2
View File
@@ -21,6 +21,8 @@ class Song;
struct SongEntry struct SongEntry
{ {
SongEntry();
CString m_sSongName; CString m_sSongName;
/* A cached pointer to the song or course this entry refers to. Only one of /* A cached pointer to the song or course this entry refers to. Only one of