From 655855cd70c854c93517e9c929519507c26f3546 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 25 Jul 2004 20:51:44 +0000 Subject: [PATCH] don't show tutorial songs in Roulette --- stepmania/src/Song.cpp | 5 +++++ stepmania/src/song.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 157ad02c5f..9bd2d78f83 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -1232,6 +1232,11 @@ Song::SelectionDisplay Song::GetDisplayed() const return m_SelectionDisplay; } +bool Song::NormallyDisplayed() const { return GetDisplayed() == SHOW_ALWAYS; } +bool Song::NeverDisplayed() const { return GetDisplayed() == SHOW_NEVER; } +bool Song::RouletteDisplayed() const { if(IsTutorial()) return false; return GetDisplayed() != SHOW_NEVER; } + + bool Song::HasMusic() const {return m_sMusicFile != "" && IsAFile(GetMusicPath()); } bool Song::HasBanner() const {return m_sBannerFile != "" && IsAFile(GetBannerPath()); } bool Song::HasLyrics() const {return m_sLyricsFile != "" && IsAFile(GetLyricsPath()); } diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 212a97b434..c4c987043a 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -183,9 +183,9 @@ public: bool IsTutorial() const; bool HasEdits( StepsType st ) const; SelectionDisplay GetDisplayed() const; - bool NormallyDisplayed() const { return GetDisplayed() == SHOW_ALWAYS; } - bool NeverDisplayed() const { return GetDisplayed() == SHOW_NEVER; } - bool RouletteDisplayed() const { return GetDisplayed() != SHOW_NEVER; } + bool NormallyDisplayed() const; + bool NeverDisplayed() const; + bool RouletteDisplayed() const; void AddSteps( Steps* pSteps ); // we are responsible for deleting the memory pointed to by pSteps! void RemoveSteps( const Steps* pSteps );