Use DisableOddDimensionWarning and EnableOddDimensionWarning
This commit is contained in:
@@ -27,6 +27,7 @@
|
|||||||
#include "RageDisplay.h"
|
#include "RageDisplay.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "StepMania.h" // for HOOKS
|
#include "StepMania.h" // for HOOKS
|
||||||
|
#include "RageTextureManager.h"
|
||||||
|
|
||||||
|
|
||||||
const float PARTICLE_SPEED = 300;
|
const float PARTICLE_SPEED = 300;
|
||||||
@@ -546,6 +547,8 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer )
|
|||||||
ini.GetValueF( sLayer, "TileVelocityX", m_fTileVelocityX );
|
ini.GetValueF( sLayer, "TileVelocityX", m_fTileVelocityX );
|
||||||
ini.GetValueF( sLayer, "TileVelocityY", m_fTileVelocityY );
|
ini.GetValueF( sLayer, "TileVelocityY", m_fTileVelocityY );
|
||||||
|
|
||||||
|
if( IsBanner )
|
||||||
|
TEXTUREMAN->DisableOddDimensionWarning();
|
||||||
|
|
||||||
switch( m_Type )
|
switch( m_Type )
|
||||||
{
|
{
|
||||||
@@ -613,6 +616,8 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer )
|
|||||||
default:
|
default:
|
||||||
ASSERT(0);
|
ASSERT(0);
|
||||||
}
|
}
|
||||||
|
if( IsBanner )
|
||||||
|
TEXTUREMAN->EnableOddDimensionWarning();
|
||||||
|
|
||||||
bool bStartOnRandomFrame = false;
|
bool bStartOnRandomFrame = false;
|
||||||
ini.GetValueB( sLayer, "StartOnRandomFrame", bStartOnRandomFrame );
|
ini.GetValueB( sLayer, "StartOnRandomFrame", bStartOnRandomFrame );
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
#include "RageException.h"
|
#include "RageException.h"
|
||||||
#include "RageTimer.h"
|
#include "RageTimer.h"
|
||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
|
#include "RageTextureManager.h"
|
||||||
#include "GameState.h"
|
#include "GameState.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
@@ -228,6 +229,8 @@ void Background::LoadFromSong( Song* pSong )
|
|||||||
{
|
{
|
||||||
Unload();
|
Unload();
|
||||||
|
|
||||||
|
TEXTUREMAN->DisableOddDimensionWarning();
|
||||||
|
|
||||||
const float fXZoom = RECT_BACKGROUND.GetWidth() / (float)SCREEN_WIDTH;
|
const float fXZoom = RECT_BACKGROUND.GetWidth() / (float)SCREEN_WIDTH;
|
||||||
const float fYZoom = RECT_BACKGROUND.GetHeight() / (float)SCREEN_HEIGHT;
|
const float fYZoom = RECT_BACKGROUND.GetHeight() / (float)SCREEN_HEIGHT;
|
||||||
|
|
||||||
@@ -356,6 +359,8 @@ void Background::LoadFromSong( Song* pSong )
|
|||||||
m_BGADanger.SetXY( (float)LEFT_EDGE, (float)TOP_EDGE );
|
m_BGADanger.SetXY( (float)LEFT_EDGE, (float)TOP_EDGE );
|
||||||
m_BGADanger.SetZoomX( fXZoom );
|
m_BGADanger.SetZoomX( fXZoom );
|
||||||
m_BGADanger.SetZoomY( fYZoom );
|
m_BGADanger.SetZoomY( fYZoom );
|
||||||
|
|
||||||
|
TEXTUREMAN->EnableOddDimensionWarning();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -83,9 +83,11 @@ 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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -866,8 +866,10 @@ void ScreenSelectMusic::AfterMusicChange()
|
|||||||
}
|
}
|
||||||
|
|
||||||
const CString CDTitlePath = pSong->HasCDTitle()? pSong->GetCDTitlePath():g_sFallbackCDTitlePath;
|
const CString CDTitlePath = pSong->HasCDTitle()? pSong->GetCDTitlePath():g_sFallbackCDTitlePath;
|
||||||
|
TEXTUREMAN->DisableOddDimensionWarning();
|
||||||
m_sprCDTitleFront.Load( CDTitlePath );
|
m_sprCDTitleFront.Load( CDTitlePath );
|
||||||
m_sprCDTitleBack.Load( CDTitlePath );
|
m_sprCDTitleBack.Load( CDTitlePath );
|
||||||
|
TEXTUREMAN->EnableOddDimensionWarning();
|
||||||
|
|
||||||
m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
|
m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user