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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Background.cpp
+18 -18
View File
@@ -151,15 +151,15 @@ static RageColor GetBrightnessColor( float fBrightnessPercent )
BackgroundImpl::BackgroundImpl()
{
m_bInitted = false;
m_pDancingCharacters = NULL;
m_pSong = NULL;
m_pDancingCharacters = nullptr;
m_pSong = nullptr;
}
BackgroundImpl::Layer::Layer()
{
m_iCurBGChangeIndex = -1;
m_pCurrentBGA = NULL;
m_pFadingBGA = NULL;
m_pCurrentBGA = nullptr;
m_pFadingBGA = nullptr;
}
void BackgroundImpl::Init()
@@ -246,20 +246,20 @@ void BackgroundImpl::Unload()
{
FOREACH_BackgroundLayer( i )
m_Layer[i].Unload();
m_pSong = NULL;
m_pSong = nullptr;
m_fLastMusicSeconds = -9999;
m_RandomBGAnimations.clear();
}
void BackgroundImpl::Layer::Unload()
{
FOREACHM( BackgroundDef, Actor*, m_BGAnimations, iter )
delete iter->second;
for (std::pair<BackgroundDef const &, Actor *> iter : m_BGAnimations)
delete iter.second;
m_BGAnimations.clear();
m_aBGChanges.clear();
m_pCurrentBGA = NULL;
m_pFadingBGA = NULL;
m_pCurrentBGA = nullptr;
m_pFadingBGA = nullptr;
m_iCurBGChangeIndex = -1;
}
@@ -386,7 +386,7 @@ bool BackgroundImpl::Layer::CreateBackground( const Song *pSong, const Backgroun
Actor *pActor = ActorUtil::MakeActor( sEffectFile );
if( pActor == NULL )
if( pActor == nullptr )
pActor = new Actor;
m_BGAnimations[bd] = pActor;
@@ -542,10 +542,10 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
int iSize = min( (int)g_iNumBackgrounds, (int)vsNames.size() );
vsNames.resize( iSize );
FOREACH_CONST( RString, vsNames, s )
for (RString const &s : vsNames)
{
BackgroundDef bd;
bd.m_sFile1 = *s;
bd.m_sFile1 = s;
m_RandomBGAnimations.push_back( bd );
}
}
@@ -574,9 +574,9 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
Layer &layer = m_Layer[i];
// 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;
bool bIsAlreadyLoaded = layer.m_BGAnimations.find(bd) != layer.m_BGAnimations.end();
@@ -643,9 +643,9 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
FOREACH_BackgroundLayer( 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 )
{
bStaticBackgroundUsed = true;
@@ -765,7 +765,7 @@ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMus
if( m_pFadingBGA == m_pCurrentBGA )
{
m_pFadingBGA = NULL;
m_pFadingBGA = nullptr;
//LOG->Trace( "bg didn't actually change. Ignoring." );
}
else
@@ -807,7 +807,7 @@ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMus
if( m_pFadingBGA )
{
if( m_pFadingBGA->GetTweenTimeLeft() == 0 )
m_pFadingBGA = NULL;
m_pFadingBGA = nullptr;
}
/* This is unaffected by the music rate. */