diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 1de8cab11ac..1e4c78e5c8f 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -138,7 +138,7 @@ Common::Error LoLEngine::go() { setupPrologueData(true); break; - case 2: // "Lore of the Lands" + case 2: // "Lore of the Lands" (only CD version) break; case 3: // Load game @@ -192,6 +192,9 @@ void LoLEngine::preInit() { memset(pal, 0, 768); _screen->setScreenPalette(pal); + // TODO: We need to check if the SYSEX events of intro and ingame differ. + // If they really need to setup the proper ingame sysex when starting + // the game. But the place to do it would not be here in our code! /*if (_sound->getMusicType() == Sound::kMidiMT32 || _sound->getSfxType() == Sound::kMidiMT32) { _sound->loadSoundFile("LOLSYSEX"); _sound->playTrack(0); @@ -261,7 +264,7 @@ int LoLEngine::mainMenu() { assert(menu); menu->init(data, MainMenu::Animation()); - int selection = menu->handle(_flags.isTalkie ? (hasSave ? 12 : 6) :(hasSave ? 6 : 13)); + int selection = menu->handle(_flags.isTalkie ? (hasSave ? 12 : 6) : (hasSave ? 6 : 13)); delete menu; if (!_flags.isTalkie && selection >= 2) diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 674d3e172d3..6653a6b47e4 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -2369,8 +2369,8 @@ const ScreenDim Screen_LoL::_screenDimTable[] = { { 0x07, 0x19, 0x1A, 0x97, 0x00, 0x00, 0x00, 0x00 }, { 0x03, 0x1E, 0x22, 0x8C, 0x00, 0x00, 0x00, 0x00 }, { 0x02, 0x48, 0x24, 0x34, 0x00, 0x00, 0x00, 0x00 }, - { 0x0B, 0x8C, 0x10, 0x33, 0x3D, 0x01, 0x00, 0x00 }, // Main menu box (5 entries) - { 0x0B, 0x8C, 0x10, 0x23, 0x3D, 0x01, 0x00, 0x00 } // Main menu box (3 entries) + { 0x0B, 0x8C, 0x10, 0x33, 0x3D, 0x01, 0x00, 0x00 }, // Main menu box (5 entries, CD version only) + { 0x0B, 0x8C, 0x10, 0x23, 0x3D, 0x01, 0x00, 0x00 } // Main menu box (3 entries, floppy version only) }; const int Screen_LoL::_screenDimTableCount = ARRAYSIZE(Screen_LoL::_screenDimTable);