diff options
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/gfx.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/saveload.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index bb1a7ffaf1..1d1b6b4f13 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -380,7 +380,7 @@ void ScummEngine::initVirtScreen(VirtScreenNumber slot, int top, int width, int int size; assert(height >= 0); - assert(slot >= 0 && slot < 4); + assert((int)slot >= 0 && (int)slot < 4); if (_game.version >= 7) { if (slot == kMainVirtScreen && (_roomHeight != 0)) diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 8d278f6ddf..fc3c193e74 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1242,7 +1242,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { } s->saveUint16(0xFFFF); // End marker } else { - while ((type = (ResType)s->loadUint16()) != 0xFFFF) { + while ((int)(type = (ResType)s->loadUint16()) != 0xFFFF) { while ((idx = s->loadUint16()) != 0xFFFF) { assert(idx < _res->_types[type].size()); loadResource(s, type, idx); @@ -1430,7 +1430,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { } s->saveByte(0xFF); } else { - while ((type = (ResType)s->loadByte()) != 0xFF) { + while ((int)(type = (ResType)s->loadByte()) != 0xFF) { idx = s->loadUint16(); _res->lock(type, idx); } |