[Scummvm-cvs-logs] SF.net SVN: scummvm:[35205] scummvm/trunk/engines/tinsel/tinsel.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Dec 2 18:22:30 CET 2008
Revision: 35205
http://scummvm.svn.sourceforge.net/scummvm/?rev=35205&view=rev
Author: thebluegr
Date: 2008-12-02 17:22:30 +0000 (Tue, 02 Dec 2008)
Log Message:
-----------
Disabled the workaround to skip the title screens of DW1 for now, as it can cause crashes with certain versions of the game
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/tinsel.cpp
Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp 2008-12-02 10:32:57 UTC (rev 35204)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp 2008-12-02 17:22:30 UTC (rev 35205)
@@ -219,6 +219,7 @@
continue;
case Common::KEYCODE_ESCAPE:
+#if 0
if (!TinselV2) {
// WORKAROUND: For Discworld 1, check if any of the starting logo screens are
// active, and if so manually skip to the title screen, allowing them to be bypassed
@@ -241,6 +242,13 @@
// Running Discworld 2, so process the key normally
ProcessKeyEvent(PLR_ESCAPE);
}
+#else
+ // The above workaround is used to skip the title screens in DW1, but it can throw assertions
+ // in certain versions of the game, e.g. the multilingual version with English speech and several
+ // subtitles (French, German, Italian, Spanish)
+ // FIXME: Add that workaround again, once we make sure it works properly in all versions of the game
+ ProcessKeyEvent(PLR_ESCAPE);
+#endif
continue;
#ifdef SLOW_RINCE_DOWN
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