From 4b70dcd49e8c5868c297da9fdf38ebb3951b86b1 Mon Sep 17 00:00:00 2001 From: Wolfy Date: Thu, 9 Jul 2015 00:40:44 -0500 Subject: [PATCH] Have lead-in image appear even with a negative BGAnimation beat 3.9 would make lead-in images appear no matter what, and still maintained the proper sync demanded by having a negative beat. This PR just restores the behavior to what 3.9 did, since currently negative BGAnimation beats will disable lead-in images. --- src/Background.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Background.cpp b/src/Background.cpp index af8ce9dc02..3a71e0d287 100644 --- a/src/Background.cpp +++ b/src/Background.cpp @@ -633,15 +633,10 @@ void BackgroundImpl::LoadFromSong( const Song* pSong ) Layer &mainlayer = m_Layer[0]; - /* If the first BGAnimation isn't negative, add a lead-in image showing - * the song background. */ - if( mainlayer.m_aBGChanges.empty() || mainlayer.m_aBGChanges.front().m_fStartBeat >= 0 ) - { - BackgroundChange change; - change.m_def = m_StaticBackgroundDef; - change.m_fStartBeat = -10000; - mainlayer.m_aBGChanges.insert( mainlayer.m_aBGChanges.begin(), change ); - } + BackgroundChange change; + change.m_def = m_StaticBackgroundDef; + change.m_fStartBeat = -10000; + mainlayer.m_aBGChanges.insert( mainlayer.m_aBGChanges.begin(), change ); // If any BGChanges use the background image, load it. bool bStaticBackgroundUsed = false;