aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorColin Snover2016-07-10 11:43:57 -0500
committerColin Snover2016-07-10 11:46:19 -0500
commit46804fda15f97825ac67f46e5ded36ec5be01e42 (patch)
tree37c4eee4fdffa123cb2e84b5d57cb2443ecf58e6 /engines/sci
parentc294e4fbf884be84c5e6027bc2911ce9598fa111 (diff)
downloadscummvm-rg350-46804fda15f97825ac67f46e5ded36ec5be01e42.tar.gz
scummvm-rg350-46804fda15f97825ac67f46e5ded36ec5be01e42.tar.bz2
scummvm-rg350-46804fda15f97825ac67f46e5ded36ec5be01e42.zip
SCI32: Re-enable KQ7 subtitles, but with a warning on game start
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/detection_tables.h3
-rw-r--r--engines/sci/sci.cpp13
2 files changed, 13 insertions, 3 deletions
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index a48ed3f360..6ee666a648 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1736,8 +1736,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
GAMEOPTION_PREFER_DIGITAL_SFX, \
GAMEOPTION_ORIGINAL_SAVELOAD, \
GAMEOPTION_FB01_MIDI)
-#define GUIO_KQ7 GUIO5(GUIO_NOSUBTITLES, \
- GUIO_NOASPECT, \
+#define GUIO_KQ7 GUIO4(GUIO_NOASPECT, \
GAMEOPTION_PREFER_DIGITAL_SFX, \
GAMEOPTION_ORIGINAL_SAVELOAD, \
GAMEOPTION_FB01_MIDI)
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 07db32a56c..cf03c50039 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -366,6 +366,17 @@ Common::Error SciEngine::run() {
}
}
+ if (getGameId() == GID_KQ7 && ConfMan.getBool("subtitles")) {
+ showScummVMDialog("Subtitles are enabled, but subtitling in King's"
+ " Quest 7 was unfinished and disabled in the release"
+ " version of the game. ScummVM allows the subtitles"
+ " to be re-enabled, but because they were removed from"
+ " the original game, they do not always render"
+ " properly or reflect the actual game speech."
+ " This is not a ScummVM bug -- it is a problem with"
+ " the game's assets.");
+ }
+
// Show a warning if the user has selected a General MIDI device, no GM patch exists
// (i.e. patch 4) and the game is one of the known 8 SCI1 games that Sierra has provided
// after market patches for in their "General MIDI Utility".
@@ -1063,7 +1074,7 @@ void SciEngine::syncIngameAudioOptions() {
case GID_KQ6:
#ifdef ENABLE_SCI32
// Unsure about Gabriel Knight 2
- // KQ7 has broken subtitles
+ case GID_KQ7: // SCI2.1
case GID_GK1: // SCI2
case GID_SQ6: // SCI2.1, SQ6 seems to always use subtitles anyway
case GID_TORIN: // SCI2.1