aboutsummaryrefslogtreecommitdiff
path: root/sound/softsynth
diff options
context:
space:
mode:
authorFlorian Kagerer2010-10-07 19:23:49 +0000
committerFlorian Kagerer2010-10-07 19:23:49 +0000
commit01c9b1706823b5a872f376a51a94ae3266dad69a (patch)
tree78952619e5be9d3a709b133973f1a23a746d5062 /sound/softsynth
parent9ec1985a098093ee33e4c06c8ca5df8d9fcca8f2 (diff)
downloadscummvm-rg350-01c9b1706823b5a872f376a51a94ae3266dad69a.tar.gz
scummvm-rg350-01c9b1706823b5a872f376a51a94ae3266dad69a.tar.bz2
scummvm-rg350-01c9b1706823b5a872f376a51a94ae3266dad69a.zip
SCUMM/FM-TOWNS: improved sfx support for indy4 and monkey2
svn-id: r53052
Diffstat (limited to 'sound/softsynth')
-rw-r--r--sound/softsynth/fmtowns_pc98/towns_audio.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
index 06da399fde..58e09f291b 100644
--- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -243,9 +243,6 @@ bool TownsAudioInterface::init() {
if (_ready)
return true;
- if (!_drv)
- return false;
-
if (!TownsPC98_FmSynth::init())
return false;
@@ -359,8 +356,9 @@ void TownsAudioInterface::timerCallbackA() {
void TownsAudioInterface::timerCallbackB() {
Common::StackLock lock(_mutex);
- if (_drv && _ready) {
- _drv->timerCallback(1);
+ if (_ready) {
+ if (_drv)
+ _drv->timerCallback(1);
callback(80);
}
}
@@ -665,7 +663,7 @@ int TownsAudioInterface::intf_pcmEffectPlaying(va_list &args) {
if (chan < 0x40 || chan > 0x47)
return 1;
chan -= 0x40;
- return (_pcmChanEffectPlaying & _chanFlags[chan]) ? true : false;
+ return (_pcmChanEffectPlaying & _chanFlags[chan]) ? 1 : 0;
}
int TownsAudioInterface::intf_fmKeyOn(va_list &args) {