thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable music support in the finale of Kyrandia 1 Amiga.

Browse source 
svn-id: r43335
This commit is contained in:
Johannes Schickel 2009-08-12 23:23:44 +00:00
parent cbc0b9e480
commit 0a17555e73
3 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -769,7 +769,7 @@ site, please see the section on reporting bugs.
original game. original game.
The Legend of Kyrandia: The Legend of Kyrandia:
- No music or sound effects in the Amiga and Macintosh floppy versions. - No music or sound effects in the Macintosh floppy versions.
- Macintosh CD is using included DOS music and sound effects. - Macintosh CD is using included DOS music and sound effects.
- PC-9821 version lacks support for sound effects. - PC-9821 version lacks support for sound effects.

8
engines/kyra/sequences_lok.cpp
View file

@ -994,6 +994,14 @@ int KyraEngine_LoK::seq_playEnd() {
snd_playWanderScoreViaMap(50, 1); snd_playWanderScoreViaMap(50, 1);
setupPanPages(); setupPanPages();
if (_flags.platform == Common::kPlatformAmiga) {
_sound->loadSoundFile(kMusicFinale);
// The original used 0 here. Due to how our Sound code
// is implemented we need to use track 10 here though.
_sound->playTrack(10);
}
_finalA = createWSAMovie(); _finalA = createWSAMovie();
assert(_finalA); assert(_finalA);
_finalA->open("finala.wsa", 1, 0); _finalA->open("finala.wsa", 1, 0);

23
engines/kyra/sound_amiga.cpp
View file

@ -205,10 +205,11 @@ void SoundAmiga::playSoundEffect(uint8 track) {
switch (_fileLoaded) { switch (_fileLoaded) {
case kFileFinal: case kFileFinal:
case kFileIntro: case kFileIntro:
assert(track < 40); // We only allow playing of sound effects, which are included in the table.
if (track < 40) {
tableEntry = &_tableSfxIntro[track * 8]; tableEntry = &_tableSfxIntro[track * 8];
pan = (sfxTableGetPan(tableEntry) != 0); pan = (sfxTableGetPan(tableEntry) != 0);
}
break; break;
case kFileGame: case kFileGame:
@ -216,12 +217,14 @@ void SoundAmiga::playSoundEffect(uint8 track) {
if (0x61 <= track && track <= 0x63) if (0x61 <= track && track <= 0x63)
playTrack(track - 0x4F); playTrack(track - 0x4F);
assert(track < 120); // We only allow playing of sound effects, which are included in the table.
// variable(0x1BFE4) && tableEffectsGame[track].note, which gets set for ingame and unset for finale if (track < 120) {
// (and some function reverses its state) // variable(0x1BFE4) && tableEffectsGame[track].note, which gets set for ingame and unset for finale
if (sfxTableGetNote(&_tableSfxGame[track * 8])) { // (and some function reverses its state)
tableEntry = &_tableSfxGame[track * 8]; if (sfxTableGetNote(&_tableSfxGame[track * 8])) {
pan = (sfxTableGetPan(tableEntry) != 0) && (sfxTableGetPan(tableEntry) != 2); tableEntry = &_tableSfxGame[track * 8];
pan = (sfxTableGetPan(tableEntry) != 0) && (sfxTableGetPan(tableEntry) != 2);
}
} }
break; break;
default: default: