diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-09-19 20:59:49 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-09-19 20:59:49 +0300 |
commit | 378441b559615cc96150e64137ae2ce02d23d2f2 (patch) | |
tree | 10ceb5467000747f3b1d6f41c96ca5a595f57d4f /src/resources | |
parent | 11209f8ab3bfc738f0249e0cdfe6400f73cb0b85 (diff) | |
download | manaplus-378441b559615cc96150e64137ae2ce02d23d2f2.tar.gz manaplus-378441b559615cc96150e64137ae2ce02d23d2f2.tar.bz2 manaplus-378441b559615cc96150e64137ae2ce02d23d2f2.tar.xz manaplus-378441b559615cc96150e64137ae2ce02d23d2f2.zip |
fix some compilation issues in different platforms.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/sdlmusic.cpp | 3 | ||||
-rw-r--r-- | src/resources/sdlmusic.h | 2 | ||||
-rw-r--r-- | src/resources/spritedef.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/resources/sdlmusic.cpp b/src/resources/sdlmusic.cpp index 03c6922d6..b9f6492d1 100644 --- a/src/resources/sdlmusic.cpp +++ b/src/resources/sdlmusic.cpp @@ -51,13 +51,14 @@ Resource *SDLMusic::load(SDL_RWops *const rw) if (Mix_Music *const music = Mix_LoadMUSType_RW(rw, MUS_OGG, 1)) { return new SDLMusic(music, nullptr); + } #else // Mix_LoadMUSType_RW was added without version changed in SDL1.2 :( if (Mix_Music *const music = Mix_LoadMUS_RW(rw)) { return new SDLMusic(music, rw); -#endif } +#endif else { logger->log("Error, failed to load music: %s", Mix_GetError()); diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h index 23397ec61..04b78bde9 100644 --- a/src/resources/sdlmusic.h +++ b/src/resources/sdlmusic.h @@ -29,8 +29,6 @@ #include "localconsts.h" -//struct SDL_RWops; - /** * Defines a class for loading and storing music. */ diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 2d5d25fb4..a855e90ba 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -237,7 +237,7 @@ void SpriteDef::loadAction(const XmlNodePtr node, const int variant_offset) imageSetName.c_str(), getIdPath().c_str()); return; } - ImageSet *const imageSet = si->second; + const ImageSet *const imageSet = si->second; if (actionName == SpriteAction::INVALID) { |