summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-14 14:14:00 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-14 14:14:00 +0300
commit973ee7baf596df21da69952d362b73f0d77b6e09 (patch)
tree539d8ec8cedf5142f4fd5cb503297fc38c2ff590
parente648823e49474bc244c2d78998e40a121fa11658 (diff)
downloadmanaplus-973ee7baf596df21da69952d362b73f0d77b6e09.tar.gz
manaplus-973ee7baf596df21da69952d362b73f0d77b6e09.tar.bz2
manaplus-973ee7baf596df21da69952d362b73f0d77b6e09.tar.xz
manaplus-973ee7baf596df21da69952d362b73f0d77b6e09.zip
fix compilation with old SDL versions.
-rw-r--r--src/resources/sdlmusic.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/resources/sdlmusic.cpp b/src/resources/sdlmusic.cpp
index 1a6bb7020..fb31c0562 100644
--- a/src/resources/sdlmusic.cpp
+++ b/src/resources/sdlmusic.cpp
@@ -41,11 +41,10 @@ Resource *SDLMusic::load(SDL_RWops *const rw)
{
#ifdef USE_SDL2
if (Mix_Music *const music = Mix_LoadMUSType_RW(rw, MUS_OGG, 1))
-#elif defined(WIN32) || defined ANDROID
+#else
// +++ here probably mem leak
+ // Mix_LoadMUSType_RW was added without version changed in SDL1.2 :(
if (Mix_Music *const music = Mix_LoadMUS_RW(rw))
-#else
- if (Mix_Music *const music = Mix_LoadMUSType_RW(rw, MUS_OGG, SDL_TRUE))
#endif
{
return new SDLMusic(music);