[Scummvm-git-logs] scummvm master -> df8859a6c68470a2a79d22de8e4db87d2d6e3b1c

[somaen]

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:
df8859a6c6 WATCHMAKER: Fix signedness mismatch for extraLS_BMP (CID 1509192)


Commit: df8859a6c68470a2a79d22de8e4db87d2d6e3b1c
    https://github.com/scummvm/scummvm/commit/df8859a6c68470a2a79d22de8e4db87d2d6e3b1c
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2024-07-18T23:01:36+02:00

Commit Message:
WATCHMAKER: Fix signedness mismatch for extraLS_BMP (CID 1509192)

Changed paths:
    engines/watchmaker/extraLS.cpp
    engines/watchmaker/ll/ll_util.cpp


diff --git a/engines/watchmaker/extraLS.cpp b/engines/watchmaker/extraLS.cpp
index 4d087f034c5..c55a968818e 100644
--- a/engines/watchmaker/extraLS.cpp
+++ b/engines/watchmaker/extraLS.cpp
@@ -32,7 +32,7 @@ char *ExtraLS[MAX_EXTRALS];
 #define EXTRALS_BKG_COLOR_G     0
 #define EXTRALS_BKG_COLOR_B     224
 
-uint32 extraLS_BMP = 0;
+int32 extraLS_BMP = 0;
 uint32 extraLS_currentID = 0;
 int32 extraLS_bmpPosX = 0;
 int32 extraLS_bmpPosY = 0;
diff --git a/engines/watchmaker/ll/ll_util.cpp b/engines/watchmaker/ll/ll_util.cpp
index 3c12f42c4bb..d92787e2fb8 100644
--- a/engines/watchmaker/ll/ll_util.cpp
+++ b/engines/watchmaker/ll/ll_util.cpp
@@ -221,7 +221,7 @@ int16 getRoomFromStr(Init &init, const Common::String &s) {
  *              CreateTooltipBitmap
  * --------------------------------------------------*/
 int32 CreateTooltipBitmap(Renderer &renderer, char *tooltip, FontColor color, uint8 r, uint8 g, uint8 b) {
-	int32 dimx, dimy, surf, enlarge = 5;
+	int32 dimx, dimy, enlarge = 5;
 	char info[100];
 
 	if (!tooltip || !strcmp(tooltip, "")) return -1;
@@ -231,7 +231,7 @@ int32 CreateTooltipBitmap(Renderer &renderer, char *tooltip, FontColor color, ui
 	dimx += renderer.rFitX(enlarge * 2);
 	dimy += renderer.rFitY(enlarge * 2);
 
-	surf = rCreateSurface(dimx, dimy, 0);
+	int32 surf = rCreateSurface(dimx, dimy, 0);
 	if (surf <= 0) return -1;
 
 	Common::strlcpy(info, "tooltip: ", 400);