[Scummvm-git-logs] scummvm master -> 5c90e84575e00c840830e5c57168b0713c97eefa

[sev-]

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:
5c90e84575 DIRECTOR: Code cleanup in transitions


Commit: 5c90e84575e00c840830e5c57168b0713c97eefa
    https://github.com/scummvm/scummvm/commit/5c90e84575e00c840830e5c57168b0713c97eefa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-30T09:11:33+02:00

Commit Message:
DIRECTOR: Code cleanup in transitions

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 2db7e00121..159d4e1867 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -152,6 +152,11 @@ void Frame::playTransition(Score *score) {
 	t.duration = MAX<uint16>(250, _transDuration); // When duration is < 1/4s, make it 1/4
 	t.chunkSize = MAX<uint>(1, _transChunkSize);
 
+#if 0
+	t.type = kTransDissolveBits;
+	t.chunkSize = 4;
+#endif
+
 	Common::Rect clipRect(score->_movieRect);
 	clipRect.moveTo(0, 0);
 
@@ -366,15 +371,10 @@ static void dissolveTrans(TransParams &t, Score *score, Common::Rect &clipRect)
 					x = x / -numbytes;
 					mask = pixmask[x % -numbytes];
 
-					if (x % -numbytes)
-						mask = 0xf;
-					else
-						mask = 0xf0;
-
 					byte *color1 = (byte *)score->_backSurface->getBasePtr(x, y);
 					byte *color2 = (byte *)score->_surface->getBasePtr(x, y);
 
-					byte newcolor = (*color1 & ~mask) | (*color2 & mask);
+					byte newcolor = ((*color1 & ~mask) | (*color2 & mask)) & 0xff;
 					//warning("color1: %02x | %02x [%02x] -> %02x", *color1, *color2, mask, newcolor);
 					*color1 = newcolor;
 				}