aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-06-19 13:30:29 +1000
committerPaul Gilbert2011-06-19 13:30:29 +1000
commit4de14b0dbc593db9bbccba9fb28a1ec0f589e56b (patch)
tree56d910ca9452e0c7ef6da78760a28f22d6f336ae
parent7428e646d51ae0c666621fe0f407ad1096c6566e (diff)
downloadscummvm-rg350-4de14b0dbc593db9bbccba9fb28a1ec0f589e56b.tar.gz
scummvm-rg350-4de14b0dbc593db9bbccba9fb28a1ec0f589e56b.tar.bz2
scummvm-rg350-4de14b0dbc593db9bbccba9fb28a1ec0f589e56b.zip
TSAGE: Fixed problem with number of voices not being reset
-rw-r--r--engines/tsage/sound.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 79cd08b6fc..5531ad9843 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -707,6 +707,9 @@ void SoundManager::_sfRethinkVoiceTypes() {
vse._type1._channelNum2 = 0;
vse._type1._priority2 = 0;
}
+
+ // Reset the number of voices available
+ vs->_numVoices = vs->_total;
}
}
@@ -2058,6 +2061,7 @@ void Sound::_soUpdateDamper(VoiceTypeStruct *voiceType, int channelNum, VoiceTyp
vte._field5 = 0;
driver->updateVoice(voiceType->_entries[idx]._voiceNum);
}
+ return;
}
}
}
@@ -2424,11 +2428,10 @@ void AdlibSoundDriver::close() {
bool AdlibSoundDriver::reset() {
write(1, 0x20);
write(4, 0x80);
-/*
- * code fragment originally part of testing Adlib timer speed
+
write(2, 1);
write(4, 1);
-*/
+
return true;
}