From 5499c7124bc96e7c2f7399f014b3e989c038271e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 7 Jul 2005 01:44:24 +0000 Subject: [PATCH] only cache special banners on screens that need to --- stepmania/src/Banner.cpp | 9 --------- stepmania/src/Banner.h | 2 -- stepmania/src/ScreenSelectMusic.cpp | 9 +++++++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp index 2a763d491e..8f852a52a5 100644 --- a/stepmania/src/Banner.cpp +++ b/stepmania/src/Banner.cpp @@ -16,15 +16,6 @@ Banner::Banner() { m_bScrolling = false; m_fPercentScrolling = 0; - - if( PREFSMAN->m_BannerCache != PrefsManager::BNCACHE_OFF ) - { - m_TexturePreload.Load( SongBannerTexture(THEME->GetPathG("Banner","all music")) ); - m_TexturePreload.Load( SongBannerTexture(THEME->GetPathG("Common","fallback banner")) ); - m_TexturePreload.Load( SongBannerTexture(THEME->GetPathG("Banner","roulette")) ); - m_TexturePreload.Load( SongBannerTexture(THEME->GetPathG("Banner","random")) ); - m_TexturePreload.Load( SongBannerTexture(THEME->GetPathG("Banner","Mode")) ); - } } bool Banner::Load( RageTextureID ID ) diff --git a/stepmania/src/Banner.h b/stepmania/src/Banner.h index a0eb1fb4e5..d41c30813f 100644 --- a/stepmania/src/Banner.h +++ b/stepmania/src/Banner.h @@ -5,7 +5,6 @@ #include "Sprite.h" #include "RageTextureID.h" -#include "RageTexturePreloader.h" class Song; class Course; class Character; @@ -39,7 +38,6 @@ public: protected: bool m_bScrolling; float m_fPercentScrolling; - RageTexturePreloader m_TexturePreload; }; #endif diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 5ae5de32a0..aff4b233fa 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -109,6 +109,15 @@ void ScreenSelectMusic::Init() m_TexturePreload.Load( m_sFallbackCDTitlePath ); + if( PREFSMAN->m_BannerCache != PrefsManager::BNCACHE_OFF ) + { + m_TexturePreload.Load( Banner::SongBannerTexture(THEME->GetPathG("Banner","all music")) ); + m_TexturePreload.Load( Banner::SongBannerTexture(THEME->GetPathG("Common","fallback banner")) ); + m_TexturePreload.Load( Banner::SongBannerTexture(THEME->GetPathG("Banner","roulette")) ); + m_TexturePreload.Load( Banner::SongBannerTexture(THEME->GetPathG("Banner","random")) ); + m_TexturePreload.Load( Banner::SongBannerTexture(THEME->GetPathG("Banner","Mode")) ); + } + if( GAMESTATE->m_pCurStyle == NULL ) RageException::Throw( "The Style has not been set. A theme must set the Style before loading ScreenSelectMusic." );