summaryrefslogtreecommitdiff
path: root/src/sound.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-11 00:01:36 +0100
committerIra Rice <irarice@gmail.com>2009-02-10 20:19:45 -0700
commitd99b00a149e7828adb3c4651069483e51b0b458b (patch)
tree33f07f9d18dd006d10b14ff2dffbcbe337809d0c /src/sound.cpp
parentd268447e18c6e3edd80658f8f8d4317740c33af9 (diff)
downloadmana-client-d99b00a149e7828adb3c4651069483e51b0b458b.tar.gz
mana-client-d99b00a149e7828adb3c4651069483e51b0b458b.tar.bz2
mana-client-d99b00a149e7828adb3c4651069483e51b0b458b.tar.xz
mana-client-d99b00a149e7828adb3c4651069483e51b0b458b.zip
Removed many pointless comparisons with NULL
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
Diffstat (limited to 'src/sound.cpp')
-rw-r--r--src/sound.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sound.cpp b/src/sound.cpp
index 083ffb6a..5b8dedef 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -129,7 +129,7 @@ void Sound::playMusic(const std::string &filename, int loop)
{
if (!mInstalled) return;
- if (mMusic != NULL) {
+ if (mMusic) {
stopMusic();
}
@@ -155,7 +155,7 @@ void Sound::stopMusic()
logger->log("Sound::stopMusic()");
- if (mMusic != NULL) {
+ if (mMusic) {
Mix_HaltMusic();
Mix_FreeMusic(mMusic);
mMusic = NULL;
@@ -166,7 +166,7 @@ void Sound::fadeInMusic(const std::string &path, int loop, int ms)
{
if (!mInstalled) return;
- if (mMusic != NULL) {
+ if (mMusic) {
stopMusic();
}
@@ -189,7 +189,7 @@ void Sound::fadeOutMusic(int ms)
logger->log("Sound::fadeOutMusic() Fading-out (%i ms)", ms);
- if (mMusic != NULL) {
+ if (mMusic) {
Mix_FadeOutMusic(ms);
Mix_FreeMusic(mMusic);
mMusic = NULL;