diff options
| author | Max Horn | 2008-08-27 19:29:41 +0000 |
|---|---|---|
| committer | Max Horn | 2008-08-27 19:29:41 +0000 |
| commit | 79fafb7b6ae8b23aaa407b4bca56170d2d46b6ac (patch) | |
| tree | d321cd17503b2574fd407e6c0f11e85cddc58b2c | |
| parent | 31320430de82972224b12461c241c3633d2534a6 (diff) | |
| download | scummvm-rg350-79fafb7b6ae8b23aaa407b4bca56170d2d46b6ac.tar.gz scummvm-rg350-79fafb7b6ae8b23aaa407b4bca56170d2d46b6ac.tar.bz2 scummvm-rg350-79fafb7b6ae8b23aaa407b4bca56170d2d46b6ac.zip | |
Fix bug #2078922: DW: Pushing ESC repeatedly at beginning causes odd behavior
svn-id: r34196
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 1f56385283..2df72591a0 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -206,13 +206,16 @@ void KeyboardProcess(CORO_PARAM, const void *) { { int sceneOffset = (_vm->getFeatures() & GF_SCNFILES) ? 1 : 0; int sceneNumber = (GetSceneHandle() >> SCNHANDLE_SHIFT) - sceneOffset; +#if 0 // FIXME: Disabled this code for now, as it doesn't work as it should (see bug #2078922). if ((language == TXT_GERMAN) && ((sceneNumber >= 25 && sceneNumber <= 27) || (sceneNumber == 17))) { // Skip to title screen // It seems the German CD version uses scenes 25,26,27,17 for the intro, // instead of 13,14,15,11; also, the title screen is 11 instead of 10 SetNewScene((11 + sceneOffset) << SCNHANDLE_SHIFT, 1, TRANS_CUT); - } else if ((sceneNumber >= 13) && (sceneNumber <= 15) || (sceneNumber == 11)) { + } else +#endif + if ((sceneNumber >= 13) && (sceneNumber <= 15) || (sceneNumber == 11)) { // Skip to title screen SetNewScene((10 + sceneOffset) << SCNHANDLE_SHIFT, 1, TRANS_CUT); } else { |