4 files changed, 82 insertions, 6 deletions

@@ -668,7 +668,7 @@ void Game::setZoom(size_t zoom)
     muxer.setMusicLevel(0);
   } else if (zoomLevel < 3) {
     muxer.setMusicLevel(1);
-  } else if (zoomLevel < 5) {
+  } else if (zoomLevel < 4) {
     muxer.setMusicLevel(2);
   } else if (zoomLevel < 6) {
     muxer.setMusicLevel(3);
@@ -796,6 +796,12 @@ void Game::updatePlaying(size_t frameTime) {
 
           break;
         }
+
+        case SDLK_m:
+        {
+          muxer.toggleMute();
+          break;
+        }
       }
     }
   }
@@ -11,6 +11,9 @@ Menu::Menu() {
   items.push_back({.text = "Toggle Fullscreen", .activationFunction = [] (Game& game) {
     game.renderer.toggleFullscreen();
   }});
+  items.push_back({.text = "Toggle Music", .activationFunction = [] (Game& game) {
+    game.muxer.toggleMute();
+  }});
   items.push_back({.text = "Quit", .activationFunction = [this] (Game& game) {
     close();
     game.losing = LoseState::PoppingLamps;
@@ -39,6 +39,8 @@ void Muxer::setPlayerLoc(int x, int y) {
 }
 
 void Muxer::playSound(std::string name) {
+  if (muted_) return;
+
   std::string eventPath = std::string("event:/") + name;
 
   FMOD::Studio::EventDescription* eventDescription = nullptr;
@@ -51,6 +53,8 @@ void Muxer::playSound(std::string name) {
 }
 
 void Muxer::playSoundAtPosition(std::string name, float x, float y) {
+  if (muted_) return;
+
   std::string eventPath = std::string("event:/") + name;
 
   FMOD::Studio::EventDescription* eventDescription = nullptr;
@@ -72,14 +76,23 @@ void Muxer::playSoundAtPosition(std::string name, float x, float y) {
 void Muxer::setMusicLevel(int level) {
   if (transition_state_ == TransitionState::Pre) {
     if (level >= 3) {
-      transition_state_ = TransitionState::Transition;
       ERRCHECK(exploration_event_->stop(FMOD_STUDIO_STOP_ALLOWFADEOUT));
       ERRCHECK(exploration_event_->release());
 
-      FMOD::Studio::EventDescription* eventDescription = nullptr;
-      ERRCHECK(system_->getEvent("event:/transition", &eventDescription));
-      ERRCHECK(eventDescription->createInstance(&transition_event_));
-      ERRCHECK(transition_event_->start());
+      if (muted_) {
+        FMOD::Studio::EventDescription* eventDescription = nullptr;
+        ERRCHECK(system_->getEvent("event:/the_world", &eventDescription));
+        ERRCHECK(eventDescription->createInstance(&the_world_event_));
+        ERRCHECK(the_world_event_->start());
+        ERRCHECK(the_world_event_->setVolume(0));
+        transition_state_ = TransitionState::Post;
+      } else {
+        FMOD::Studio::EventDescription* eventDescription = nullptr;
+        ERRCHECK(system_->getEvent("event:/transition", &eventDescription));
+        ERRCHECK(eventDescription->createInstance(&transition_event_));
+        ERRCHECK(transition_event_->start());
+        transition_state_ = TransitionState::Transition;
+      }
     } else {
       ERRCHECK(exploration_event_->setParameterByName("level", level));
     }
@@ -98,6 +111,10 @@ void Muxer::startMusic() {
   ERRCHECK(exploration_desc->createInstance(&exploration_event_));
   ERRCHECK(exploration_event_->start());
 
+  if (muted_) {
+    ERRCHECK(exploration_event_->setVolume(0));
+  }
+
   transition_state_ = TransitionState::Pre;
 }
 
@@ -136,8 +153,55 @@ void Muxer::update() {
       ERRCHECK(system_->getEvent("event:/the_world", &eventDescription));
       ERRCHECK(eventDescription->createInstance(&the_world_event_));
       ERRCHECK(the_world_event_->start());
+      if (muted_) {
+        ERRCHECK(the_world_event_->setVolume(0));
+      }
     }
   }
 
   ERRCHECK(system_->update());
 }
+
+void Muxer::toggleMute() {
+  muted_ = !muted_;
+
+  if (muted_) {
+    switch (transition_state_) {
+      case TransitionState::Pre: {
+        ERRCHECK(exploration_event_->setVolume(0));
+        break;
+      }
+      case TransitionState::Transition: {
+        ERRCHECK(transition_event_->setVolume(0));
+        break;
+      }
+      case TransitionState::Post: {
+        ERRCHECK(the_world_event_->setVolume(0));
+        break;
+      }
+      case TransitionState::Stopped: {
+        // Do nothing.
+        break;
+      }
+    }
+  } else {
+    switch (transition_state_) {
+      case TransitionState::Pre: {
+        ERRCHECK(exploration_event_->setVolume(1));
+        break;
+      }
+      case TransitionState::Transition: {
+        ERRCHECK(transition_event_->setVolume(1));
+        break;
+      }
+      case TransitionState::Post: {
+        ERRCHECK(the_world_event_->setVolume(1));
+        break;
+      }
+      case TransitionState::Stopped: {
+        // Do nothing.
+        break;
+      }
+    }
+  }
+}
@@ -40,12 +40,15 @@ public:
 
   void update();
 
+  void toggleMute();
+
 private:
   fmod_system_ptr system_;
   FMOD::Studio::EventInstance* exploration_event_;
   FMOD::Studio::EventInstance* transition_event_;
   FMOD::Studio::EventInstance* the_world_event_;
   TransitionState transition_state_ = TransitionState::Pre;
+  bool muted_ = false;
 };
 
 #endif /* end of include guard: MUXER_H_3146C802 */