[Scummvm-git-logs] scummvm master -> 827e4efb09e2023d04da79e37147ea6ffdcb654a

[digitall]

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:
827e4efb09 DIRECTOR: Fix Various Compiler Warnings.


Commit: 827e4efb09e2023d04da79e37147ea6ffdcb654a
    https://github.com/scummvm/scummvm/commit/827e4efb09e2023d04da79e37147ea6ffdcb654a
Author: D G Turner (digitall at scummvm.org)
Date: 2017-04-25T00:53:48+01:00

Commit Message:
DIRECTOR: Fix Various Compiler Warnings.

Changed paths:
    engines/director/cast.cpp
    engines/director/score.cpp
    engines/director/score.h
    engines/director/util.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 1772dd4..d71ae32 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -71,13 +71,13 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint32 castTag, uint16
 			stream.readUint32();
 
 		uint32 stringLength = stream.readUint32();
-		for (int s = 0; s < stringLength; s++) 
+		for (uint32 s = 0; s < stringLength; s++)
 			stream.readByte();
 
-		uint16 width = stream.readUint16LE(); //maybe?
+		/*uint16 width =*/ stream.readUint16LE(); //maybe?
 		initialRect = Score::readRect(stream);
 
-		uint32 somethingElse = stream.readUint32();
+		/*uint32 somethingElse =*/ stream.readUint32();
 		boundingRect = Score::readRect(stream);
 
 		bitsPerPixel = stream.readUint16();
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index fd9e402..355900e 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -324,7 +324,7 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) {
 		stream.readUint32();
 		stream.readUint32();
 		stream.readUint32();
-		for (int skip = 0; skip <  blockSize * 4; skip++)
+		for (uint32 skip = 0; skip <  blockSize * 4; skip++)
 			stream.readByte();
 
 		//header number two... this is our actual score entry point.
@@ -542,7 +542,7 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,
 		if (castType == 1) {
 			if (size3 == 0) 
 				return;
-			for (int skip = 0; skip < (size1 - 4) / 4; skip++)
+			for (uint32 skip = 0; skip < (size1 - 4) / 4; skip++)
 				stream.readUint32();
 		}
 
@@ -763,7 +763,7 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) {
 		subId = nextSubId;
 		stringPos = nextStringPos;
 
-		if (stringPos == stream.size())
+		if ((int32)stringPos == stream.size())
 			break;
 	}
 
diff --git a/engines/director/score.h b/engines/director/score.h
index 021dcb5..7b11e0d 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -77,7 +77,7 @@ public:
 	void loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, Resource *res);
 	void loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id);
 	void setCurrentFrame(uint16 frameId) { _currentFrame = frameId; }
-	int getCurrentFrame() { return _currentFrame; }
+	uint16 getCurrentFrame() { return _currentFrame; }
 	Common::String getMacName() const { return _macName; }
 	Sprite *getSpriteById(uint16 id);
 	void setSpriteCasts();
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index cf7e122..55a9893 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -120,7 +120,7 @@ Common::String convertPath(Common::String &path) {
 	}
 
 	Common::String res;
-	int idx = 0;
+	uint32 idx = 0;
 
 	if (path.hasPrefix(":::")) {
 		res = "../";