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/PercentageDisplay.cpp
+4 -4
View File
@@ -16,8 +16,8 @@ REGISTER_ACTOR_CLASS( PercentageDisplay );
PercentageDisplay::PercentageDisplay()
{
m_pPlayerState = NULL;
m_pPlayerStageStats = NULL;
m_pPlayerState = nullptr;
m_pPlayerStageStats = nullptr;
m_Last = -1;
m_LastMax = -1;
@@ -53,7 +53,7 @@ void PercentageDisplay::LoadFromNode( const XNode* pNode )
}
const XNode *pChild = pNode->GetChild( "Percent" );
if( pChild == NULL )
if( pChild == nullptr )
{
LuaHelpers::ReportScriptError(ActorUtil::GetWhere(pNode) + ": PercentageDisplay: missing the node \"Percent\"");
// Make a BitmapText just so we don't crash.
@@ -66,7 +66,7 @@ void PercentageDisplay::LoadFromNode( const XNode* pNode )
this->AddChild( &m_textPercent );
pChild = pNode->GetChild( "PercentRemainder" );
if( !ShowDancePointsNotPercentage() && pChild != NULL )
if( !ShowDancePointsNotPercentage() && pChild != nullptr )
{
m_bUseRemainder = true;
m_textPercentRemainder.LoadFromNode( pChild );