[Scummvm-git-logs] scummvm master -> 75ee80cf1e2cbafff6523cc0a7c1376315959ab8

[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:
75ee80cf1e SLUDGE: Fix Some MSVC Warnings


Commit: 75ee80cf1e2cbafff6523cc0a7c1376315959ab8
    https://github.com/scummvm/scummvm/commit/75ee80cf1e2cbafff6523cc0a7c1376315959ab8
Author: D G Turner (digitall at scummvm.org)
Date: 2019-09-30T04:41:54+01:00

Commit Message:
SLUDGE: Fix Some MSVC Warnings

Changed paths:
    engines/sludge/backdrop.cpp
    engines/sludge/sprites.cpp


diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp
index 610a84a..dfb570f 100644
--- a/engines/sludge/backdrop.cpp
+++ b/engines/sludge/backdrop.cpp
@@ -388,7 +388,7 @@ bool GraphicsManager::loadLightMap(int v) {
 		if (_lightMapMode == LIGHTMAPMODE_HOTSPOT) {
 			return fatal("Light map width and height don't match scene width and height. That is required for lightmaps in HOTSPOT mode.");
 		} else if (_lightMapMode == LIGHTMAPMODE_PIXEL) {
-			tmp.blit(_lightMap, 0, 0, Graphics::FLIP_NONE, nullptr, TS_ARGB(255, 255, 255, 255), _sceneWidth, _sceneHeight);
+			tmp.blit(_lightMap, 0, 0, Graphics::FLIP_NONE, nullptr, TS_ARGB(255, 255, 255, 255), (int)_sceneWidth, (int)_sceneHeight);
 		} else {
 			_lightMap.copyFrom(tmp);
 		}
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index a7f82de..e7d0005 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -339,7 +339,7 @@ void GraphicsManager::blendColor(Graphics::Surface *blitted, uint32 color, Graph
 	Graphics::TransparentSurface tmp;
 	tmp.create(blitted->w, blitted->h, blitted->format);
 	tmp.fillRect(Common::Rect(0, 0, tmp.w, tmp.h), color);
-	tmp.blit(*blitted, 0, 0, Graphics::FLIP_NONE, nullptr, TS_ARGB(255, 255, 255, 255), blitted->w, blitted->h, mode);
+	tmp.blit(*blitted, 0, 0, Graphics::FLIP_NONE, nullptr, TS_ARGB(255, 255, 255, 255), (int)blitted->w, (int)blitted->h, mode);
 	tmp.free();
 }
 
@@ -376,7 +376,7 @@ Graphics::Surface *GraphicsManager::applyLightmapToSprite(Graphics::Surface *&bl
 					(mirror ? Graphics::FLIP_H : Graphics::FLIP_NONE),
 					(mirror ? &rect_h : &rect_none),
 					TS_ARGB(255, 255, 255, 255),
-					blitted->w, blitted->h, Graphics::BLEND_MULTIPLY);
+					(int)blitted->w, (int)blitted->h, Graphics::BLEND_MULTIPLY);
 		}
 	} else {
 		curLight[0] = curLight[1] = curLight[2] = 255;