From a5db8902600a217c5acfbea391a8a3c55dc47f93 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 22 Dec 2010 13:58:28 +0000 Subject: SCI: Sync in-game speech/subtitle options with the ones from the ScummVM GUI. - Obtain speech/subtitle options from the ScummVM GUI and set them in CD games. - Also, set simultaneous speech and subtitles in games that support them (currently SQ4 CD and Freddy Pharkas CD). There is no GUI option for setting simultaneous speech and subtitles in Freddy Pharkas CD, so this is the only current way of achieving this (unless the text speed slider inside the Freddy Pharkas options window is repurposed - but that will require extensive changes) svn-id: r55005 --- engines/sci/sci.cpp | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'engines/sci/sci.cpp') diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 43422b4ede..3e96ecc8f2 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -252,6 +252,7 @@ Common::Error SciEngine::run() { _soundCmd = new SoundCommandParser(_resMan, segMan, _kernel, _audio, _features->detectDoSoundType()); syncSoundSettings(); + syncIngameAudioOptions(); // Initialize all graphics related subsystems initGraphics(); @@ -662,11 +663,15 @@ void SciEngine::runGame() { if (DebugMan.isDebugChannelEnabled(kDebugLevelOnStartup)) _console->attach(); + g_sci->getEngineState()->_syncedAudioOptions = false; + do { _gamestate->_executionStackPosChanged = false; run_vm(_gamestate); exitGame(); + g_sci->getEngineState()->_syncedAudioOptions = true; + if (_gamestate->abortScriptProcessing == kAbortRestartGame) { _gamestate->_segMan->resetSegMan(); initGame(); @@ -683,6 +688,9 @@ void SciEngine::runGame() { patchGameSaveRestore(_gamestate->_segMan); _gamestate->shrinkStackToBase(); _gamestate->abortScriptProcessing = kAbortNone; + + syncSoundSettings(); + syncIngameAudioOptions(); } else { break; // exit loop } @@ -807,4 +815,31 @@ void SciEngine::syncSoundSettings() { } } +void SciEngine::syncIngameAudioOptions() { + // Now, sync the in-game speech/subtitles settings for CD games + if (isCD()) { + bool subtitlesOn = ConfMan.getBool("subtitles"); + bool speechOn = !ConfMan.getBool("speech_mute"); + + if (subtitlesOn && !speechOn) { + _gamestate->variables[VAR_GLOBAL][90] = make_reg(0, 1); // subtitles + } else if (!subtitlesOn && speechOn) { + _gamestate->variables[VAR_GLOBAL][90] = make_reg(0, 2); // speech + } else if (subtitlesOn && speechOn) { + // Is it a game that supports simultaneous speech and subtitles? + if (getGameId() == GID_SQ4 + || getGameId() == GID_FREDDYPHARKAS + // TODO: The following need script patches for simultaneous speech and subtitles + //|| getGameId() == GID_KQ6 + //|| getGameId() == GID_LB2 + ) { + _gamestate->variables[VAR_GLOBAL][90] = make_reg(0, 3); // speech + subtitles + } else { + // Game does not support speech and subtitles, set it to speech + _gamestate->variables[VAR_GLOBAL][90] = make_reg(0, 2); // speech + } + } + } +} + } // End of namespace Sci -- cgit v1.2.3