diff options
| author | Einar Johan Trøan Sømåen | 2013-01-26 18:06:42 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-01-26 18:07:07 +0100 |
| commit | 980dc4a456f55a8b6526d2bc6f7694a0b2d666b3 (patch) | |
| tree | bef13619df90984b731795e72721da7d39089041 /engines/wintermute/base/base_game_music.cpp | |
| parent | 6ae97cdfbe88fa34363aabc46847b0c9a32eefe5 (diff) | |
| download | scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.gz scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.bz2 scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.zip | |
WINTERMUTE: Replace all NULLs with nullptr.
Diffstat (limited to 'engines/wintermute/base/base_game_music.cpp')
| -rw-r--r-- | engines/wintermute/base/base_game_music.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/base/base_game_music.cpp b/engines/wintermute/base/base_game_music.cpp index 365fa6e212..8dff41d854 100644 --- a/engines/wintermute/base/base_game_music.cpp +++ b/engines/wintermute/base/base_game_music.cpp @@ -39,7 +39,7 @@ namespace Wintermute { BaseGameMusic::BaseGameMusic(BaseGame *gameRef) : _gameRef(gameRef) { for (int i = 0; i < NUM_MUSIC_CHANNELS; i++) { - _music[i] = NULL; + _music[i] = nullptr; _musicStartTime[i] = 0; } @@ -54,7 +54,7 @@ BaseGameMusic::BaseGameMusic(BaseGame *gameRef) : _gameRef(gameRef) { void BaseGameMusic::cleanup() { for (int i = 0; i < NUM_MUSIC_CHANNELS; i++) { delete _music[i]; - _music[i] = NULL; + _music[i] = nullptr; _musicStartTime[i] = 0; } } @@ -67,7 +67,7 @@ bool BaseGameMusic::playMusic(int channel, const char *filename, bool looping, u } delete _music[channel]; - _music[channel] = NULL; + _music[channel] = nullptr; _music[channel] = new BaseSound(_gameRef); if (_music[channel] && DID_SUCCEED(_music[channel]->setSound(filename, Audio::Mixer::kMusicSoundType, true))) { @@ -81,7 +81,7 @@ bool BaseGameMusic::playMusic(int channel, const char *filename, bool looping, u return _music[channel]->play(looping); } else { delete _music[channel]; - _music[channel] = NULL; + _music[channel] = nullptr; return STATUS_FAILED; } } @@ -97,7 +97,7 @@ bool BaseGameMusic::stopMusic(int channel) { if (_music[channel]) { _music[channel]->stop(); delete _music[channel]; - _music[channel] = NULL; + _music[channel] = nullptr; return STATUS_OK; } else { return STATUS_FAILED; @@ -494,7 +494,7 @@ bool BaseGameMusic::scCallMethod(ScScript *script, ScStack *stack, ScStack *this if (sound && DID_SUCCEED(sound->setSound(filename, Audio::Mixer::kMusicSoundType, true))) { length = sound->getLength(); delete sound; - sound = NULL; + sound = nullptr; } stack->pushInt(length); return STATUS_OK; |