From 71599a7596c8ede3a74d876d6b698a0dfcd95b40 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 2 Jan 2003 01:39:58 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/Banner.cpp | 45 +++++++++++++++++++---------------------
 stepmania/src/Banner.h   | 14 +++++++------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp
index ec129fa2d3..6eebd8bf1c 100644
--- a/stepmania/src/Banner.cpp
+++ b/stepmania/src/Banner.cpp
@@ -22,7 +22,7 @@ Banner::Banner()
 	m_bScrolling = false;
 	m_fPercentScrolling = 0;
 
-	Banner::Load( THEME->GetPathTo("Graphics","fallback banner") );
+	LoadFallback();
 }
 
 bool Banner::Load( RageTextureID ID )
@@ -62,55 +62,52 @@ void Banner::SetScrolling( bool bScroll, float Percent)
 	Update(0);
 }
 
-bool Banner::LoadFromSong( Song* pSong )		// NULL means no song
+void Banner::LoadFromSong( Song* pSong )		// NULL means no song
 {
 	m_bScrolling = false;
 
 	Sprite::TurnShadowOff();
 
-	if( pSong == NULL )					Banner::Load( THEME->GetPathTo("Graphics","fallback banner") );
-	else if( pSong->HasBanner() )		Banner::Load( pSong->GetBannerPath() );
-	else if( PREFSMAN->m_bUseBGIfNoBanner  &&  pSong->HasBackground() )	Banner::Load( pSong->GetBackgroundPath() );
-	else								Banner::Load( THEME->GetPathTo("Graphics","fallback banner") );
-
-	return true;
+	if( pSong == NULL )					LoadFallback();
+	else if( pSong->HasBanner() )		Load( pSong->GetBannerPath() );
+	else if( PREFSMAN->m_bUseBGIfNoBanner  &&  pSong->HasBackground() )	Load( pSong->GetBackgroundPath() );
+	else								LoadFallback();
 }
 
-bool Banner::LoadFromGroup( CString sGroupName )
+void Banner::LoadFromGroup( CString sGroupName )
 {
 	m_bScrolling = false;
 
 	CString sGroupBannerPath = SONGMAN->GetGroupBannerPath( sGroupName );
 
 	if( sGroupName == "ALL MUSIC" )
-		Banner::Load( THEME->GetPathTo("Graphics","all music banner") );
+		Load( THEME->GetPathTo("Graphics","all music banner") );
 	else if( sGroupBannerPath != "" )
-		Banner::Load( sGroupBannerPath );
+		Load( sGroupBannerPath );
 	else
-		Banner::Load( THEME->GetPathTo("Graphics","fallback banner") );
-
-	return true;
+		LoadFallback();
 }
 
-bool Banner::LoadFromCourse( Course* pCourse )		// NULL means no course
+void Banner::LoadFromCourse( Course* pCourse )		// NULL means no course
 {
 	m_bScrolling = false;
 
 	Sprite::TurnShadowOff();
 
-	if( pCourse == NULL )						Banner::Load( THEME->GetPathTo("Graphics","fallback banner") );
-	else if( pCourse->m_sBannerPath != "" )		Banner::Load( pCourse->m_sBannerPath );
-	else										Banner::Load( THEME->GetPathTo("Graphics","fallback banner") );
-
-	return true;
+	if( pCourse == NULL )						LoadFallback();
+	else if( pCourse->m_sBannerPath != "" )		Load( pCourse->m_sBannerPath );
+	else										LoadFallback();
 }
 
-bool Banner::LoadRoulette()
+void Banner::LoadFallback()
+{
+	Load( THEME->GetPathTo("Graphics","fallback banner") );
+}
+
+void Banner::LoadRoulette()
 {
 	RageTextureID ID(THEME->GetPathTo("Graphics","select music roulette banner"));
 	ID.iMipMaps = 0;
-	Banner::Load( ID );
+	Load( ID );
 	m_bScrolling = true;
-
-	return true;
 }
diff --git a/stepmania/src/Banner.h b/stepmania/src/Banner.h
index a2463f02f3..af126ba350 100644
--- a/stepmania/src/Banner.h
+++ b/stepmania/src/Banner.h
@@ -20,19 +20,21 @@ class Banner : public CroppedSprite
 {
 public:
 	Banner();
+	virtual ~Banner() { }
 
 	virtual bool Load( RageTextureID ID );
 
 	virtual void Update( float fDeltaTime );
 
-	bool LoadFromSong( Song* pSong );		// NULL means no song
-	bool LoadFromGroup( CString sGroupName );
-	bool LoadFromCourse( Course* pCourse );
-	bool LoadRoulette();
+	void LoadFromSong( Song* pSong );		// NULL means no song
+	void LoadFromGroup( CString sGroupName );
+	void LoadFromCourse( Course* pCourse );
+	void LoadRoulette();
+	void LoadFallback();
 
 	void SetScrolling( bool bScroll, float Percent = 0);
-	bool IsScrolling() { return m_bScrolling; }
-	float ScrollingPercent() { return m_fPercentScrolling; }
+	bool IsScrolling() const { return m_bScrolling; }
+	float ScrollingPercent() const { return m_fPercentScrolling; }
 
 protected:
 	bool m_bScrolling;