Changing BannerCache into ImageCache to support more imagetypes (#1532)

This commit is contained in:
Alexander Griffin
2017-09-19 14:49:42 -07:00
committed by MrThatKid
parent 13fbbe5e36
commit c0981c42ec
24 changed files with 305 additions and 231 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "FadingBanner.h"
#include "RageTextureManager.h"
#include "BannerCache.h"
#include "ImageCache.h"
#include "Song.h"
#include "RageLog.h"
#include "Course.h"
@@ -129,7 +129,7 @@ bool FadingBanner::LoadFromCachedBanner( const RString &path )
* which will cause the fade-in to be further delayed. */
RageTextureID ID;
bool bLowRes = (PREFSMAN->m_BannerCache != BNCACHE_FULL);
bool bLowRes = (PREFSMAN->m_ImageCache != IMGCACHE_FULL);
if( !bLowRes )
{
ID = Sprite::SongBannerTexture( path );
@@ -137,7 +137,7 @@ bool FadingBanner::LoadFromCachedBanner( const RString &path )
else
{
// Try to load the low quality version.
ID = BANNERCACHE->LoadCachedBanner( path );
ID = IMAGECACHE->LoadCachedImage( "Banner", path );
}
if( !TEXTUREMAN->IsTextureRegistered(ID) )