summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/sdlmusic.cpp3
-rw-r--r--src/resources/sdlmusic.h2
-rw-r--r--src/resources/spritedef.cpp2
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)
{