[Scummvm-cvs-logs] SF.net SVN: scummvm: [21238] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Mar 12 09:09:01 CET 2006
Revision: 21238
Author: lordhoto
Date: 2006-03-12 09:08:46 -0800 (Sun, 12 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21238&view=rev
Log Message:
-----------
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.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/sound_adlib.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2006-03-12 17:05:59 UTC (rev 21237)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2006-03-12 17:08:46 UTC (rev 21238)
@@ -646,6 +646,7 @@
error("Could not load \"_NPC.EMC\" script");
}
+ snd_playTheme(1);
enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1);
if (_abortIntroFlag && _skipFlag) {
Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp 2006-03-12 17:05:59 UTC (rev 21237)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp 2006-03-12 17:08:46 UTC (rev 21238)
@@ -844,7 +844,7 @@
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 @@
_unk4 = 0;
// Amplitude Modulation Depth / Vibrato Depth / Rhythm
- writeOPL(0xBD, value & _unkOutputByte2);
+ writeOPL(0xBD, _unkOutputByte2 & 0xC0);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list