diff options
| author | Travis Howell | 2006-05-04 11:52:56 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-05-04 11:52:56 +0000 |
| commit | 24dc04095f6775bd89075a7c65c343dfac373bcb (patch) | |
| tree | 2595838bb1b1513064d88c6dd12a0df2fdf084c0 /engines | |
| parent | 40189ab7e6aa58a24b3c4efa6099c4ef3ebf7047 (diff) | |
| download | scummvm-rg350-24dc04095f6775bd89075a7c65c343dfac373bcb.tar.gz scummvm-rg350-24dc04095f6775bd89075a7c65c343dfac373bcb.tar.bz2 scummvm-rg350-24dc04095f6775bd89075a7c65c343dfac373bcb.zip | |
Allow skipping speech in Simon1
svn-id: r22334
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/simon/simon.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 37670217e8..fb16b9ed08 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -1559,8 +1559,8 @@ void SimonEngine::waitForSync(uint a) { _exitCutscene = false; _rightButtonDown = false; while (_vgaWaitFor != 0) { - if (_rightButtonDown && (getGameType() == GType_SIMON2 || getGameType() == GType_FF)) { - if (_vgaWaitFor == 200 && (getGameType() == GType_FF || !getBitFlag(14))) { + if (_rightButtonDown) { + if (_vgaWaitFor == 200 && !getBitFlag(14)) { skipSpeech(); break; } @@ -1591,11 +1591,16 @@ void SimonEngine::skipSpeech() { loadSprite(4, 2, 13, 0, 0, 0); waitForSync(213); stopAnimateSimon2(2, 1); - } else { + } else if (getGameType() == GType_SIMON2) { _variableArray[100] = 5; loadSprite(4, 1, 30, 0, 0, 0); waitForSync(130); stopAnimateSimon2(2, 1); + } else { + _variableArray[100] = 15; + loadSprite(4, 1, 130, 0, 0, 0); + waitForSync(130); + stopAnimateSimon1(1); } } } @@ -2021,10 +2026,7 @@ void SimonEngine::delay(uint amount) { case OSystem::EVENT_RBUTTONDOWN: if (getGameType() == GType_FF) setBitFlag(92, false); - if (getGameType() == GType_SIMON2 || getGameType() == GType_FF) - _rightButtonDown++; - else - _exitCutscene = true; + _rightButtonDown++; break; case OSystem::EVENT_QUIT: shutdown(); |