[Scummvm-git-logs] scummvm master -> 6dcb7e0dbb92843013cb44388b935f0739ed890b

[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:
6dcb7e0dbb MACVENTURE: Fix MSVC Warnings


Commit: 6dcb7e0dbb92843013cb44388b935f0739ed890b
    https://github.com/scummvm/scummvm/commit/6dcb7e0dbb92843013cb44388b935f0739ed890b
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-01T04:24:21+01:00

Commit Message:
MACVENTURE: Fix MSVC Warnings

Changed paths:
    engines/macventure/gui.cpp
    engines/macventure/saveload.cpp
    engines/macventure/world.cpp


diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 34aa2c9..cc1de7c 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -849,7 +849,7 @@ void Gui::updateExit(ObjID obj) {
 	int i = 0;
 	Common::Array<CommandButton>::const_iterator it = _exitsData->begin();
 	for (;it != _exitsData->end(); it++) {
-		if (it->getData().refcon == obj)
+		if ((ObjID)it->getData().refcon == obj)
 			ctl = i;
 		else
 			i++;
diff --git a/engines/macventure/saveload.cpp b/engines/macventure/saveload.cpp
index c63b6a6..f926d3c 100644
--- a/engines/macventure/saveload.cpp
+++ b/engines/macventure/saveload.cpp
@@ -62,7 +62,7 @@ SaveStateDescriptor loadMetaData(Common::SeekableReadStream *s, int slot, bool s
 
 	// Depends on MACVENTURE_DESC_LENGTH
 	uint32 metaSize = s->readUint32BE();
-	s->seek(-(5 + MACVENTURE_DESC_LENGTH + metaSize), SEEK_END);
+	s->seek(-((int32)(5 + MACVENTURE_DESC_LENGTH + metaSize)), SEEK_END);
 
 	// Load the thumbnail
 	Graphics::Surface *thumbnail;
diff --git a/engines/macventure/world.cpp b/engines/macventure/world.cpp
index 23483cb..b8b7aea 100644
--- a/engines/macventure/world.cpp
+++ b/engines/macventure/world.cpp
@@ -104,7 +104,7 @@ uint32 World::getObjAttr(ObjID objID, uint32 attrID) {
 	res &= _engine->getGlobalSettings()._attrMasks[attrID];
 	res >>= _engine->getGlobalSettings()._attrShifts[attrID];
 	if (res & 0x8000)
-		res = -((res ^ 0xffff) + 1);
+		res = -((int)((res ^ 0xffff) + 1));
 	debugC(5, kMVDebugMain, "Attribute %x from object %x is %x", attrID, objID, res);
 	delete objStream;
 	return res;