diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/sound.cpp | |
parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
download | mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/sound.cpp')
-rw-r--r-- | src/sound.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sound.cpp b/src/sound.cpp index 39c5a72aa..a573458ef 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -51,7 +51,7 @@ Sound::Sound(): mInstalled(false), mSfxVolume(100), mMusicVolume(60), - mMusic(0), + mMusic(nullptr), mPlayBattle(false), mPlayGui(false), mPlayMusic(false), @@ -202,7 +202,7 @@ static Mix_Music *loadMusic(const std::string &filename) if (success) path = resman->getPath("tempMusic.ogg"); else - return NULL; + return nullptr; } else { @@ -210,7 +210,7 @@ static Mix_Music *loadMusic(const std::string &filename) } if (path.empty()) - return 0; + return nullptr; Mix_Music *music = Mix_LoadMUS(path.c_str()); @@ -247,7 +247,7 @@ void Sound::stopMusic() { Mix_HaltMusic(); Mix_FreeMusic(mMusic); - mMusic = NULL; + mMusic = nullptr; } } @@ -298,7 +298,7 @@ void Sound::logic() if (mMusic) { Mix_FreeMusic(mMusic); - mMusic = NULL; + mMusic = nullptr; } sFadingOutEnded = false; @@ -380,7 +380,7 @@ void Sound::haltMusic() Mix_HaltMusic(); Mix_FreeMusic(mMusic); - mMusic = NULL; + mMusic = nullptr; } void Sound::changeAudio() |