thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed VC++ warnings.

Browse source 
svn-id: r6279
This commit is contained in:
Jamieson Christian 2002-12-30 14:22:23 +00:00
parent 1fad3ca0b9
commit 7db414b203
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/boxes.cpp
View file

@ -85,7 +85,7 @@ byte Scumm::getMaskFromBox(int box)
return 0; return 0;
if (_features & GF_AFTER_V8) if (_features & GF_AFTER_V8)
return FROM_LE_32(ptr->v8.mask); return (byte) FROM_LE_32(ptr->v8.mask);
else else
return ptr->old.mask; return ptr->old.mask;
} }
@ -114,7 +114,7 @@ byte Scumm::getBoxFlags(int box)
if (!ptr) if (!ptr)
return 0; return 0;
if (_features & GF_AFTER_V8) if (_features & GF_AFTER_V8)
return FROM_LE_32(ptr->v8.flags); return (byte) FROM_LE_32(ptr->v8.flags);
else else
return ptr->old.flags; return ptr->old.flags;
} }
@ -147,7 +147,7 @@ byte Scumm::getNumBoxes()
if (!ptr) if (!ptr)
return 0; return 0;
if (_features & GF_AFTER_V8) if (_features & GF_AFTER_V8)
return READ_LE_UINT32(ptr); return (byte) READ_LE_UINT32(ptr);
else else
return ptr[0]; return ptr[0];
} }

2
scumm/gfx.cpp
View file

@ -945,7 +945,7 @@ void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int h,
else if (_vm->_features & GF_SMALL_HEADER) else if (_vm->_features & GF_SMALL_HEADER)
offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2); offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2);
else if (_vm->_features & GF_AFTER_V8) else if (_vm->_features & GF_AFTER_V8)
offs = READ_LE_UINT32(zplane_list[i] + stripnr * 4 + 8); offs = (uint16) READ_LE_UINT32(zplane_list[i] + stripnr * 4 + 8);
else else
offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 8); offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 8);