actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Handle the background changes.

Browse Source
This commit is contained in:
Jason Felds
2013-04-28 17:28:04 -04:00
parent 9a968a21f8
commit 04b03f0b6e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Background.cpp
+6 -6
View File
@@ -517,10 +517,10 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
int iSize = min( (int)g_iNumBackgrounds, (int)vsNames.size() ); int iSize = min( (int)g_iNumBackgrounds, (int)vsNames.size() );
vsNames.resize( iSize ); vsNames.resize( iSize );
FOREACH_CONST( RString, vsNames, s ) for (RString const &s : vsNames)
{ {
BackgroundDef bd; BackgroundDef bd;
bd.m_sFile1 = *s; bd.m_sFile1 = s;
m_RandomBGAnimations.push_back( bd ); m_RandomBGAnimations.push_back( bd );
} }
} }
@@ -549,9 +549,9 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
Layer &layer = m_Layer[i]; Layer &layer = m_Layer[i];
// Load all song-specified backgrounds // Load all song-specified backgrounds
FOREACH_CONST( BackgroundChange, pSong->GetBackgroundChanges(i), bgc ) for (BackgroundChange const &bgc : pSong->GetBackgroundChanges(i))
{ {
BackgroundChange change = *bgc; BackgroundChange change = bgc;
BackgroundDef &bd = change.m_def; BackgroundDef &bd = change.m_def;
bool bIsAlreadyLoaded = layer.m_BGAnimations.find(bd) != layer.m_BGAnimations.end(); bool bIsAlreadyLoaded = layer.m_BGAnimations.find(bd) != layer.m_BGAnimations.end();
@@ -620,9 +620,9 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
FOREACH_BackgroundLayer( i ) FOREACH_BackgroundLayer( i )
{ {
Layer &layer = m_Layer[i]; Layer &layer = m_Layer[i];
FOREACH_CONST( BackgroundChange, layer.m_aBGChanges, bgc ) for (BackgroundChange const &bgc : layer.m_aBGChanges)
{ {
const BackgroundDef &bd = bgc->m_def; const BackgroundDef &bd = bgc.m_def;
if( bd == m_StaticBackgroundDef ) if( bd == m_StaticBackgroundDef )
{ {
bStaticBackgroundUsed = true; bStaticBackgroundUsed = true;