Integrate C++11 branch into 5_1-new
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user