[Scummvm-cvs-logs] scummvm master -> dbfaac22ed69d7b50021b6caec79d24c815804c1

m-kiewitz m_kiewitz at users.sourceforge.net
Sun Dec 8 15:40:50 CET 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dbfaac22ed SCI: only apply audio+text patch to KQ6 CD+LB2 CD


Commit: dbfaac22ed69d7b50021b6caec79d24c815804c1
    https://github.com/scummvm/scummvm/commit/dbfaac22ed69d7b50021b6caec79d24c815804c1
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-12-08T06:40:18-08:00

Commit Message:
SCI: only apply audio+text patch to KQ6 CD+LB2 CD

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 5fd4fc1..ae1d3eb 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -886,12 +886,12 @@ void SciEngine::syncSoundSettings() {
 	}
 }
 
-// used by Script Patcher. Used to find out, if Laura Bow 2 needs patching for Speech+Subtitles - or not
+// used by Script Patcher. Used to find out, if Laura Bow 2/King's Quest 6 need patching for Speech+Subtitles - or not
 bool SciEngine::speechAndSubtitlesEnabled() {
 	bool subtitlesOn = ConfMan.getBool("subtitles");
 	bool speechOn = !ConfMan.getBool("speech_mute");
 	
-	if (subtitlesOn && speechOn)
+	if (isCD() && subtitlesOn && speechOn)
 		return true;
 	return false;
 }






More information about the Scummvm-git-logs mailing list