diff options
| author | Strangerke | 2014-12-07 19:03:06 +0100 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 23:02:30 -0500 |
| commit | b864b846356b6b20d6e6def414456b5d44fe88c7 (patch) | |
| tree | 1ca5682e8cd631c4505c2c7caa28fc4fb5cb886d /engines | |
| parent | bf361715e0c83ebb18914e8769a867a2c5c370c2 (diff) | |
| download | scummvm-rg350-b864b846356b6b20d6e6def414456b5d44fe88c7.tar.gz scummvm-rg350-b864b846356b6b20d6e6def414456b5d44fe88c7.tar.bz2 scummvm-rg350-b864b846356b6b20d6e6def414456b5d44fe88c7.zip | |
ACCESS: Fix the end of the demo
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/access/amazon/amazon_game.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index 979fffe2d3..b425fe9e22 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -621,7 +621,11 @@ void AmazonEngine::dead(int deathId) { _screen->clearScreen(); _screen->setPanel(3); - if (deathId != 10) { + if ((deathId == 10) && !isDemo()) { + quitGame(); + _events->pollEvents(); + return; + } else { if (!isDemo()) _midi->newMusic(62, 0); _files->_setPaletteFlag = false; @@ -629,14 +633,16 @@ void AmazonEngine::dead(int deathId) { _files->_setPaletteFlag = true; _buffer2.copyFrom(*_screen); - for (int i = 0; i < 3; ++i) { - _sound->playSound(0); - _screen->forceFadeIn(); - _sound->playSound(0); - _screen->forceFadeOut(); + if (!isDemo() || deathId != 10) { + for (int i = 0; i < 3; ++i) { + _sound->playSound(0); + _screen->forceFadeIn(); + _sound->playSound(0); + _screen->forceFadeOut(); - if (shouldQuit()) - return; + if (shouldQuit()) + return; + } } if (!isDemo()) { @@ -708,9 +714,6 @@ void AmazonEngine::dead(int deathId) { warning("TODO: restart game"); quitGame(); _events->pollEvents(); - } else { - quitGame(); - _events->pollEvents(); } } |