fix not displaying warning for fading banners
This commit is contained in:
@@ -45,7 +45,12 @@ bool Banner::Load( RageTextureID ID )
|
|||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
|
|
||||||
TEXTUREMAN->VolatileTexture( ID );
|
TEXTUREMAN->VolatileTexture( ID );
|
||||||
return Sprite::Load( ID );
|
|
||||||
|
TEXTUREMAN->DisableOddDimensionWarning();
|
||||||
|
bool ret = Sprite::Load( ID );
|
||||||
|
TEXTUREMAN->EnableOddDimensionWarning();
|
||||||
|
|
||||||
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
void Banner::Update( float fDeltaTime )
|
void Banner::Update( float fDeltaTime )
|
||||||
@@ -83,11 +88,9 @@ void Banner::LoadFromSong( Song* pSong ) // NULL means no song
|
|||||||
{
|
{
|
||||||
Sprite::EnableShadow( false );
|
Sprite::EnableShadow( false );
|
||||||
|
|
||||||
TEXTUREMAN->DisableOddDimensionWarning();
|
|
||||||
if( pSong == NULL ) LoadFallback();
|
if( pSong == NULL ) LoadFallback();
|
||||||
else if( pSong->HasBanner() ) Load( pSong->GetBannerPath() );
|
else if( pSong->HasBanner() ) Load( pSong->GetBannerPath() );
|
||||||
else LoadFallback();
|
else LoadFallback();
|
||||||
TEXTUREMAN->EnableOddDimensionWarning();
|
|
||||||
|
|
||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user