Fixed console spam when music files are not installed

Closes #359

3 files changed, 13 insertions, 1 deletions

diff --git a/src/sound/oalsound/alsound.cpp b/src/sound/oalsound/alsound.cpp
index 0d8fe74..6dd991b 100644
--- a/src/sound/oalsound/alsound.cpp
+++ b/src/sound/oalsound/alsound.cpp
@@ -181,6 +181,16 @@ bool ALSound::CacheMusic(const std::string &filename)
     return false;
 }
 
+bool ALSound::IsCached(Sound sound)
+{
+    return m_sounds.find(sound) != m_sounds.end();
+}
+
+bool ALSound::IsCachedMusic(const std::string &filename)
+{
+    return m_music.find("music/"+filename) != m_music.end();
+}
+
 int ALSound::GetPriority(Sound sound)
 {
     if ( sound == SOUND_FLYh   ||
diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h
index 08caac3..895b5ac 100644
--- a/src/sound/oalsound/alsound.h
+++ b/src/sound/oalsound/alsound.h
@@ -53,6 +53,8 @@ public:
     bool Create() override;
     bool Cache(Sound, const std::string &) override;
     bool CacheMusic(const std::string &) override;
+    bool IsCached(Sound) override;
+    bool IsCachedMusic(const std::string &) override;
 
     bool GetEnable() override;
 
diff --git a/src/sound/oalsound/buffer.cpp b/src/sound/oalsound/buffer.cpp
index 7584767..df31b82 100644
--- a/src/sound/oalsound/buffer.cpp
+++ b/src/sound/oalsound/buffer.cpp
@@ -58,7 +58,7 @@ bool Buffer::LoadFromFile(std::string filename, Sound sound)
 
     if (!file->IsOpen())
     {
-        GetLogger()->Warn("Could not load file. Reason: %s\n", file->GetLastError().c_str());
+        GetLogger()->Warn("Could not load file %s. Reason: %s\n", filename.c_str(), file->GetLastError().c_str());
         m_loaded = false;
         return false;
     }