[Scummvm-git-logs] scummvm master -> 77bf1eb73f70bc1ffe30c283a65411bc5bd6ec0a

[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:
77bf1eb73f DIRECTOR: Fxi dissolve transition


Commit: 77bf1eb73f70bc1ffe30c283a65411bc5bd6ec0a
    https://github.com/scummvm/scummvm/commit/77bf1eb73f70bc1ffe30c283a65411bc5bd6ec0a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-28T02:07:04+01:00

Commit Message:
DIRECTOR: Fxi dissolve transition

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 277054edfc..bba72dfd7a 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -310,7 +310,7 @@ static void dissolveTrans(TransParams &t, Score *score, Common::Rect &clipRect)
 
 	// Calculate steps
 	uint32 pixPerStepInit = 1;
-	t.steps = (1 << (hBits * vBits)) - 1;
+	t.steps = (1 << (hBits + vBits)) - 1;
 
 	while (t.steps > 64) {
 		pixPerStepInit <<= 1;
@@ -333,13 +333,6 @@ static void dissolveTrans(TransParams &t, Score *score, Common::Rect &clipRect)
 			rnd = (rnd & 1) ? (rnd >> 1) ^ seed : rnd >> 1;
 
 			if (pixPerStep > 0) {
-				if (pixPerStep % 10000 == 0) {
-					g_system->delayMillis(10);
-					if (processQuitEvent(true))
-						break;
-
-					g_system->updateScreen();
-				}
 				if (--pixPerStep == 0) {
 					break;
 				}