diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp index 98ab6f9871..6e218746c0 100644 --- a/stepmania/src/BannerCache.cpp +++ b/stepmania/src/BannerCache.cpp @@ -219,7 +219,7 @@ RageTextureID BannerCache::LoadCachedBanner( CString BannerPath ) /* Hack: make sure Banner::Load doesn't change our return value and end up * reloading. */ - ID = Banner::BannerTex(ID); + ID = Sprite::SongBannerTexture(ID); /* It's not in a texture. Do we have it loaded? */ if( m_BannerPathToImage.find(BannerPath) == m_BannerPathToImage.end() ) diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp index 2c1358dc50..e5d3c1b128 100644 --- a/stepmania/src/FadingBanner.cpp +++ b/stepmania/src/FadingBanner.cpp @@ -114,7 +114,7 @@ void FadingBanner::LoadFromCachedBanner( const CString &path ) RageTextureID ID; if( PREFSMAN->m_BannerCache == PrefsManager::BNCACHE_FULL ) - ID = Banner::BannerTex( path ); + ID = Sprite::SongBannerTexture( path ); else /* Try to load the low quality version. */ ID = BANNERCACHE->LoadCachedBanner( path ); diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 9f6c624cd7..3b148aa472 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -29,7 +29,7 @@ #include "GameManager.h" #include "RageFile.h" #include "RageTextureManager.h" -#include "Banner.h" +#include "Sprite.h" #include "ProfileManager.h" #include "MemoryCardManager.h" #include "NotesLoaderSM.h" @@ -298,7 +298,7 @@ void SongManager::PreloadSongImages() if( !songs[i]->HasBanner() ) continue; - const RageTextureID ID = Banner::BannerTex( songs[i]->GetBannerPath() ); + const RageTextureID ID = Sprite::SongBannerTexture( songs[i]->GetBannerPath() ); TEXTUREMAN->CacheTexture( ID ); } @@ -309,7 +309,7 @@ void SongManager::PreloadSongImages() if( !courses[i]->HasBanner() ) continue; - const RageTextureID ID = Banner::BannerTex( courses[i]->m_sBannerPath ); + const RageTextureID ID = Sprite::SongBannerTexture( courses[i]->m_sBannerPath ); TEXTUREMAN->CacheTexture( ID ); } }