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

The big NULL replacement party part 5.

Browse Source 
Right. ' = NULL' would get a lot of these.
This commit is contained in:
Jason Felds
2013-05-03 23:39:52 -04:00
parent 328c41eec0
commit 28e5148dec
233 changed files with 7448 additions and 7447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Background.cpp
+9 -9
View File
@@ -147,15 +147,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()
@@ -242,7 +242,7 @@ void BackgroundImpl::Unload()
{
FOREACH_BackgroundLayer( i )
m_Layer[i].Unload();
m_pSong = NULL;
m_pSong = nullptr;
m_fLastMusicSeconds = -9999;
m_RandomBGAnimations.clear();
}
@@ -254,8 +254,8 @@ void BackgroundImpl::Layer::Unload()
m_BGAnimations.clear();
m_aBGChanges.clear();
m_pCurrentBGA = NULL;
m_pFadingBGA = NULL;
m_pCurrentBGA = nullptr;
m_pFadingBGA = nullptr;
m_iCurBGChangeIndex = -1;
}
@@ -743,7 +743,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
@@ -779,7 +779,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. */