libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-01 15:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fixes for mouse cursor/movie frame handling

Browse Source
This commit is contained in:
Paul Gilbert 2016-07-12 18:13:16 -04:00
parent f92f2243fd
commit 1986fa6e83
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engines/titanic/support/avi_surface.cpp
View File

@ -65,10 +65,13 @@ AVISurface::AVISurface(const CResourceKey &key) {
if (!_decoders[0]->loadFile(key.getString()))
error("Could not open video - %s", key.getString().c_str());
_streamCount = 1;
// Create a decoder for any secondary video track
AVIDecoder *decoder2 = new AVIDecoder(Audio::Mixer::kPlainSoundType, secondaryTrackSelect);
if (decoder2->loadFile(key.getString())) {
_decoders[1] = decoder2;
++_streamCount;
} else {
delete decoder2;
}
@ -263,20 +266,18 @@ bool AVISurface::renderFrame() {
return false;
// Decode each decoder's video stream into the appropriate surface
for (int idx = 0; idx < 2; ++idx) {
if (_decoders[idx]) {
const Graphics::Surface *frame = _decoders[idx]->decodeNextFrame();
for (int idx = 0; idx < _streamCount; ++idx) {
const Graphics::Surface *frame = _decoders[idx]->decodeNextFrame();
if (_movieFrameSurface[idx]->format == frame->format) {
_movieFrameSurface[idx]->blitFrom(*frame);
} else {
// Format mis-match, so we need to convert the frame
Graphics::Surface *s = frame->convertTo(_movieFrameSurface[idx]->format,
_decoders[idx]->getPalette());
_movieFrameSurface[idx]->blitFrom(*s);
s->free();
delete s;
}
if (_movieFrameSurface[idx]->format == frame->format) {
_movieFrameSurface[idx]->blitFrom(*frame);
} else {
// Format mis-match, so we need to convert the frame
Graphics::Surface *s = frame->convertTo(_movieFrameSurface[idx]->format,
_decoders[idx]->getPalette());
_movieFrameSurface[idx]->blitFrom(*s);
s->free();
delete s;
}
}

2
engines/titanic/support/mouse_cursor.cpp
View File

@ -63,8 +63,6 @@ CMouseCursor::CMouseCursor(CScreenManager *screenManager) :
}
CMouseCursor::~CMouseCursor() {
for (int idx = 0; idx < NUM_CURSORS; ++idx)
delete _cursors[idx]._videoSurface;
}
void CMouseCursor::loadCursorImages() {