aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/macventure/gui.cpp2
-rw-r--r--engines/macventure/saveload.cpp2
-rw-r--r--engines/macventure/world.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 34aa2c90cb..cc1de7cab2 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 c63b6a6951..f926d3cc8b 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 23483cb642..b8b7aeaf59 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;