aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2012-11-23 17:53:23 +0100
committerJohannes Schickel2012-11-23 17:56:22 +0100
commit415334fbe51b6c1332db11a113069c62c1141608 (patch)
tree45ae071e6c69e218227db83ad6d9f554f2b2855e
parentc11ab39e785103766d0f6785728ede7fb2908aae (diff)
downloadscummvm-rg350-415334fbe51b6c1332db11a113069c62c1141608.tar.gz
scummvm-rg350-415334fbe51b6c1332db11a113069c62c1141608.tar.bz2
scummvm-rg350-415334fbe51b6c1332db11a113069c62c1141608.zip
KYRA: Fix bug #3589441 "KYRA: LOL DOS is broken".
In fact it affected all DOS versions of the game. This is a regression from 93e69aa4da0558b05fc235684355ed38eed9863d.
-rw-r--r--engines/kyra/staticres_lol.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index c23aed33f3..4ee5b12b76 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -214,11 +214,19 @@ void StaticResource::freeButtonDefs(void *&ptr, int &size) {
}
void LoLEngine::initStaticResource() {
- // assign music resource data (not required for the PC version, resource loading is implemented differently there)
+ // assign music resource data.
if (_flags.isDemo) {
static const char *const file[] = { "LOREDEMO" };
SoundResourceInfo_TownsPC98V2 resInfoDemo(file, ARRAYSIZE(file), 0, 0, 0);
_sound->initAudioResourceInfo(kMusicIntro, &resInfoDemo);
+ } else if (_flags.platform == Common::kPlatformPC) {
+ static const char *const intro[] = { "LOREINTR" };
+ static const char *const finale[] = { "LOREFINL" };
+ SoundResourceInfo_PC resInfoIntro(intro, ARRAYSIZE(intro));
+ SoundResourceInfo_PC resInfoFinale(finale, ARRAYSIZE(finale));
+ _sound->initAudioResourceInfo(kMusicIntro, &resInfoIntro);
+ // In game music file handling is different, thus does not need a file list.
+ _sound->initAudioResourceInfo(kMusicFinale, &resInfoFinale);
} else if (_flags.platform == Common::kPlatformPC98) {
static const char *const fileListIntro[] = { 0, "lore84.86", "lore82.86", 0, 0, 0, "lore83.86", "lore81.86" };
static const char *const fileListFinale[] = { 0, 0, "lore85.86", "lore86.86", "lore87.86" };