diff options
author | Torbjörn Andersson | 2014-12-30 03:45:14 +0100 |
---|---|---|
committer | Torbjörn Andersson | 2014-12-30 03:45:14 +0100 |
commit | f74ba29753de23bad9a07f531fc4c03ea3375594 (patch) | |
tree | 6ef69cc19956d168c7e468ec959b6708b9ecc244 /engines/scumm/script_v6.cpp | |
parent | 6c3af3c2e7b8d2852669c141944964c82a11ce1b (diff) | |
download | scummvm-rg350-f74ba29753de23bad9a07f531fc4c03ea3375594.tar.gz scummvm-rg350-f74ba29753de23bad9a07f531fc4c03ea3375594.tar.bz2 scummvm-rg350-f74ba29753de23bad9a07f531fc4c03ea3375594.zip |
SCUMM: Enable Day of the Tentacle easter egg
Instead of returning to the launcher, a game may now specify a list
of "chained" games and optional save slots. The first game is popped
from the list and started. Quitting still quits the entire ScummVM.
It seemed like the sensible thing to do.
Diffstat (limited to 'engines/scumm/script_v6.cpp')
-rw-r--r-- | engines/scumm/script_v6.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index d2f4133f74..6c81f17f2f 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -2597,7 +2597,11 @@ void ScummEngine_v6::o6_kernelSetFunctions() { fadeIn(args[1]); break; case 8: - startManiac(); + if (startManiac()) { + // This is so that the surprised exclamation happens + // after we return to the game again, not before. + o6_breakHere(); + } break; case 9: killAllScriptsExceptCurrent(); |