From feae525a63cecb832db18e8c544bbbf56b7000ea Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 4 Nov 2004 00:03:51 +0000 Subject: [PATCH] we have music for keyed songs, even if we have no BGM track --- stepmania/src/Song.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index f646e10ade..979327d3b5 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -1174,7 +1174,15 @@ bool Song::RouletteDisplayed() const { if(IsTutorial()) return false; return Get bool Song::ShowInDemonstrationAndRanking() const { return !IsTutorial() && NormallyDisplayed(); } -bool Song::HasMusic() const {return m_sMusicFile != "" && IsAFile(GetMusicPath()); } +/* Hack: see Song::TidyUpData comments. */ +bool Song::HasMusic() const +{ + /* If we have keys, we always have music. */ + if( m_vsKeysoundFile.size() != 0 ) + return true; + + return m_sMusicFile != "" && IsAFile(GetMusicPath()); +} bool Song::HasBanner() const {return m_sBannerFile != "" && IsAFile(GetBannerPath()); } bool Song::HasLyrics() const {return m_sLyricsFile != "" && IsAFile(GetLyricsPath()); } bool Song::HasBackground() const {return m_sBackgroundFile != "" && IsAFile(GetBackgroundPath()); }