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/GrooveRadar.cpp
+3 -3
View File
@@ -58,7 +58,7 @@ void GrooveRadar::LoadFromNode( const XNode* pNode )
void GrooveRadar::SetEmpty( PlayerNumber pn )
{
SetFromSteps( pn, NULL );
SetFromSteps( pn, nullptr );
}
void GrooveRadar::SetFromRadarValues( PlayerNumber pn, const RadarValues &rv )
@@ -66,9 +66,9 @@ void GrooveRadar::SetFromRadarValues( PlayerNumber pn, const RadarValues &rv )
m_GrooveRadarValueMap[pn].SetFromSteps( rv );
}
void GrooveRadar::SetFromSteps( PlayerNumber pn, Steps* pSteps ) // NULL means no Song
void GrooveRadar::SetFromSteps( PlayerNumber pn, Steps* pSteps ) // nullptr means no Song
{
if( pSteps == NULL )
if( pSteps == nullptr )
{
m_GrooveRadarValueMap[pn].SetEmpty();
return;