aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-06-16 23:30:15 +1000
committerPaul Gilbert2011-06-16 23:30:15 +1000
commit7428e646d51ae0c666621fe0f407ad1096c6566e (patch)
treec308819f46041eb6461d4329f51735c9742b2341
parent15bc708610822d98133ff5fefb52ca55fa8ddd83 (diff)
downloadscummvm-rg350-7428e646d51ae0c666621fe0f407ad1096c6566e.tar.gz
scummvm-rg350-7428e646d51ae0c666621fe0f407ad1096c6566e.tar.bz2
scummvm-rg350-7428e646d51ae0c666621fe0f407ad1096c6566e.zip
TSAGE: Minor bugfix to sound fading code
-rw-r--r--engines/tsage/sound.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 61254bb21f..79cd08b6fc 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -382,7 +382,7 @@ void SoundManager::_sfProcessFading() {
sfManager()._needToRethink = true;
}
- if (s->_fadeDest != 255) {
+ if (s->_fadeDest != -1) {
if (s->_fadeCounter != 0)
--s->_fadeCounter;
else {
@@ -2382,7 +2382,7 @@ AdlibSoundDriver::AdlibSoundDriver(): SoundDriver() {
_sampleRate = _mixer->getOutputRate();
_opl = makeAdLibOPL(_sampleRate);
- memset(_channelVoiced, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
+ Common::set_to(_channelVoiced, _channelVoiced + ADLIB_CHANNEL_COUNT, false);
memset(_channelVolume, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
memset(_v4405E, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
memset(_v44067, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
@@ -2518,7 +2518,7 @@ static int num = 1;
++num;
*/
debugN("%d [%x]=%x ", num++, reg, value);//***DEBUG****
- for (int idx = 0; idx < 16; ++idx) debugN("%d", _channelVoiced[idx] ? 1 : 0);
+ for (int idx = 0; idx < ADLIB_CHANNEL_COUNT; ++idx) debugN("%d", _channelVoiced[idx] ? 1 : 0);
debugN("\n");
_portContents[reg] = value;