summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-21 22:44:29 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-21 22:45:15 +0300
commit42f47e483da19079a937c4801ca94bd62d8dc970 (patch)
tree56dc96737e01e04d54357ce7118de3a1f000c516 /src/resources/loaders
parent2d8b9246c8003f1d32ba396bc19cc11bc5a595b2 (diff)
downloadmanaplus-42f47e483da19079a937c4801ca94bd62d8dc970.tar.gz
manaplus-42f47e483da19079a937c4801ca94bd62d8dc970.tar.bz2
manaplus-42f47e483da19079a937c4801ca94bd62d8dc970.tar.xz
manaplus-42f47e483da19079a937c4801ca94bd62d8dc970.zip
Remove useless else.
Diffstat (limited to 'src/resources/loaders')
-rw-r--r--src/resources/loaders/musicloader.cpp8
-rw-r--r--src/resources/loaders/soundloader.cpp9
2 files changed, 6 insertions, 11 deletions
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index f0b67cb67..e734ddce6 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -66,11 +66,9 @@ namespace
return new SDLMusic(music, rw, rl->path);
}
#endif // USE_SDL2
- else
- {
- logger->log("Error, failed to load music: %s", Mix_GetError());
- return nullptr;
- }
+
+ logger->log("Error, failed to load music: %s", Mix_GetError());
+ return nullptr;
}
};
} // namespace
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index a84898201..b99b48b6c 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -60,12 +60,9 @@ namespace
{
return new SoundEffect(tmpSoundEffect, rl->path);
}
- else
- {
- reportAlways("Error, failed to load sound effect: %s",
- Mix_GetError());
- return nullptr;
- }
+ reportAlways("Error, failed to load sound effect: %s",
+ Mix_GetError());
+ return nullptr;
}
};
} // namespace