Use shared menu_music helper

Switch main menu music start/pause logic to libstorm-nvgt/menu_music.nvgt and update the libstorm-nvgt submodule pointer to include the new reusable helper.
This commit is contained in:
Storm Dragon
2026-02-16 20:57:34 -05:00
parent 4d5bb7c2fa
commit 51599c9b99
2 changed files with 4 additions and 10 deletions

View File

@@ -25,6 +25,7 @@ sound_pool p(300);
#include "src/world_state.nvgt" #include "src/world_state.nvgt"
#include "libstorm-nvgt/ui.nvgt" #include "libstorm-nvgt/ui.nvgt"
#include "libstorm-nvgt/menu_helpers.nvgt" #include "libstorm-nvgt/menu_helpers.nvgt"
#include "libstorm-nvgt/menu_music.nvgt"
#include "src/terrain_lookup.nvgt" #include "src/terrain_lookup.nvgt"
#include "src/inventory.nvgt" #include "src/inventory.nvgt"
#include "src/pet_system.nvgt" #include "src/pet_system.nvgt"
@@ -56,18 +57,11 @@ const int MAIN_MENU_LEARN_SOUNDS = 2;
const int MAIN_MENU_EXIT = 3; const int MAIN_MENU_EXIT = 3;
void start_main_menu_music() { void start_main_menu_music() {
if (mainMenuMusic.resume(MAIN_MENU_MUSIC_FADE_IN_MS)) return; menu_music_resume_or_play(mainMenuMusic, MAIN_MENU_MUSIC_TRACK, MAIN_MENU_MUSIC_FADE_IN_MS);
if (mainMenuMusic.playing) {
mainMenuMusic.pause(0);
mainMenuMusic.resume(MAIN_MENU_MUSIC_FADE_IN_MS);
return;
}
mainMenuMusic.play(MAIN_MENU_MUSIC_TRACK);
} }
void stop_main_menu_music() { void stop_main_menu_music() {
if (!mainMenuMusic.playing) return; menu_music_pause(mainMenuMusic, MAIN_MENU_MUSIC_FADE_OUT_MS);
mainMenuMusic.pause(MAIN_MENU_MUSIC_FADE_OUT_MS);
} }
int run_main_menu() { int run_main_menu() {