summaryrefslogtreecommitdiff
path: root/src/koopatlas/mapmusic.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/koopatlas/mapmusic.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/koopatlas/mapmusic.cpp b/src/koopatlas/mapmusic.cpp
index 1ccd775..8fdf264 100644
--- a/src/koopatlas/mapmusic.cpp
+++ b/src/koopatlas/mapmusic.cpp
@@ -13,7 +13,6 @@ static int s_countdownToSwitch = -1;
static int s_countdownToFadeIn = -1;
static dDvdLoader_c s_adpcmInfoLoader;
-static bool s_adpcmInfoLoaded = false;
#define FADE_OUT_LEN 30
#define FADE_IN_LEN 30
@@ -59,12 +58,11 @@ extern "C" void DVDCancel(void *crap);
extern "C" void AxVoice_SetADPCM(void *axVoice, void *adpcm);
extern "C" void Voice_SetADPCMLoop(void *voice, int channel, void *adpcmLoop);
-void dKPMusic::execute() {
- if (!s_adpcmInfoLoaded) {
- if (s_adpcmInfoLoader.load("/NewerRes/MapADPCMInfo.bin"))
- s_adpcmInfoLoaded = true;
- }
+bool dKPMusic::loadInfo() {
+ return s_adpcmInfoLoader.load("/NewerRes/MapADPCMInfo.bin");
+}
+void dKPMusic::execute() {
if (!s_playing)
return;