From 02d68f44eff8cb1587b0cee37a788f47a1e52f78 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 30 Dec 2004 20:08:34 +0000
Subject: [PATCH] don't waste time caching banners for Banner, only
 FadingBanner (eg. ScreenStage)

---
 stepmania/src/Banner.cpp       | 22 +++++++++++++---------
 stepmania/src/Banner.h         |  2 ++
 stepmania/src/FadingBanner.cpp |  2 ++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp
index ae7927f1c2..fe3ed28acd 100644
--- a/stepmania/src/Banner.cpp
+++ b/stepmania/src/Banner.cpp
@@ -16,16 +16,20 @@ Banner::Banner()
 {
 	m_bScrolling = false;
 	m_fPercentScrolling = 0;
+}
 
-	if( PREFSMAN->m_iBannerCache != PrefsManager::BNCACHE_OFF )
-	{
-		TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","all music")) );
-		TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Common","fallback banner")) );
-		TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","roulette")) );
-		TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","random")) );
-		TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","Sort")) );
-		TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","Mode")) );
-	}
+void Banner::CacheGlobalBanners()
+{
+	if( PREFSMAN->m_iBannerCache == PrefsManager::BNCACHE_OFF )
+		return;
+
+	TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","all music")) );
+	TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Common","fallback banner")) );
+	TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","roulette")) );
+	TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","random")) );
+	TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","leap")) );
+	TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","Sort")) );
+	TEXTUREMAN->CacheTexture( SongBannerTexture(THEME->GetPathG("Banner","Mode")) );
 }
 
 bool Banner::Load( RageTextureID ID )
diff --git a/stepmania/src/Banner.h b/stepmania/src/Banner.h
index cb3f3efd96..59531dd4c9 100644
--- a/stepmania/src/Banner.h
+++ b/stepmania/src/Banner.h
@@ -32,6 +32,8 @@ public:
 	void LoadRandom();
 	void LoadFallback();
 
+	static void CacheGlobalBanners();
+
 	void SetScrolling( bool bScroll, float Percent = 0);
 	bool IsScrolling() const { return m_bScrolling; }
 	float ScrollingPercent() const { return m_fPercentScrolling; }
diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp
index 2c7c4403bb..ffa14aed0c 100644
--- a/stepmania/src/FadingBanner.cpp
+++ b/stepmania/src/FadingBanner.cpp
@@ -27,6 +27,8 @@ FadingBanner::FadingBanner()
 	m_iIndexLatest = 0;
 	for( int i=0; i<3; i++ )
 		this->AddChild( &m_Banner[i] );
+
+	Banner::CacheGlobalBanners();
 }
 
 void FadingBanner::ScaleToClipped( float fWidth, float fHeight )