From 13dae9b394dd9d7c8046b0771c6800d74b6f6ab9 Mon Sep 17 00:00:00 2001
From: Travis Howell <kirben@scummvm.org>
Date: Wed, 23 Jul 2003 05:17:21 +0000
Subject: [PATCH] fm towns cd audio fix from Hibernatus

svn-id: r9141
---
 backends/sdl/sdl-common.cpp | 4 ++++
 scumm/script_v5.cpp         | 2 +-
 scumm/sound.cpp             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index f39525893c9..3d9d6c794e9 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -106,6 +106,10 @@ OSystem_SDL_Common::OSystem_SDL_Common()
 
 	// reset mouse state
 	memset(&km, 0, sizeof(km));
+	cd_end_time = 0;
+	cd_num_loops = 0;
+	cd_duration = 0;
+	cd_stop_time = 0;
 }
 
 OSystem_SDL_Common::~OSystem_SDL_Common() {
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index cca3d1ab868..2e6777609cd 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -2044,7 +2044,7 @@ void Scumm_v5::o5_startMusic() {
 			break;
 		}
 		warning("unknown: o5_startMusic(%d)", b);
-		setResult(0);
+		setResult(result);
 	} else {
 		_sound->addSoundToQueue(getVarOrDirectByte(0x80));
 	}
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 0a7eefaeca7..98361cb8161 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -470,7 +470,7 @@ void Sound::playSound(int soundID) {
 	
 	}
 	
-	if (_scumm->_gameId == GID_LOOM && (READ_LE_UINT16(ptr + 4) == 'so')) {
+	if (_scumm->_gameId == GID_LOOM) {
 		// Mac version of Loom uses yet another sound format
 		/*
 		playSound #9 (room 70)