diff options
| author | Travis Howell | 2009-07-15 02:06:26 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-07-15 02:06:26 +0000 |
| commit | b159517dc3f55f3589bf9b7727607e7d216fde52 (patch) | |
| tree | 296238d725f388706f5620035aa2d6af73762cdf /engines/scumm/script_v6.cpp | |
| parent | 3a3b71622ae653588ca3f1673e5674a789c6d46b (diff) | |
| download | scummvm-rg350-b159517dc3f55f3589bf9b7727607e7d216fde52.tar.gz scummvm-rg350-b159517dc3f55f3589bf9b7727607e7d216fde52.tar.bz2 scummvm-rg350-b159517dc3f55f3589bf9b7727607e7d216fde52.zip | |
Fix bug #2821215 - DIG: Skipping planetarium animation disables F5 menu.
svn-id: r42498
Diffstat (limited to 'engines/scumm/script_v6.cpp')
| -rw-r--r-- | engines/scumm/script_v6.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index c23a64be5b..dcd60352c7 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -1396,6 +1396,7 @@ void ScummEngine_v6::o6_getVerbFromXY() { void ScummEngine_v6::o6_beginOverride() { beginOverride(); + _skipVideo = 0; } void ScummEngine_v6::o6_endOverride() { @@ -2457,7 +2458,7 @@ void ScummEngine_v7::o6_kernelSetFunctions() { break; case 6: { // SMUSH movie playback - if (args[1] == 0) { + if (args[1] == 0 && !_skipVideo) { const char *videoname = (const char *)getStringAddressVar(VAR_VIDEONAME); assert(videoname); @@ -2474,7 +2475,7 @@ void ScummEngine_v7::o6_kernelSetFunctions() { if (_game.id == GID_DIG) { _disableFadeInEffect = true; } - } else if (_game.id == GID_FT) { + } else if (_game.id == GID_FT && !_skipVideo) { const int insaneVarNum = ((_game.features & GF_DEMO) && (_game.platform == Common::kPlatformPC)) ? 232 : 233; |