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/ComboGraph.cpp
+9 -9
View File
@@ -14,9 +14,9 @@ ComboGraph::ComboGraph()
{
DeleteChildrenWhenDone( true );
m_pNormalCombo = NULL;
m_pMaxCombo = NULL;
m_pComboNumber = NULL;
m_pNormalCombo = nullptr;
m_pMaxCombo = nullptr;
m_pComboNumber = nullptr;
}
void ComboGraph::Load( RString sMetricsGroup )
@@ -28,10 +28,10 @@ void ComboGraph::Load( RString sMetricsGroup )
this->SetWidth(BODY_WIDTH);
this->SetHeight(BODY_HEIGHT);
Actor *pActor = NULL;
Actor *pActor = nullptr;
m_pBacking = ActorUtil::MakeActor( THEME->GetPathG(sMetricsGroup,"Backing") );
if( m_pBacking != NULL )
if( m_pBacking != nullptr )
{
m_pBacking->ZoomToWidth( BODY_WIDTH );
m_pBacking->ZoomToHeight( BODY_HEIGHT );
@@ -39,7 +39,7 @@ void ComboGraph::Load( RString sMetricsGroup )
}
m_pNormalCombo = ActorUtil::MakeActor( THEME->GetPathG(sMetricsGroup,"NormalCombo") );
if( m_pNormalCombo != NULL )
if( m_pNormalCombo != nullptr )
{
m_pNormalCombo->ZoomToWidth( BODY_WIDTH );
m_pNormalCombo->ZoomToHeight( BODY_HEIGHT );
@@ -47,7 +47,7 @@ void ComboGraph::Load( RString sMetricsGroup )
}
m_pMaxCombo = ActorUtil::MakeActor( THEME->GetPathG(sMetricsGroup,"MaxCombo") );
if( m_pMaxCombo != NULL )
if( m_pMaxCombo != nullptr )
{
m_pMaxCombo->ZoomToWidth( BODY_WIDTH );
m_pMaxCombo->ZoomToHeight( BODY_HEIGHT );
@@ -55,10 +55,10 @@ void ComboGraph::Load( RString sMetricsGroup )
}
pActor = ActorUtil::MakeActor( THEME->GetPathG(sMetricsGroup,"ComboNumber") );
if( pActor != NULL )
if( pActor != nullptr )
{
m_pComboNumber = dynamic_cast<BitmapText *>( pActor );
if( m_pComboNumber != NULL )
if( m_pComboNumber != nullptr )
this->AddChild( m_pComboNumber );
else
LuaHelpers::ReportScriptErrorFmt( "ComboGraph: \"sMetricsGroup\" \"ComboNumber\" must be a BitmapText" );