[Scummvm-cvs-logs] SF.net SVN: scummvm:[34196] scummvm/trunk/engines/tinsel/tinsel.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Aug 27 21:29:42 CEST 2008
Revision: 34196
http://scummvm.svn.sourceforge.net/scummvm/?rev=34196&view=rev
Author: fingolfin
Date: 2008-08-27 19:29:41 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Fix bug #2078922: DW: Pushing ESC repeatedly at beginning causes odd behavior
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/tinsel.cpp
Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp 2008-08-27 19:13:28 UTC (rev 34195)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp 2008-08-27 19:29:41 UTC (rev 34196)
@@ -206,13 +206,16 @@
{
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 {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list