[Scummvm-cvs-logs] scummvm master -> e9730ca5978e3fb0b6285ef785149f049f22e824

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e9730ca597 TINSEL: Fix bug #3541542 - "DW: PSX version dies when pressing ESC in intro"


Commit: e9730ca5978e3fb0b6285ef785149f049f22e824
    https://github.com/scummvm/scummvm/commit/e9730ca5978e3fb0b6285ef785149f049f22e824
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-02T18:32:31-07:00

Commit Message:
TINSEL: Fix bug #3541542 - "DW: PSX version dies when pressing ESC in intro"

DW1 PSX seems to have its own scene skipping code for scenes 2 and 3, thus
injecting our own causes it to hang. Scenes 2 and 3 can be skipped separately.

Changed paths:
    engines/tinsel/scene.cpp



diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp
index 79bb30f..c544451 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;