Corrects former commit which deleted sound file loading after the scene with malcolm and kallak.

Also corrects callback50() which seem to improve the sound a bit in the kallak writing scene.

svn-id: r21238
This commit is contained in:
Johannes Schickel 2006-03-12 17:08:46 +00:00
parent 72d2ef7221
commit 9d3136fb71
2 changed files with 3 additions and 2 deletions

View File

@ -646,6 +646,7 @@ void KyraEngine::startup() {
error("Could not load \"_NPC.EMC\" script");
}
snd_playTheme(1);
enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1);
if (_abortIntroFlag && _skipFlag) {

View File

@ -844,7 +844,7 @@ void AdlibDriver::setupDuration(uint8 duration, OutputState &state) {
debugC(9, kDebugLevelSound, "setupDuration(%d, %d)", duration, &state - _outputTables);
_continueFlag = duration;
if (state.unk11) {
state.unk5 = duration + (getRandomNr() & state.unk11 & 0xFF);
state.unk5 = duration + (getRandomNr() & state.unk11);
return;
}
if (state.unk12) {
@ -1666,7 +1666,7 @@ int AdlibDriver::updateCallback50(uint8 *&dataptr, OutputState &state, uint8 val
_unk4 = 0;
// Amplitude Modulation Depth / Vibrato Depth / Rhythm
writeOPL(0xBD, value & _unkOutputByte2);
writeOPL(0xBD, _unkOutputByte2 & 0xC0);
return 0;
}