Integrate C++11 branch into 5_1-new

2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
@@ -12,8 +12,8 @@ SoundEffectControl::SoundEffectControl()
 	m_bLocked = false;
 	m_fSample = 0.0f;
 	m_fLastLevel = 0.0f;
-	m_pPlayerState = NULL;
-	m_pNoteData = NULL;
+	m_pPlayerState = nullptr;
+	m_pNoteData = nullptr;
 }

 void SoundEffectControl::Load( const RString &sType, PlayerState *pPlayerState, const NoteData *pNoteData )