From b5b761234e92fe6188abcdce751fffab4403a963 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 12 Mar 2010 14:09:35 -0600 Subject: [PATCH] 23e241a: if a BGCHANGE file can't be resolved, don't use the specified effect because it may require 2 files and all random BGs specify only 1 file [Chris Danford] --- src/Background.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Background.cpp b/src/Background.cpp index c8c50e7a4e..d744865542 100644 --- a/src/Background.cpp +++ b/src/Background.cpp @@ -562,8 +562,10 @@ void BackgroundImpl::LoadFromSong( const Song* pSong ) { if( i == BACKGROUND_LAYER_1 ) { - // The background was not found. Try to use a random one instead. - bd = layer.CreateRandomBGA( pSong, bd.m_sEffect, m_RandomBGAnimations, this ); + // The background was not found. Try to use a random one instead. + // Don't use the BackgroundDef's effect, because it may be an + // effect that requires 2 files, and random BGA will only supply one file + bd = layer.CreateRandomBGA( pSong, "", m_RandomBGAnimations, this ); if( bd.IsEmpty() ) bd = m_StaticBackgroundDef; }