From 7d85d78ea4377b507ffa8f9f53829e4ea1815755 Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Fri, 18 Jul 2003 07:34:43 +0000 Subject: [PATCH] few minor bugfixes (subtitles, songentry constructor) --- stepmania/src/ScreenUnlock.cpp | 4 ++-- stepmania/src/UnlockSystem.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp index f6e042d04e..5ea996cc27 100644 --- a/stepmania/src/ScreenUnlock.cpp +++ b/stepmania/src/ScreenUnlock.cpp @@ -115,7 +115,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock") if (pSong && pSong->m_pSong != NULL) { CString title = pSong->m_pSong->GetDisplayMainTitle(); - CString subtitle = pSong->m_pSong->GetDisplayMainTitle(); + CString subtitle = pSong->m_pSong->GetDisplaySubTitle(); if( subtitle != "" ) title = title + "\n" + subtitle; text->SetTextMaxWidth( MaxWidth, title ); @@ -128,7 +128,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock") text->SetTextMaxWidth( MaxWidth, crs->m_sName ); text->Command("Diffuse,0,1,0,1"); } - else + else // entry isn't a song or course { text->SetText( "" ); text->Command("Diffuse,0.5,0,0,1"); diff --git a/stepmania/src/UnlockSystem.h b/stepmania/src/UnlockSystem.h index 396d9b2272..2bf8e874b4 100644 --- a/stepmania/src/UnlockSystem.h +++ b/stepmania/src/UnlockSystem.h @@ -21,6 +21,8 @@ class Song; struct SongEntry { + SongEntry(); + CString m_sSongName; /* A cached pointer to the song or course this entry refers to. Only one of