diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/kyra/sequences_lol.cpp | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/kyra/sequences_lol.cpp')
| -rw-r--r-- | engines/kyra/sequences_lol.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index dc1a0f4d15..ac9148e607 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -81,6 +81,13 @@ int LoLEngine::processPrologue() { } switch (selection) { + case -1: + // This is sent on RTL for example, if we would not have any + // special case for this the default path would call quitGame + // and thus make the next game launched from the launcher + // quit instantly. + break; + case 0: // New game processSelection = 0; break; @@ -397,7 +404,8 @@ void LoLEngine::kingSelectionIntro() { _screen->fprintStringIntro("%s", 8, y + i * 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(57 + i)); } - _sound->voicePlay("KING01", &_speechHandle); + if (_flags.isTalkie) + _sound->voicePlay("KING01", &_speechHandle); int index = 4; while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && _charSelection == -1 && !shouldQuit() && !skipFlag()) { @@ -441,7 +449,8 @@ void LoLEngine::kingSelectionReminder() { _screen->fprintStringIntro("%s", 8, y + 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(63)); } - _sound->voicePlay("KING02", &_speechHandle); + if (_flags.isTalkie) + _sound->voicePlay("KING02", &_speechHandle); int index = 0; while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && _charSelection == -1 && !shouldQuit() && index < 15) { @@ -468,7 +477,8 @@ void LoLEngine::kingSelectionReminder() { } void LoLEngine::kingSelectionOutro() { - _sound->voicePlay("KING03", &_speechHandle); + if (_flags.isTalkie) + _sound->voicePlay("KING03", &_speechHandle); int index = 0; while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && !shouldQuit() && !skipFlag()) { @@ -627,7 +637,8 @@ void LoLEngine::selectionCharInfoIntro(char *file) { if (speechEnabled() && !_sound->isVoicePresent(file)) break; - _sound->voicePlay(file, &_speechHandle); + if (_flags.isTalkie) + _sound->voicePlay(file, &_speechHandle); int i = 0; while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && _charSelectionInfoResult == -1 && !shouldQuit()) { |