Integrate C++11 branch into 5_1-new

This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
444 changed files with 19503 additions and 21007 deletions
+2 -2
View File
@@ -21,7 +21,7 @@ public:
{
PlayMusicParams()
{
pTiming = NULL;
pTiming = nullptr;
bForceLoop = false;
fStartSecond = 0;
fLengthSeconds = -1;
@@ -44,7 +44,7 @@ public:
void PlayMusic( PlayMusicParams params, PlayMusicParams FallbackMusicParams = PlayMusicParams() );
void PlayMusic(
RString sFile,
const TimingData *pTiming = NULL,
const TimingData *pTiming = nullptr,
bool force_loop = false,
float start_sec = 0,
float length_sec = -1,