[Scummvm-git-logs] scummvm master -> 849c1fc32f55f2d8a94a71714f07ba367895c4e7

[digitall]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8f1e9722a0 PRIVATE: Fix GCC Compiler Warning
849c1fc32f GRIM: Fix Signed vs. Unsigned Comparison GCC Warnings


Commit: 8f1e9722a0819e5248cc906cb9ea3601bb0a1940
    https://github.com/scummvm/scummvm/commit/8f1e9722a0819e5248cc906cb9ea3601bb0a1940
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-18T06:05:30Z

Commit Message:
PRIVATE: Fix GCC Compiler Warning

Changed paths:
    engines/private/private.cpp


diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index b636a618fc..15321f8bfa 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -780,7 +780,7 @@ Common::Error PrivateEngine::loadGameStream(Common::SeekableReadStream *stream)
 
 	// Restore a movie that was playing
 	_currentMovie = stream->readString();
-	int currentTime = stream->readUint32LE();
+	/* int currentTime = */ stream->readUint32LE();
 
 	if (!_currentMovie.empty()) {
 		_videoDecoder = new Video::SmackerDecoder();


Commit: 849c1fc32f55f2d8a94a71714f07ba367895c4e7
    https://github.com/scummvm/scummvm/commit/849c1fc32f55f2d8a94a71714f07ba367895c4e7
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-18T06:05:59Z

Commit Message:
GRIM: Fix Signed vs. Unsigned Comparison GCC Warnings

Changed paths:
    engines/grim/grim.cpp
    engines/grim/remastered/commentary.cpp
    engines/grim/resource.cpp


diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 840e31a456..0a8a538da9 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -191,10 +191,10 @@ GrimEngine::GrimEngine(OSystem *syst, uint32 gameFlags, GrimGameType gameType, C
 
 	//Remastered:
 	if (getGameFlags() & ADGF_REMASTERED) {
-		for (int i = 0; i < kNumCutscenes; i++) {
+		for (uint32 i = 0; i < kNumCutscenes; i++) {
 			_cutsceneEnabled[i] = false;
 		}
-		for (int i = 0; i < kNumConcepts; i++) {
+		for (uint32 i = 0; i < kNumConcepts; i++) {
 			_conceptEnabled[i] = false;
 		}
 
diff --git a/engines/grim/remastered/commentary.cpp b/engines/grim/remastered/commentary.cpp
index 961211fb9e..623f008e8a 100644
--- a/engines/grim/remastered/commentary.cpp
+++ b/engines/grim/remastered/commentary.cpp
@@ -66,7 +66,7 @@ Common::String Comment::getName() const {
 }
 
 void Comment::play() {
-	for (int i = 0; i < _lines.size(); i++) {
+	for (uint i = 0; i < _lines.size(); i++) {
 		Common::String text = g_localizer->localize(_lines[i]._line.c_str());
 		warning("Line: %d Start: %d End: %d Id: %d Text: %s", i, _lines[i]._start, _lines[i]._end, _lines[i]._id, text.c_str());
 	}
diff --git a/engines/grim/resource.cpp b/engines/grim/resource.cpp
index 612494779c..df383d3c3c 100644
--- a/engines/grim/resource.cpp
+++ b/engines/grim/resource.cpp
@@ -375,7 +375,7 @@ Font *ResourceLoader::loadFont(const Common::String &filename) {
 			Common::String line = stream->readLine();
 			Common::String font;
 			Common::String size;
-			for (int i = 0; i < line.size(); ++i) {
+			for (uint i = 0; i < line.size(); ++i) {
 				if (line[i] == ' ') {
 					font = "FontsHD/" + Common::String(line.c_str(), i);
 					size = Common::String(line.c_str() + i + 1, line.size() - i - 2);