thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #2821215 - DIG: Skipping planetarium animation disables F5 menu.

Browse source 
svn-id: r42498
This commit is contained in:
Travis Howell 2009-07-15 02:06:26 +00:00
parent 3a3b71622a
commit b159517dc3
5 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/scumm/script_v6.cpp
View file

@ -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;