diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/sound.cpp | 3 | ||||
| -rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_menu.cpp | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/xeen/sound.cpp b/engines/xeen/sound.cpp index 2fb88076c5..95aabbe266 100644 --- a/engines/xeen/sound.cpp +++ b/engines/xeen/sound.cpp @@ -173,8 +173,7 @@ void Sound::playSong(const Common::String &name, int param) { Common::File mf; if (mf.open(name)) { playSong(mf); - } - else { + } else { File f(name, _musicSide); playSong(f); } diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp index d1d6814cf1..7b60a70043 100644 --- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp +++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp @@ -146,6 +146,8 @@ DarkSideMainMenuContainer::DarkSideMainMenuContainer() : MainMenuContainer("titl Sound &sound = *g_vm->_sound; screen.loadPalette("dark.pal"); screen.fadeIn(0x81); + + sound._musicSide = 1; sound.playSong("newbrigh.m"); _background.load("title2.int"); @@ -168,6 +170,7 @@ void DarkSideMainMenuContainer::showMenuDialog() { WorldOfXeenMainMenuContainer::WorldOfXeenMainMenuContainer() : MainMenuContainer("world.int", 5) { Sound &sound = *g_vm->_sound; + sound._musicSide = 1; sound.playSong("newbrigh.m"); } @@ -179,7 +182,7 @@ void WorldOfXeenMainMenuContainer::loadBackground() { } void WorldOfXeenMainMenuContainer::showMenuDialog() { - setOwner(new CloudsMenuDialog(this)); + setOwner(new WorldMenuDialog(this)); } /*------------------------------------------------------------------------*/ @@ -402,7 +405,7 @@ void WorldMenuDialog::draw() { Window &w = windows[GAME_WINDOW]; w.frame(); - w.writeString(Common::String::format(Res.CLOUDS_MAIN_MENU, g_vm->_gameWon[0] ? 117 : 92)); + w.writeString(Res.WORLD_MAIN_MENU); drawButtons(&w); } |