actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/MeterDisplay.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ void MeterDisplay::LoadFromNode( const XNode* pNode )
LOG->Trace( "MeterDisplay::LoadFromNode(%s)", ActorUtil::GetWhere(pNode).c_str() );
const XNode *pStream = pNode->GetChild( "Stream" );
if( pStream == NULL )
if( pStream == nullptr )
{
LuaHelpers::ReportScriptErrorFmt("%s: MeterDisplay: missing the \"Stream\" attribute", ActorUtil::GetWhere(pNode).c_str());
return;
@@ -43,7 +43,7 @@ void MeterDisplay::LoadFromNode( const XNode* pNode )
this->AddChild( m_sprStream );
const XNode* pChild = pNode->GetChild( "Tip" );
if( pChild != NULL )
if( pChild != nullptr )
{
m_sprTip.LoadActorFromNode( pChild, this );
m_sprTip->SetName( "Tip" );