From b4021ac0c615c89d60540a676d42f4e04346fbac Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 9 Jul 2003 20:28:07 +0000
Subject: [PATCH] Use DisableOddDimensionWarning and EnableOddDimensionWarning

---
 stepmania/src/BGAnimationLayer.cpp  | 5 +++++
 stepmania/src/Background.cpp        | 5 +++++
 stepmania/src/Banner.cpp            | 2 ++
 stepmania/src/ScreenSelectMusic.cpp | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 6d62e4e71a..2fa133fddb 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -27,6 +27,7 @@
 #include "RageDisplay.h"
 #include "ActorUtil.h"
 #include "StepMania.h"	// for HOOKS
+#include "RageTextureManager.h"
 
 
 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, "TileVelocityY", m_fTileVelocityY );
 
+	if( IsBanner )
+		TEXTUREMAN->DisableOddDimensionWarning();
 
 	switch( m_Type )
 	{
@@ -613,6 +616,8 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer )
 	default:
 		ASSERT(0);
 	}
+	if( IsBanner )
+		TEXTUREMAN->EnableOddDimensionWarning();
 
 	bool bStartOnRandomFrame = false;
 	ini.GetValueB( sLayer, "StartOnRandomFrame", bStartOnRandomFrame );
diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 13d25e6252..b8cf298bdd 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -17,6 +17,7 @@
 #include "RageException.h"
 #include "RageTimer.h"
 #include "RageLog.h"
+#include "RageTextureManager.h"
 #include "GameState.h"
 #include "ThemeManager.h"
 #include "PrefsManager.h"
@@ -228,6 +229,8 @@ void Background::LoadFromSong( Song* pSong )
 {
 	Unload();
 
+	TEXTUREMAN->DisableOddDimensionWarning();
+
 	const float fXZoom = RECT_BACKGROUND.GetWidth() / (float)SCREEN_WIDTH;
 	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.SetZoomX( fXZoom );
 	m_BGADanger.SetZoomY( fYZoom );	
+
+	TEXTUREMAN->EnableOddDimensionWarning();
 }
 
 
diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp
index 7b28b7e268..ac25ee0e5d 100644
--- a/stepmania/src/Banner.cpp
+++ b/stepmania/src/Banner.cpp
@@ -83,9 +83,11 @@ void Banner::LoadFromSong( Song* pSong )		// NULL means no song
 {
 	Sprite::EnableShadow( false );
 
+	TEXTUREMAN->DisableOddDimensionWarning();
 	if( pSong == NULL )					LoadFallback();
 	else if( pSong->HasBanner() )		Load( pSong->GetBannerPath() );
 	else								LoadFallback();
+	TEXTUREMAN->EnableOddDimensionWarning();
 
 	m_bScrolling = false;
 }
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 2437379292..45219ec75a 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -866,8 +866,10 @@ void ScreenSelectMusic::AfterMusicChange()
 			}
 
 			const CString CDTitlePath = pSong->HasCDTitle()? pSong->GetCDTitlePath():g_sFallbackCDTitlePath;
+			TEXTUREMAN->DisableOddDimensionWarning();
 			m_sprCDTitleFront.Load( CDTitlePath );
 			m_sprCDTitleBack.Load( CDTitlePath );
+			TEXTUREMAN->EnableOddDimensionWarning();
 
 			m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyleDef()->m_NotesType );