diff options
| author | Matthew Hoops | 2012-09-05 11:45:25 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-05 11:45:25 -0400 |
| commit | f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19 (patch) | |
| tree | 42510da50bdf8515a577fdd74622539ff829ef78 /engines/tinsel/scene.cpp | |
| parent | 2f9b1b67b08f1b70cd95795aaf7816ca7f991649 (diff) | |
| parent | 058b9b9aca066c886ceb4e454a5541be70c27cb6 (diff) | |
| download | scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.gz scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.bz2 scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/tinsel/scene.cpp')
| -rw-r--r-- | engines/tinsel/scene.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index 79bb30f7a3..c5444517f1 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -158,7 +158,8 @@ static void SceneTinselProcess(CORO_PARAM, const void *param) { // The following myEscape value setting is used for enabling title screen skipping in DW1 if (TinselV1 && (g_sceneCtr == 1)) g_initialMyEscape = GetEscEvents(); - _ctx->myEscape = (TinselV1 && (g_sceneCtr < 4)) ? g_initialMyEscape : 0; + // DW1 PSX has its own scene skipping script code for scenes 2 and 3 (bug #3541542). + _ctx->myEscape = (TinselV1 && (g_sceneCtr < (TinselV1PSX ? 2 : 4))) ? g_initialMyEscape : 0; // get the stuff copied to process when it was created _ctx->pInit = (const TP_INIT *)param; |