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/MusicWheelItem.cpp
+8 -8
View File
@@ -75,7 +75,7 @@ MusicWheelItem::MusicWheelItem( RString sType ):
FOREACH_ENUM( MusicWheelItemType, i )
{
m_pText[i] = NULL;
m_pText[i] = nullptr;
// Don't init text for Type_Song. It uses a TextBanner.
if( i == MusicWheelItemType_Song )
@@ -145,9 +145,9 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
FOREACH_ENUM( MusicWheelItemType, i )
{
if( cpy.m_pText[i] == NULL )
if( cpy.m_pText[i] == nullptr )
{
m_pText[i] = NULL;
m_pText[i] = nullptr;
}
else
{
@@ -308,13 +308,13 @@ void MusicWheelItem::RefreshGrades()
if(!IsLoaded()) { return; }
const MusicWheelItemData *pWID = dynamic_cast<const MusicWheelItemData*>( m_pData );
if( pWID == NULL )
if( pWID == nullptr )
return; // LoadFromWheelItemData() hasn't been called yet.
FOREACH_HumanPlayer( p )
{
m_pGradeDisplay[p]->SetVisible( false );
if( pWID->m_pSong == NULL && pWID->m_pCourse == NULL )
if( pWID->m_pSong == nullptr && pWID->m_pCourse == nullptr )
continue;
Difficulty dc;
@@ -346,19 +346,19 @@ void MusicWheelItem::RefreshGrades()
Profile *pProfile = PROFILEMAN->GetProfile(ps);
HighScoreList *pHSL = NULL;
HighScoreList *pHSL = nullptr;
if( PROFILEMAN->IsPersistentProfile(ps) && dc != Difficulty_Invalid )
{
if( pWID->m_pSong )
{
const Steps* pSteps = SongUtil::GetStepsByDifficulty( pWID->m_pSong, st, dc );
if( pSteps != NULL )
if( pSteps != nullptr )
pHSL = &pProfile->GetStepsHighScoreList(pWID->m_pSong, pSteps);
}
else if( pWID->m_pCourse )
{
const Trail *pTrail = pWID->m_pCourse->GetTrail( st, dc );
if( pTrail != NULL )
if( pTrail != nullptr )
pHSL = &pProfile->GetCourseHighScoreList( pWID->m_pCourse, pTrail );
}
}