summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-13 19:10:50 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-13 21:20:33 +0300
commitfcf1da7a161c3e18d393a9b998effc6aa1c366b9 (patch)
tree5f92a8a168dd0748903cc90620a00c7c7bd29377 /src/resources
parentcd0baf3217701134a8e61932fd14c39cec0cf242 (diff)
downloadmv-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.tar.gz
mv-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.tar.bz2
mv-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.tar.xz
mv-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.zip
fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/openglimagehelper.cpp2
-rw-r--r--src/resources/sdlmusic.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 014c33362..2216659a3 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -215,6 +215,8 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage,
break;
case RENDER_SOFTWARE:
case RENDER_SDL2_DEFAULT:
+ case RENDER_NULL:
+ case RENDER_LAST:
default:
logger->log("Unknown OpenGL backend: %d", mUseOpenGL);
break;
diff --git a/src/resources/sdlmusic.cpp b/src/resources/sdlmusic.cpp
index 6f1d81731..ef8ebb56d 100644
--- a/src/resources/sdlmusic.cpp
+++ b/src/resources/sdlmusic.cpp
@@ -41,6 +41,9 @@ Resource *SDLMusic::load(SDL_RWops *const rw)
{
#ifdef USE_SDL2
if (Mix_Music *const music = Mix_LoadMUSType_RW(rw, MUS_OGG, 1))
+#elif defined ANDROID
+ // +++ here probably mem leak
+ if (Mix_Music *const music = Mix_LoadMUS_RW(rw))
#else
if (Mix_Music *const music = Mix_LoadMUSType_RW(rw, MUS_OGG, SDL_TRUE))
#endif