From 8f99164eb5c1e47aad2e484e330a32daf805345c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 16 Jan 2005 18:25:29 +0000 Subject: [PATCH] All BGAnimations are "generic", except for those loaded directly from Background. This should be more consistent (we were creating BGAnimations as non-generic in some places where it probably should have been generic). This means all themes need to explicitly set the position of all BGAnimation graphics, which is good practice anyway. --- stepmania/src/BGAnimation.h | 2 +- stepmania/src/BGAnimationLayer.cpp | 8 -------- stepmania/src/Background.cpp | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/stepmania/src/BGAnimation.h b/stepmania/src/BGAnimation.h index 7d935ed6f2..98e0a75b31 100644 --- a/stepmania/src/BGAnimation.h +++ b/stepmania/src/BGAnimation.h @@ -12,7 +12,7 @@ struct XNode; class BGAnimation : public ActorScroller { public: - BGAnimation( bool Generic=false ); + BGAnimation( bool Generic=true ); virtual ~BGAnimation(); void Unload(); diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp index f8db312399..cfb0a4a9b3 100644 --- a/stepmania/src/BGAnimationLayer.cpp +++ b/stepmania/src/BGAnimationLayer.cpp @@ -74,7 +74,6 @@ void BGAnimationLayer::LoadFromAniLayerFile( const CString& sPath ) { /* Generic BGAs are new. Animation directories with no INI are old and obsolete. * Don't combine them. */ - ASSERT( !m_bGeneric ); Init(); CString lcPath = sPath; lcPath.MakeLower(); @@ -472,11 +471,6 @@ void BGAnimationLayer::LoadFromNode( const CString& sAniDir_, const XNode& layer layer.GetAttrValue( "TileVelocityY", m_fTileVelocityY ); - bool NeedTextureStretch = false; - if( m_fTexCoordVelocityX != 0 || - m_fTexCoordVelocityY != 0 ) - NeedTextureStretch = true; - switch( m_Type ) { case TYPE_SPRITE: @@ -504,7 +498,6 @@ void BGAnimationLayer::LoadFromNode( const CString& sAniDir_, const XNode& layer CollapsePath( sPath ); - ASSERT( !m_bGeneric ); for( int i=0; iGetSongDir()+sBGName, asFiles, true, true ); if( !asFiles.empty() ) { - pTempBGA = new BGAnimation; + pTempBGA = new BGAnimation( false ); pTempBGA->LoadFromAniDir( asFiles[0] ); return pTempBGA; }