Merge pull request #216 from TakaRikka/feature/MDH-no-cut

Non-Stop Midna's Lament Audio Enhancement

include/dusk/settings.h

@@ -45,6 +45,9 @@ struct UserSettings {
         bool enableBloom;
         bool useWaterProjectionOffset;
 
+        // Audio
+        bool midnasLamentNonStop;
+
         // Cheats
         bool enableFastIronBoots;
 

src/Z2AudioLib/Z2SoundObjMgr.cpp

@@ -107,6 +107,15 @@ static Z2EnemyInfo mEnemyInfo[64] = {
 void Z2SoundObjMgr::searchEnemy() {
     twilightBattle_ = 0;
 
+    #if TARGET_PC
+    if (Z2GetSeqMgr()->checkBgmIDPlaying(Z2BGM_MIDNA_SOS) &&
+        dusk::getSettings().game.midnasLamentNonStop)
+    {
+        Z2GetSeqMgr()->changeSubBgmStatus(0);
+        return;
+    }
+    #endif
+
     if (!Z2GetLink()) {
         Z2GetSeqMgr()->stopBattleBgm(1, 1);
         return;

src/dusk/imgui/ImGuiMenuEnhancements.cpp

@@ -67,6 +67,15 @@ namespace dusk {
                 ImGui::EndMenu();
             }
 
+            if (ImGui::BeginMenu("Audio")) {
+                ImGui::Checkbox("Non-Stop Midna's Lament", &getSettings().game.midnasLamentNonStop);
+                if (ImGui::IsItemHovered()) {
+                    ImGui::SetTooltip("Prevents enemy music while Midna's Lament is playing");
+                }
+
+                ImGui::EndMenu();
+            }
+
             if (ImGui::BeginMenu("Cheats")) {
                 ImGui::Checkbox("Fast Iron Boots", &getSettings().game.enableFastIronBoots);
 

src/dusk/settings.cpp

@@ -41,6 +41,9 @@ UserSettings g_userSettings = {
         .enableBloom = true,
         .useWaterProjectionOffset = false,
 
+        // Audio
+        .midnasLamentNonStop = false,
+
         // Cheats
         .enableFastIronBoots = false,