Release v0.3

abodelot · Oct 23, 2019 · 358bbb5 · 358bbb5
1 parent 0421629
commit 358bbb5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/Core/Config.hpp b/src/Core/Config.hpp
@@ -9,7 +9,7 @@
 #define APP_FPS           60
 
 #define APP_AUTHOR        "Alexandre Bodelot"
-#define APP_VERSION       "0.2"
+#define APP_VERSION       "0.3"
 #define APP_URL           "https://github.com/abodelot/wallbreaker"
 
 // Paths

diff --git a/src/Core/Game.cpp b/src/Core/Game.cpp
@@ -138,6 +138,8 @@ void Game::quit()
     config.set("sound",      SoundSystem::isSoundEnabled());
     config.set("music",      SoundSystem::isMusicEnabled());
     config.save(m_appDir + APP_SETTINGS_FILE);
+
+    SoundSystem::stopAll();
 }
 
 

diff --git a/src/Core/SoundSystem.cpp b/src/Core/SoundSystem.cpp
@@ -2,13 +2,13 @@
 #include "Resources.hpp"
 
 
-sf::Sound        SoundSystem::m_sounds[MAX_SOUNDS];
-int              SoundSystem::m_last_sound_played = 0;
-sf::Music        SoundSystem::m_music;
-int              SoundSystem::m_music_volume = 100;
-int              SoundSystem::m_sound_volume = 100;
-bool             SoundSystem::m_enable_music = true;
-bool             SoundSystem::m_enable_sound = true;
+sf::Sound SoundSystem::m_sounds[MAX_SOUNDS];
+int       SoundSystem::m_last_sound_played = 0;
+sf::Music SoundSystem::m_music;
+int       SoundSystem::m_music_volume = 100;
+int       SoundSystem::m_sound_volume = 100;
+bool      SoundSystem::m_enable_music = true;
+bool      SoundSystem::m_enable_sound = true;
 
 template <class T>
 static inline void clamp(T& value, T min, T max)
@@ -54,7 +54,7 @@ void SoundSystem::pauseMusic()
 }
 
 
-void SoundSystem::playSound(const std::string& sound_name, float pitch)
+void SoundSystem::playSound(const std::string& filename, float pitch)
 {
     if (m_enable_sound)
     {
@@ -67,7 +67,7 @@ void SoundSystem::playSound(const std::string& sound_name, float pitch)
         {
             sound.stop();
         }
-        sound.setBuffer(Resources::getSoundBuffer(sound_name));
+        sound.setBuffer(Resources::getSoundBuffer(filename));
         sound.setPitch(pitch);
         sound.play();
         ++m_last_sound_played;

diff --git a/src/Core/SoundSystem.hpp b/src/Core/SoundSystem.hpp
@@ -21,7 +21,7 @@ class SoundSystem
     /**
      * Play a sound effect
      */
-    static void playSound(const std::string& sound_name, float pitch = 1.f);
+    static void playSound(const std::string& filename, float pitch = 1.f);
 
     /**
      * Control music volume