From 01c9b1706823b5a872f376a51a94ae3266dad69a Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Thu, 7 Oct 2010 19:23:49 +0000
Subject: SCUMM/FM-TOWNS: improved sfx support for indy4 and monkey2

svn-id: r53052
---
 sound/softsynth/fmtowns_pc98/towns_audio.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'sound/softsynth/fmtowns_pc98')

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) {
-- 
cgit v1.2.3