aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2003-12-18 11:04:02 +0000
committerTravis Howell2003-12-18 11:04:02 +0000
commitc10eace9e383169468778c0d0d8c892d3b249add (patch)
tree4a031067288950f6d08005681159dbaed8d9b7b7 /simon
parent77bf6491cc01cde2cf3f3af7634c11628b55af02 (diff)
downloadscummvm-rg350-c10eace9e383169468778c0d0d8c892d3b249add.tar.gz
scummvm-rg350-c10eace9e383169468778c0d0d8c892d3b249add.tar.bz2
scummvm-rg350-c10eace9e383169468778c0d0d8c892d3b249add.zip
Add speech config option, to allow subtitles only in Simon2 again.
svn-id: r11738
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 2a993334ce..fe86fa8d68 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -336,7 +336,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
_continous_vgascript = 0;
_draw_images_debug = 0;
_dump_images = 0;
- _speech = false;
+ _speech = true;
_subtitles = false;
_fade = true;
_mouse_cursor = 0;
@@ -554,6 +554,9 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
_speed = ConfMan.getInt("slow_down");
+ if ((_game & GF_SIMON2) && ConfMan.hasKey("speech") && ConfMan.getBool("speech") == 0)
+ _speech = 0;
+
_system->init_size(320, 200);
// FIXME Use auto dirty rects cleanup code to reduce CPU usage
@@ -4778,7 +4781,6 @@ void SimonEngine::go() {
_start_mainscript = true;
if (_game & GF_TALKIE) {
- _speech = true;
// English and German versions of Simon the Sorcerer 1 don't have full subtitles
if (!(_game & GF_SIMON2) && _language < 2)
_subtitles = false;