diff options
| -rw-r--r-- | queen/journal.cpp | 17 | ||||
| -rw-r--r-- | queen/resource.h | 1 |
2 files changed, 1 insertions, 17 deletions
diff --git a/queen/journal.cpp b/queen/journal.cpp index 30a82b4b91..9cf619945d 100644 --- a/queen/journal.cpp +++ b/queen/journal.cpp @@ -282,25 +282,10 @@ void Journal::handleNormalMode(int16 zoneNum, int x) { } drawConfigPanel(); } else if (zoneNum == ZN_VOICE_TOGGLE) { - - // 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); - + _vm->sound()->toggleSpeech(); drawConfigPanel(); } else if (zoneNum == ZN_TEXT_TOGGLE) { _vm->subtitles(!_vm->subtitles()); - - // Ensure voice is always on when text is off - if (!_vm->subtitles()) - _vm->sound()->speechToggle(true); - drawConfigPanel(); } } diff --git a/queen/resource.h b/queen/resource.h index 8ee3d8bec7..52a7dd990c 100644 --- a/queen/resource.h +++ b/queen/resource.h @@ -89,7 +89,6 @@ public: bool isDemo() const { return !strcmp(_versionString, "PE100"); } bool isInterview() const { return !strcmp(_versionString, "PEint"); } bool isFloppy() const { return _versionString[0] == 'P'; } - bool isCdRom() const { return _versionString[0] == 'C'; } uint8 compression() const { return _compression; } const char *JASVersion() const { return _versionString; } Language getLanguage() const; |