[Scummvm-git-logs] scummvm master -> 298c54bcc1909fdb9ccf3d864988f2354897ee17

[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:
298c54bcc1 AGS: Fix Various Signed vs. Unsigned Comparison GCC Compiler Warnings


Commit: 298c54bcc1909fdb9ccf3d864988f2354897ee17
    https://github.com/scummvm/scummvm/commit/298c54bcc1909fdb9ccf3d864988f2354897ee17
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-05T22:54:04Z

Commit Message:
AGS: Fix Various Signed vs. Unsigned Comparison GCC Compiler Warnings

These are emitted if -Wsign-compare is passed to GCC.

Changed paths:
    engines/ags/engine/ac/draw.cpp
    engines/ags/engine/ac/game.cpp
    engines/ags/engine/ac/screen_overlay.cpp


diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index 0c3ed7581ba..6b4893ba5a7 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -633,7 +633,7 @@ void reset_drawobj_for_overlay(int objnum) {
 }
 
 void notify_sprite_changed(int sprnum, bool deleted) {
-	assert(sprnum >= 0 && sprnum < _GP(game).SpriteInfos.size());
+	assert(sprnum >= 0 && sprnum < (int)_GP(game).SpriteInfos.size());
 
 	// software renderer
 	// will need to know to redraw active cached sprite for objects.
diff --git a/engines/ags/engine/ac/game.cpp b/engines/ags/engine/ac/game.cpp
index b8d07e343ba..ca76cf24484 100644
--- a/engines/ags/engine/ac/game.cpp
+++ b/engines/ags/engine/ac/game.cpp
@@ -1288,7 +1288,7 @@ void replace_tokens(const char *srcmes, char *destm, size_t maxlen) {
 			indxdest++;
 			indxsrc++;
 		}
-		if (indxdest >= maxlen - 3)
+		if (indxdest >= (int)maxlen - 3)
 			break;
 	}
 	destm[indxdest] = 0;
diff --git a/engines/ags/engine/ac/screen_overlay.cpp b/engines/ags/engine/ac/screen_overlay.cpp
index 457cca93d92..fc843b451e4 100644
--- a/engines/ags/engine/ac/screen_overlay.cpp
+++ b/engines/ags/engine/ac/screen_overlay.cpp
@@ -79,8 +79,8 @@ void ScreenOverlay::SetImage(std::unique_ptr<Shared::Bitmap> pic, bool has_alpha
 void ScreenOverlay::SetSpriteNum(int sprnum, int offx, int offy) {
 	ResetImage();
 
-	assert(sprnum >= 0 && sprnum < _GP(game).SpriteInfos.size());
-	if (sprnum < 0 || sprnum >= _GP(game).SpriteInfos.size())
+	assert(sprnum >= 0 && sprnum < (int)_GP(game).SpriteInfos.size());
+	if (sprnum < 0 || sprnum >= (int)_GP(game).SpriteInfos.size())
 		return;
 
 	_flags |= kOver_SpriteShared | kOver_AlphaChannel * ((_GP(game).SpriteInfos[sprnum].Flags & SPF_ALPHACHANNEL) != 0);