4 files changed, 35 insertions, 2 deletions

@@ -20,6 +20,7 @@ struct MenuItem {
   bool playSfx = true;
   int value = 0;
   int maxValue = 0;
+  std::function<void(MenuItem&)> selectionChanged;
 };
 
 class MenuBuilder {
@@ -57,6 +58,11 @@ public:
     return *this;
   }
 
+  MenuBuilder& SelectionChangedFunction(std::function<void(MenuItem&)> val) {
+    result_.selectionChanged = std::move(val);
+    return *this;
+  }
+
   MenuItem Build() const {
     return result_;
   }
@@ -55,8 +55,15 @@ void MenuSystem::openPauseMenu() {
                  .ActivationFunction([this] (Game&) {
                    openSubmenu(Menu({
                      MenuBuilder().Slider("Music Volume: ")
-                                  .InitialValue(10)
-                                  .MaxValue(10),
+                                  .InitialValue(game_.getMixer().isMusicMuted() ? 0 : game_.getMixer().getMusicVolume())
+                                  .MaxValue(10)
+                                  .SelectionChangedFunction([this] (MenuItem& menuItem) {
+                                    if (game_.getMixer().isMusicMuted()) {
+                                      menuItem.value = game_.getMixer().getMusicVolume();
+                                    }
+
+                                    game_.getMixer().setMusicVolume(menuItem.value);
+                                  }),
                      MenuBuilder().Slider("Sound Volume: ")
                                   .InitialValue(10)
                                   .MaxValue(10),
@@ -135,6 +142,10 @@ void MenuSystem::pressedLeft() {
   if (menuItem.type == MenuType::Slider && menuItem.value > 0) {
     menuItem.value--;
 
+    if (menuItem.selectionChanged) {
+      menuItem.selectionChanged(menuItem);
+    }
+
     game_.getMixer().playSound("../res/sfx/horizontal_menu.wav");
   }
 }
@@ -146,6 +157,10 @@ void MenuSystem::pressedRight() {
   if (menuItem.type == MenuType::Slider && menuItem.value < menuItem.maxValue) {
     menuItem.value++;
 
+    if (menuItem.selectionChanged) {
+      menuItem.selectionChanged(menuItem);
+    }
+
     game_.getMixer().playSound("../res/sfx/horizontal_menu.wav");
   }
 }
@@ -1,4 +1,5 @@
 #include "mixer.h"
+#include <iostream>
 
 void Mixer::playSound(std::string_view filename) {
   Mix_Chunk* chunk = getChunkByFilename(std::string(filename));
@@ -66,6 +67,12 @@ void Mixer::unmuteMusic() {
   musicMuted_ = false;
 }
 
+void Mixer::setMusicVolume(int vol) {
+  musicVolume_ = MIX_MAX_VOLUME / 10.0 * vol;
+  musicMuted_ = false;
+  Mix_VolumeMusic(musicVolume_);
+}
+
 void Mixer::pauseMusic() {
   Mix_PauseMusic();
 }
@@ -2,6 +2,7 @@
 #define MIXER_H_6DF82000
 
 #include <SDL_mixer.h>
+#include <cmath>
 #include <memory>
 #include <stdexcept>
 #include <map>
@@ -92,6 +93,10 @@ public:
 
   bool isMusicMuted() const { return musicMuted_; }
 
+  int getMusicVolume() const { return std::round(static_cast<double>(musicVolume_) / MIX_MAX_VOLUME * 10); }
+
+  void setMusicVolume(int vol);
+
   void pauseMusic();
 
   void unpauseMusic();