From 71e7da17038abf6437ec547ed9adf02fd77d6421 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 2 Jul 2001 16:29:53 +0000 Subject: [PATCH] --- source/map/map.cpp | 5 +++++ source/sound/sound.cpp | 4 ++++ source/sound/sound.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/source/map/map.cpp b/source/map/map.cpp index bf708fcef..a1e99ef1b 100644 --- a/source/map/map.cpp +++ b/source/map/map.cpp @@ -212,6 +212,9 @@ void CMapScene::init() m_readyToExit=false; CFader::setFadingIn(); + + CSoundMediator::setSong(CSoundMediator::SONG_MAPSCREEN); + CSoundMediator::playSong(); } @@ -223,6 +226,8 @@ void CMapScene::init() ---------------------------------------------------------------------- */ void CMapScene::shutdown() { + CSoundMediator::dumpSong(); + ClearScreenImage(); delete m_pointerIcon; MemFree(m_mapBackgroundImage); diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp index b5edc43ce..7e1ad4bf6 100644 --- a/source/sound/sound.cpp +++ b/source/sound/sound.cpp @@ -103,6 +103,10 @@ static XMSONGDATA s_xmSongData[CSoundMediator::NUM_SONGIDS]= { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x13 }, // SONG_MEMORYCARD { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x14 }, // SONG_GAMECOMPLETE { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x23 }, // SONG_GAMEOVER + { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x25 }, // SONG_PARTY + { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x2c }, // SONG_MEMCARD2 + { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x2f }, // SONG_MAPSCREEN + { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x33 }, // SONG_SHOPSCREEN { MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x19 }, // SONG_CHAPTER1_LEVEL1, { MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x2d }, // SONG_CHAPTER1_LEVEL2, { MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x00 }, // SONG_CHAPTER1_LEVEL3, diff --git a/source/sound/sound.h b/source/sound/sound.h index 2b9084994..1dc83d9be 100644 --- a/source/sound/sound.h +++ b/source/sound/sound.h @@ -49,7 +49,7 @@ class CSoundMediator public: typedef enum SONGID { - SONG_TITLE, SONG_OPTIONS, SONG_MEMORYCARD, SONG_GAMECOMPLETE, SONG_GAMEOVER, + SONG_TITLE, SONG_OPTIONS, SONG_MEMORYCARD, SONG_GAMECOMPLETE, SONG_GAMEOVER, SONG_PARTY, SONG_MEMCARD2, SONG_MAPSCREEN, SONG_SHOPSCREEN, SONG_CHAPTER1_LEVEL1, SONG_CHAPTER1_LEVEL2, SONG_CHAPTER1_LEVEL3, SONG_CHAPTER1_LEVEL4, SONG_CHAPTER1_BOSS, SONG_CHAPTER2_LEVEL1, SONG_CHAPTER2_LEVEL2, SONG_CHAPTER2_LEVEL3, SONG_CHAPTER2_LEVEL4, SONG_CHAPTER2_BOSS, SONG_CHAPTER3_LEVEL1, SONG_CHAPTER3_LEVEL2, SONG_CHAPTER3_LEVEL3, SONG_CHAPTER3_LEVEL4, SONG_CHAPTER3_BOSS_ALSEEP, SONG_CHAPTER3_BOSS_AWAKE,