mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-05 09:49:14 +00:00
MACVENTURE: Fix MSVC Warnings
This commit is contained in:
parent
cd66894016
commit
6dcb7e0dbb
@ -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++;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user