diff options
| author | Eugene Sandulenko | 2015-01-04 19:48:33 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-01-04 19:48:33 +0100 |
| commit | 6c97eb4e366a292e91d143861f36c24b3169e06b (patch) | |
| tree | 6bffb4d9e85c2481b3dafc1fdc484f328f794e51 /engines/scumm/script_v6.cpp | |
| parent | 2587852c88e2fbc52bf702f71738e80628eb43fe (diff) | |
| parent | 7dc316cced4c7a45a376d76a6ca0c84bd563132f (diff) | |
| download | scummvm-rg350-6c97eb4e366a292e91d143861f36c24b3169e06b.tar.gz scummvm-rg350-6c97eb4e366a292e91d143861f36c24b3169e06b.tar.bz2 scummvm-rg350-6c97eb4e366a292e91d143861f36c24b3169e06b.zip | |
Merge pull request #554 from eriktorbjorn/tentacle-maniac
SCUMM: Day of the Tentacle easter egg
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(); |