[Scummvm-git-logs] scummvm master -> c41845e6aec5fce0326ddabbed176e40b83204ab
dreammaster
dreammaster at scummvm.org
Tue Aug 30 03:55:50 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c41845e6ae TITANIC: Preliminary implementation for CVideoSurface movieBlitRect
Commit: c41845e6aec5fce0326ddabbed176e40b83204ab
https://github.com/scummvm/scummvm/commit/c41845e6aec5fce0326ddabbed176e40b83204ab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-29T21:55:43-04:00
Commit Message:
TITANIC: Preliminary implementation for CVideoSurface movieBlitRect
Changed paths:
engines/titanic/support/video_surface.cpp
diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp
index 594f660..b5f6687 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -163,7 +163,19 @@ void CVideoSurface::blitRect2(const Rect &srcRect, const Rect &destRect, CVideoS
}
void CVideoSurface::movieBlitRect(const Rect &srcRect, const Rect &destRect, CVideoSurface *src) {
- // TODO
+ if (lock()) {
+ if (src->lock()) {
+ Graphics::ManagedSurface *srcSurface = src->_rawSurface;
+ Graphics::ManagedSurface *destSurface = _rawSurface;
+
+ // TODO: Handle the transparency mode correctly
+ destSurface->blitFrom(*srcSurface, srcRect, Point(srcRect.left, srcRect.top));
+
+ src->unlock();
+ }
+
+ unlock();
+ }
}
uint CVideoSurface::getTransparencyColor() {
More information about the Scummvm-git-logs
mailing list