[Scummvm-git-logs] scummvm master -> 831cf8f302363037dfd4203a05fc86dfdc7e8a73

[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:
831cf8f302 DIRECTOR: Code clanup in transitions


Commit: 831cf8f302363037dfd4203a05fc86dfdc7e8a73
    https://github.com/scummvm/scummvm/commit/831cf8f302363037dfd4203a05fc86dfdc7e8a73
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-28T14:42:06+01:00

Commit Message:
DIRECTOR: Code clanup in transitions

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index f20a94284e..d4da504c79 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -168,7 +168,7 @@ void Frame::playTransition(Score *score) {
 	for (uint16 i = 1; i < t.steps; i++) {
 		bool stop = false;
 
-		switch (_transType) {
+		switch (t.type) {
 		case kTransCenterOutHorizontal: // 5
 			t.xpos += t.xStepSize;
 			r.setWidth(t.xpos * 2);
@@ -222,12 +222,12 @@ void Frame::playTransition(Score *score) {
 			r.moveTo(0, clipRect.height() - t.yStepSize * i);
 
 		case kTransDissolvePixels: // 51
-			warning("Frame::playTransition(): Unhandled transition type %s %d %d", transProps[_transType].name, t.duration, _transChunkSize);
+			warning("Frame::playTransition(): Unhandled transition type %s %d %d", transProps[t.type].name, t.duration, _transChunkSize);
 			stop = true;
 			break;
 
 		default:
-			warning("Frame::playTransition(): Unhandled transition type %s %d %d", transProps[_transType].name, t.duration, _transChunkSize);
+			warning("Frame::playTransition(): Unhandled transition type %s %d %d", transProps[t.type].name, t.duration, _transChunkSize);
 			stop = true;
 			break;
 		}