aboutsummaryrefslogtreecommitdiff
path: root/simon/simon.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-01-01 06:29:27 +0000
committerTravis Howell2004-01-01 06:29:27 +0000
commit7dbf520f6771f8ef81a2373025ea4e63ddfe56d4 (patch)
treed57b3cad6329fd46c361317f15c7d73a5ae5e9ba /simon/simon.cpp
parent0392f86001ef84963fb950068f53b114e1d62a7e (diff)
downloadscummvm-rg350-7dbf520f6771f8ef81a2373025ea4e63ddfe56d4.tar.gz
scummvm-rg350-7dbf520f6771f8ef81a2373025ea4e63ddfe56d4.tar.bz2
scummvm-rg350-7dbf520f6771f8ef81a2373025ea4e63ddfe56d4.zip
Subtitles check wasn't quite right.
svn-id: r12064
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r--simon/simon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 17529fa318..82fa70fa45 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -354,7 +354,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
_draw_images_debug = 0;
_dump_images = 0;
_speech = true;
- _subtitles = false;
+ _subtitles = true;
_fade = true;
_mouse_cursor = 0;
_vga_var9 = 0;
@@ -576,7 +576,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
if ((_game & GF_SIMON2) && ConfMan.hasKey("speech_mute") && ConfMan.getBool("speech_mute") == 1)
_speech = 0;
- if (!(_game & GF_SIMON2) && _language > 1) {
+ if ((!(_game & GF_SIMON2) && _language > 1) || ((_game & GF_SIMON2) && _language == 20)) {
if (ConfMan.hasKey("subtitles") && ConfMan.getBool("subtitles") == 0)
_subtitles = 0;
} else