[Scummvm-git-logs] scummvm master -> 5f0b08ebf1e816e53371deebfe1b086c8acbfefc

[bluegr]

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

Summary:
5f0b08ebf1 NANCY: Fix MSVC warnings


Commit: 5f0b08ebf1e816e53371deebfe1b086c8acbfefc
    https://github.com/scummvm/scummvm/commit/5f0b08ebf1e816e53371deebfe1b086c8acbfefc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-05-27T10:57:18+03:00

Commit Message:
NANCY: Fix MSVC warnings

Changed paths:
    engines/nancy/action/puzzle/peepholepuzzle.cpp
    engines/nancy/action/puzzle/tangrampuzzle.cpp
    engines/nancy/cif.h


diff --git a/engines/nancy/action/puzzle/peepholepuzzle.cpp b/engines/nancy/action/puzzle/peepholepuzzle.cpp
index 3ffe195143d..0d3460d2385 100644
--- a/engines/nancy/action/puzzle/peepholepuzzle.cpp
+++ b/engines/nancy/action/puzzle/peepholepuzzle.cpp
@@ -168,7 +168,7 @@ void PeepholePuzzle::handleInput(NancyInput &input) {
 	// Perform movement
 	if (_pressedButton != -1 && _pressStart != 0) {
 		uint32 curTime = g_nancy->getTotalPlayTime();
-		uint pixelsToMove = 0;
+		int16 pixelsToMove = 0;
 		if (curTime - _pressStart >= 1000u / _pixelsToScroll) {
 			pixelsToMove = (curTime - _pressStart) / (1000 / _pixelsToScroll);
 		}
diff --git a/engines/nancy/action/puzzle/tangrampuzzle.cpp b/engines/nancy/action/puzzle/tangrampuzzle.cpp
index e7bc5b2cc15..534577ce83b 100644
--- a/engines/nancy/action/puzzle/tangrampuzzle.cpp
+++ b/engines/nancy/action/puzzle/tangrampuzzle.cpp
@@ -431,7 +431,7 @@ void TangramPuzzle::Tile::drawMask() {
 		uint16 *src = (uint16 *)_drawSurface.getBasePtr(0, y);
 		for (int x = 0; x < _drawSurface.w; ++x) {
 			if (*src == transColor) {
-				_mask[y * _drawSurface.w + x] = -1;
+				_mask[y * _drawSurface.w + x] = (byte)-1;
 			} else {
 				_mask[y * _drawSurface.w + x] = _id;
 			}
diff --git a/engines/nancy/cif.h b/engines/nancy/cif.h
index 672d1998100..db5b5650af1 100644
--- a/engines/nancy/cif.h
+++ b/engines/nancy/cif.h
@@ -55,7 +55,7 @@ struct CifInfo {
 	uint32 compressedSize = 0, size = 0;
 	Common::Rect src, dest; // Used when drawing conversation cels
 
-	uint32 dataOffset;
+	uint32 dataOffset = 0;
 };
 
 // Wrapper for a single file. Exclusively used for scene IFFs, though it can contain anything.