diff options
author | Paul Gilbert | 2016-04-05 13:19:43 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-04-05 13:19:43 -0400 |
commit | 6f8de06ddb210f71f611e2cfcee106832d100a78 (patch) | |
tree | 40f3694f8f1cc4180f2cd6d403d614816e6184df /engines/titanic/support | |
parent | f65849084cc88d61168742b02553fb269a9f064e (diff) | |
download | scummvm-rg350-6f8de06ddb210f71f611e2cfcee106832d100a78.tar.gz scummvm-rg350-6f8de06ddb210f71f611e2cfcee106832d100a78.tar.bz2 scummvm-rg350-6f8de06ddb210f71f611e2cfcee106832d100a78.zip |
TITANIC: Fix loading of ycursors.avi video that contains mouse cursors
The mouse ccursor is now working correctly in-game, and correctly changing
when different areas of the view are highlighted
Diffstat (limited to 'engines/titanic/support')
-rw-r--r-- | engines/titanic/support/avi_decoder.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/titanic/support/avi_decoder.cpp b/engines/titanic/support/avi_decoder.cpp index 81d8a58b8d..578e3a94ea 100644 --- a/engines/titanic/support/avi_decoder.cpp +++ b/engines/titanic/support/avi_decoder.cpp @@ -265,7 +265,10 @@ void AVIDecoder::handleStreamHeader(uint32 size) { } } - addTrack(new AVIVideoTrack(_header.totalFrames, sHeader, bmInfo, initialPalette)); + // WORKAROUND: For Titanic engine, the ycursors.avi file has two video tracks, + // so we do an explicit check below to ignore any second video track + if (getFrameCount() == 0) + addTrack(new AVIVideoTrack(_header.totalFrames, sHeader, bmInfo, initialPalette)); } else if (sHeader.streamType == ID_AUDS) { PCMWaveFormat wvInfo; wvInfo.tag = _fileStream->readUint16LE(); |