aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/video_surface.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-03-23 21:41:36 -0400
committerPaul Gilbert2016-03-23 21:41:36 -0400
commit2f532c086d5cd466a54763fc4fee14d0940e0abb (patch)
tree139b70605ddee8d18ffd58af53d917f810c8f1a7 /engines/titanic/video_surface.cpp
parent7d2d624908e9265be108d650a161a378add9d40d (diff)
downloadscummvm-rg350-2f532c086d5cd466a54763fc4fee14d0940e0abb.tar.gz
scummvm-rg350-2f532c086d5cd466a54763fc4fee14d0940e0abb.tar.bz2
scummvm-rg350-2f532c086d5cd466a54763fc4fee14d0940e0abb.zip
TITANIC: Unsuccessful initial attempt to load ycursors.avi file
Unfortunately, whilst the cursors video plays fine in standard video players, the ScummVM AVIDecoder can't seem to handle it. So for now I've left the decode in place but commented out, and I'm setting up a dummy cursor
Diffstat (limited to 'engines/titanic/video_surface.cpp')
-rw-r--r--engines/titanic/video_surface.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/titanic/video_surface.cpp b/engines/titanic/video_surface.cpp
index ef8d7a872f..5cab6d1511 100644
--- a/engines/titanic/video_surface.cpp
+++ b/engines/titanic/video_surface.cpp
@@ -58,6 +58,12 @@ void CVideoSurface::blitFrom(const Point &destPos, CVideoSurface *src, const Rec
}
}
+void CVideoSurface::blitFrom(const Point &destPos, const Graphics::Surface *src) {
+ lock();
+ _rawSurface->blitFrom(*src, destPos);
+ unlock();
+}
+
void CVideoSurface::clipBounds(Rect &srcRect, Rect &destRect,
CVideoSurface *srcSurface, const Rect *subRect, const Point *destPos) {
// Figure out initial source rect and dest rect, based on whether