diff options
author | David Eriksson | 2004-01-10 15:48:13 +0000 |
---|---|---|
committer | David Eriksson | 2004-01-10 15:48:13 +0000 |
commit | c13a04f57034064578d269865ecd48a8ee0fee81 (patch) | |
tree | d3e695c354d8fb3ae342bbe35f9d4961f98b059a /queen | |
parent | f2e8f65cb08462f6f80769f456eabed6692cdf7e (diff) | |
download | scummvm-rg350-c13a04f57034064578d269865ecd48a8ee0fee81.tar.gz scummvm-rg350-c13a04f57034064578d269865ecd48a8ee0fee81.tar.bz2 scummvm-rg350-c13a04f57034064578d269865ecd48a8ee0fee81.zip |
- Must have either subtitles or speech
- Should not be possible to disable text on non-CD-ROM versions
svn-id: r12296
Diffstat (limited to 'queen')
-rw-r--r-- | queen/journal.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/queen/journal.cpp b/queen/journal.cpp index 9cf619945d..955a31b759 100644 --- a/queen/journal.cpp +++ b/queen/journal.cpp @@ -282,10 +282,25 @@ void Journal::handleNormalMode(int16 zoneNum, int x) { } drawConfigPanel(); } else if (zoneNum == ZN_VOICE_TOGGLE) { - _vm->sound()->toggleSpeech(); + + // Only allow change to this setting on CD-ROM version + if (_vm->resource()->isCdRom()) + _vm->sound()->toggleSpeech(); + else + _vm->sound()->speechToggle(true); + + // Ensure text is always on when voice is off + if (!_vm->sound()->speechOn()) + _vm->subtitles(true); + drawConfigPanel(); } else if (zoneNum == ZN_TEXT_TOGGLE) { _vm->subtitles(!_vm->subtitles()); + + // Ensure text is always on when voice is off + if (!_vm->subtitles()) + _vm->sound()->speechToggle(true); + drawConfigPanel(); } } |