[Scummvm-git-logs] scummvm master -> 454f20b948c2968056401270c14b135ce080da91

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
08453de783 TITANIC: Fix checking for transparency surfaces in blitRect methods
454f20b948 TITANIC: Fix setting pointers in RawSurface::moveX


Commit: 08453de783494b12cec8acc70b5a9a4dced2cdea
    https://github.com/scummvm/scummvm/commit/08453de783494b12cec8acc70b5a9a4dced2cdea
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-01T22:23:58-04:00

Commit Message:
TITANIC: Fix checking for transparency surfaces in blitRect methods

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 39a3f51..fa87e6d 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -159,7 +159,7 @@ void CVideoSurface::blitRect1(const Rect &srcRect, const Rect &destRect, CVideoS
 
 	if (src->_fastBlitFlag) {
 		_rawSurface->blitFrom(*src->_rawSurface, srcRect, Point(destRect.left, destRect.top));
-	} else if (getTransparencySurface()) {
+	} else if (src->getTransparencySurface()) {
 		transBlitRect(srcRect, destRect, src, false);
 	} else {
 		_rawSurface->transBlitFrom(*src->_rawSurface, srcRect, destRect, src->getTransparencyColor(), 1);
@@ -170,7 +170,7 @@ void CVideoSurface::blitRect1(const Rect &srcRect, const Rect &destRect, CVideoS
 }
 
 void CVideoSurface::blitRect2(const Rect &srcRect, const Rect &destRect, CVideoSurface *src) {
-	if (getTransparencySurface()) {
+	if (src->getTransparencySurface()) {
 		transBlitRect(srcRect, destRect, src, true);
 	} else {
 		src->lock();


Commit: 454f20b948c2968056401270c14b135ce080da91
    https://github.com/scummvm/scummvm/commit/454f20b948c2968056401270c14b135ce080da91
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-01T22:24:30-04:00

Commit Message:
TITANIC: Fix setting pointers in RawSurface::moveX

Changed paths:
    engines/titanic/support/raw_surface.cpp



diff --git a/engines/titanic/support/raw_surface.cpp b/engines/titanic/support/raw_surface.cpp
index 8328ad1..4123b86 100644
--- a/engines/titanic/support/raw_surface.cpp
+++ b/engines/titanic/support/raw_surface.cpp
@@ -100,8 +100,9 @@ int CRawSurface::moveX(int xp) {
 			}
 		}
 
-		_runLength = *_pixelsBaseP++;
-		++_pixelsBaseP;
+		_runLength = *_pixelsBaseP;
+		_pixelsP = _pixelsBaseP + 1;
+		_pixelsBaseP += 2;
 		_flag = true;
 	}