mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-31 07:53:36 +00:00
Never mind.
svn-id: r12304
This commit is contained in:
parent
3d1c883970
commit
72d54f173e
@ -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();
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user