From 10fbefcd60893f67bb10755d72430e7e60208d65 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 20 Nov 2009 22:39:57 +0000
Subject: Simplified the doSound detection a bit

svn-id: r46028
---
 engines/sci/engine/state.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 265e5d1a92..5480fc8489 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -501,15 +501,18 @@ SciVersion EngineState::detectDoSoundType() {
 			// SCI0 sound code (i.e. SCI_VERSION_0_EARLY)
 			_doSoundType = SCI_VERSION_0_EARLY;
 		} else {
-			if (!autoDetectFeature(kDetectSoundType)) {
-				warning("DoSound detection failed, taking an educated guess");
+			if (getSciVersion() >= SCI_VERSION_1_LATE) {
+				// All SCI1 late games use the newer doSound semantics
+				_doSoundType = SCI_VERSION_1_LATE;
+			} else {
+				if (!autoDetectFeature(kDetectSoundType)) {
+					warning("DoSound detection failed, taking an educated guess");
 
-				if (getSciVersion() >= SCI_VERSION_1_MIDDLE)
-					_doSoundType = SCI_VERSION_1_LATE;
-				else if (getSciVersion() > SCI_VERSION_01)
-					_doSoundType = SCI_VERSION_1_EARLY;
-				else
-					_doSoundType = SCI_VERSION_0_EARLY;
+					if (getSciVersion() >= SCI_VERSION_1_MIDDLE)
+						_doSoundType = SCI_VERSION_1_LATE;
+					else if (getSciVersion() > SCI_VERSION_01)
+						_doSoundType = SCI_VERSION_1_EARLY;
+				}
 			}
 		}
 
-- 
cgit v1.2.3