diff options
| author | Jamieson Christian | 2002-12-30 14:22:23 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2002-12-30 14:22:23 +0000 |
| commit | 7db414b203bba1b6d9ed9564022b71a12b105957 (patch) | |
| tree | 9efc6a13850c94adcf6655e2dcfefe20789449c4 /scumm | |
| parent | 1fad3ca0b92640ab08252b3d5dce7e9cfcadb533 (diff) | |
| download | scummvm-rg350-7db414b203bba1b6d9ed9564022b71a12b105957.tar.gz scummvm-rg350-7db414b203bba1b6d9ed9564022b71a12b105957.tar.bz2 scummvm-rg350-7db414b203bba1b6d9ed9564022b71a12b105957.zip | |
Fixed VC++ warnings.
svn-id: r6279
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/boxes.cpp | 6 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index 5821eb6eee..6098cfce38 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -85,7 +85,7 @@ byte Scumm::getMaskFromBox(int box) return 0; if (_features & GF_AFTER_V8) - return FROM_LE_32(ptr->v8.mask); + return (byte) FROM_LE_32(ptr->v8.mask); else return ptr->old.mask; } @@ -114,7 +114,7 @@ byte Scumm::getBoxFlags(int box) if (!ptr) return 0; if (_features & GF_AFTER_V8) - return FROM_LE_32(ptr->v8.flags); + return (byte) FROM_LE_32(ptr->v8.flags); else return ptr->old.flags; } @@ -147,7 +147,7 @@ byte Scumm::getNumBoxes() if (!ptr) return 0; if (_features & GF_AFTER_V8) - return READ_LE_UINT32(ptr); + return (byte) READ_LE_UINT32(ptr); else return ptr[0]; } diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 6d1e1e5fc1..018e3ff725 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -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) offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2); 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 offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 8); |