diff options
| author | Le Philousophe | 2019-06-30 16:43:32 +0200 |
|---|---|---|
| committer | Le Philousophe | 2019-06-30 16:46:32 +0200 |
| commit | 38bead0c37c61e118378053659a2874830bbb85a (patch) | |
| tree | af55ad641838a27c288076a91dee6c14d9ff8469 /engines/cryomni3d/image | |
| parent | cabcf240b40c67d4777031bdef28e2a36c81c26d (diff) | |
| download | scummvm-rg350-38bead0c37c61e118378053659a2874830bbb85a.tar.gz scummvm-rg350-38bead0c37c61e118378053659a2874830bbb85a.tar.bz2 scummvm-rg350-38bead0c37c61e118378053659a2874830bbb85a.zip | |
JANITORIAL/CRYOMNI3D: Fix warnings in MSVC
Most of them were due to setting -1 to unsigned values
Else it was bogus unintialized values
Diffstat (limited to 'engines/cryomni3d/image')
| -rw-r--r-- | engines/cryomni3d/image/codecs/hlz.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/cryomni3d/image/codecs/hlz.cpp b/engines/cryomni3d/image/codecs/hlz.cpp index 146336efdc..6f550c7720 100644 --- a/engines/cryomni3d/image/codecs/hlz.cpp +++ b/engines/cryomni3d/image/codecs/hlz.cpp @@ -47,7 +47,7 @@ const Graphics::Surface *HLZDecoder::decodeFrame(Common::SeekableReadStream &str _surface->create(_width, _height, Graphics::PixelFormat::createFormatCLUT8()); byte *dst = (byte *)_surface->getPixels(); - decodeFrameInPlace(stream, -1, dst); + decodeFrameInPlace(stream, uint32(-1), dst); return _surface; } @@ -56,7 +56,7 @@ Graphics::PixelFormat HLZDecoder::getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); } -static inline bool getReg(Common::SeekableReadStream &stream, uint32 *size, uint32 *reg, +static inline uint getReg(Common::SeekableReadStream &stream, uint32 *size, uint32 *reg, int *regBits) { if (*regBits == 0) { if (*size < 4) { @@ -66,7 +66,7 @@ static inline bool getReg(Common::SeekableReadStream &stream, uint32 *size, uint *size -= 4; *regBits = 32; } - bool ret = (*reg >> 31) != 0; + uint ret = (*reg >> 31) & 0x1; *reg <<= 1; (*regBits)--; return ret; |