diff options
| author | Max Horn | 2006-05-13 17:30:04 +0000 |
|---|---|---|
| committer | Max Horn | 2006-05-13 17:30:04 +0000 |
| commit | 0d6362ea485f89a940ffadd1c6fe954f94309c53 (patch) | |
| tree | 1b6c0e09ff11ae5cb4d193333981304b6497c4d5 /engines/queen | |
| parent | 61c3f9d4aae5d7cbbc706a9fb1ecd0ef0f21bbf2 (diff) | |
| download | scummvm-rg350-0d6362ea485f89a940ffadd1c6fe954f94309c53.tar.gz scummvm-rg350-0d6362ea485f89a940ffadd1c6fe954f94309c53.tar.bz2 scummvm-rg350-0d6362ea485f89a940ffadd1c6fe954f94309c53.zip | |
Patch #1091170: ALL, SCUMM: Subtitle speed control
svn-id: r22456
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/journal.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/queen.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index d6298777c2..1a0c511b6d 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -310,7 +310,7 @@ void Journal::handleMouseDown(int x, int y) { enterYesNoPanelMode(zoneNum, TXT_GIVE_UP); break; case ZN_TEXT_SPEED: - val = (x - 136) * QueenEngine::MAX_TEXT_SPEED / (266 - 136); + val = (x - 136) * QueenEngine::MAX_TEXT_SPEED / (266 - 136); _vm->talkSpeed(val); drawConfigPanel(); break; diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 305d5034d2..32ed860b75 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -186,7 +186,7 @@ void QueenEngine::readOptionSettings() { _music->setVolume(ConfMan.getInt("music_volume")); _sound->musicToggle(!ConfMan.getBool("music_mute")); _sound->sfxToggle(!ConfMan.getBool("sfx_mute")); - _talkSpeed = ConfMan.getInt("talkspeed"); + _talkSpeed = (ConfMan.getInt("talkspeed") * (MAX_TEXT_SPEED - MIN_TEXT_SPEED) + 255 / 2) / 255 + MIN_TEXT_SPEED; _sound->speechToggle(!ConfMan.getBool("speech_mute")); _subtitles = ConfMan.getBool("subtitles"); checkOptionSettings(); @@ -196,7 +196,7 @@ void QueenEngine::writeOptionSettings() { ConfMan.setInt("music_volume", _music->volume()); ConfMan.setBool("music_mute", !_sound->musicOn()); ConfMan.setBool("sfx_mute", !_sound->sfxOn()); - ConfMan.setInt("talkspeed", _talkSpeed); + ConfMan.setInt("talkspeed", ((_talkSpeed - MIN_TEXT_SPEED) * 255 + (MAX_TEXT_SPEED - MIN_TEXT_SPEED) / 2) / (MAX_TEXT_SPEED - MIN_TEXT_SPEED)); ConfMan.setBool("speech_mute", !_sound->speechOn()); ConfMan.setBool("subtitles", _subtitles); ConfMan.flushToDisk(); @@ -444,6 +444,7 @@ int QueenEngine::init() { _sound = Sound::giveSound(_mixer, this, _resource->compression()); _walk = new Walk(this); + //_talkspeedScale = (MAX_TEXT_SPEED - MIN_TEXT_SPEED) / 255.0; registerDefaultSettings(); readOptionSettings(); |