[Scummvm-git-logs] scummvm master -> 358b4f178966448e01f84c7f38043098f8d88df8

[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:
358b4f1789 DIRECTOR: Fix warnings


Commit: 358b4f178966448e01f84c7f38043098f8d88df8
    https://github.com/scummvm/scummvm/commit/358b4f178966448e01f84c7f38043098f8d88df8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-02T14:13:27+02:00

Commit Message:
DIRECTOR: Fix warnings

Changed paths:
    engines/director/score.cpp
    engines/director/transitions.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index ff1bd94c87..f8e451ff0b 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1036,7 +1036,7 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) {
 	bool *scriptRefs = (bool *)calloc(_actions.size() + 1, sizeof(int));
 
 	// Now let's scan which scripts are actually referenced
-	for (int i = 0; i < _frames.size(); i++) {
+	for (uint i = 0; i < _frames.size(); i++) {
 		if (_frames[i]->_actionId <= _actions.size())
 			scriptRefs[_frames[i]->_actionId] = true;
 	}
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 8d5141ea6e..0064996a99 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -724,13 +724,13 @@ static void dissolvePatternsTrans(TransParams &t, Score *score, Common::Rect &cl
 	t.steps = 64;
 	t.stepDuration = t.duration / t.steps;
 
-	for (int i = 0; i < t.steps; i++) {
-		for (int y = 0; y < h; y++) {
+	for (uint i = 0; i < t.steps; i++) {
+		for (uint y = 0; y < h; y++) {
 			byte pat = dissolvePatterns[i][y % 8];
 			byte *dst = (byte *)score->_backSurface->getBasePtr(0, y);
 			byte *src = (byte *)score->_surface->getBasePtr(0, y);
 
-			for (int x = 0; x < w;) {
+			for (uint x = 0; x < w;) {
 				byte mask = 0x80;
 				for (int b = 0; b < 8 && x < w; b++, x++) {
 					if (pat & mask)
@@ -903,7 +903,7 @@ static void transMultiPass(TransParams &t, Score *score, Common::Rect &clipRect)
 		if (stop)
 			break;
 
-		for (int r = 0; r < rects.size(); r++) {
+		for (uint r = 0; r < rects.size(); r++) {
 			rto = rects[r];
 			rto.clip(clipRect);