[Scummvm-git-logs] scummvm master -> 46c3068a166deab19fda265d4ff26028e87e6e9a

eriktorbjorn noreply at scummvm.org
Thu Sep 5 04:39:41 UTC 2024


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:
46c3068a16 QDENGINE: Fix some trivial GCC warnings


Commit: 46c3068a166deab19fda265d4ff26028e87e6e9a
    https://github.com/scummvm/scummvm/commit/46c3068a166deab19fda265d4ff26028e87e6e9a
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-09-05T06:38:55+02:00

Commit Message:
QDENGINE: Fix some trivial GCC warnings

Changed paths:
    engines/qdengine/qdengine.cpp
    engines/qdengine/system/graphics/gr_tile_animation.cpp


diff --git a/engines/qdengine/qdengine.cpp b/engines/qdengine/qdengine.cpp
index 0d8a2a57534..8a12714bc7d 100644
--- a/engines/qdengine/qdengine.cpp
+++ b/engines/qdengine/qdengine.cpp
@@ -483,7 +483,7 @@ void scan_qda() {
 		Common::Archive *archive = qdFileManager::instance().get_package(i);
 		Common::ArchiveMemberList members;
 
-		if (archive)
+		if (archive) {
 			archive->listMembers(members);
 
 			for (auto &it : members) {
@@ -515,6 +515,7 @@ void scan_qda() {
 					}
 				}
 			}
+		}
 	}
 }
 
diff --git a/engines/qdengine/system/graphics/gr_tile_animation.cpp b/engines/qdengine/system/graphics/gr_tile_animation.cpp
index 105a7bc3869..0257bd48c5a 100644
--- a/engines/qdengine/system/graphics/gr_tile_animation.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_animation.cpp
@@ -238,14 +238,14 @@ bool grTileAnimation::load(Common::SeekableReadStream *fh, int version) {
 	_frameSizeArray.resize(_frameCount);
 
 	if (version < 106) {
-		for (uint i = 0; i < _frameCount; i++)
+		for (int i = 0; i < _frameCount; i++)
 			_frameSizeArray[i] = _frameSize;
 	} else {
 		debugC(dL, kDebugLoad, "grTileAnimation::load(): pos: %ld _frameSizeArray size: %u", fh->pos() - 4, _frameCount);
 
 		debugCN(dL + 1, kDebugLoad, "   ");
 
-		for (uint i = 0; i < _frameCount; i++) {
+		for (int i = 0; i < _frameCount; i++) {
 			_frameSizeArray[i].x = fh->readUint32LE();
 			_frameSizeArray[i].y = fh->readUint32LE();
 
@@ -430,7 +430,7 @@ int grTileAnimation::find_closest_scale(float *scale) const {
 	int idx = -1;
 	float temp = 1.0;
 
-	for (int i = 0; i < _scaleArray.size(); i++) {
+	for (uint i = 0; i < _scaleArray.size(); i++) {
 		if (fabs(*scale - _scaleArray[i]._scale) < fabs(*scale - temp)) {
 			idx = i;
 			temp = _scaleArray[i]._scale;




More information about the Scummvm-git-logs mailing list