[Scummvm-git-logs] scummvm master -> 7bf520a76ef1f76b82fa76c6381a2126670e472d

[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:
7bf520a76e DIRECTOR: Fix accidentally committed code


Commit: 7bf520a76ef1f76b82fa76c6381a2126670e472d
    https://github.com/scummvm/scummvm/commit/7bf520a76ef1f76b82fa76c6381a2126670e472d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-30T02:18:41+02:00

Commit Message:
DIRECTOR: Fix accidentally committed code

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 7de375dbbc..2db7e00121 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -376,7 +376,7 @@ static void dissolveTrans(TransParams &t, Score *score, Common::Rect &clipRect)
 
 					byte newcolor = (*color1 & ~mask) | (*color2 & mask);
 					//warning("color1: %02x | %02x [%02x] -> %02x", *color1, *color2, mask, newcolor);
-					*color1 = *color1 + 2;
+					*color1 = newcolor;
 				}
 			}