diff options
| author | David Turner | 2010-01-04 08:10:29 +0000 |
|---|---|---|
| committer | David Turner | 2010-01-04 08:10:29 +0000 |
| commit | ae9cf4d51e8c5f91e9009cab7cef54e23eb83a51 (patch) | |
| tree | cc6aa33e5fa8421f947d6ba0776b578a7d303cc9 /engines/mohawk/video/cinepak.cpp | |
| parent | ed06df7a25874f1ba98ed51fbc3669a4ef637501 (diff) | |
| download | scummvm-rg350-ae9cf4d51e8c5f91e9009cab7cef54e23eb83a51.tar.gz scummvm-rg350-ae9cf4d51e8c5f91e9009cab7cef54e23eb83a51.tar.bz2 scummvm-rg350-ae9cf4d51e8c5f91e9009cab7cef54e23eb83a51.zip | |
Mohawk : Improved code formatting conventions compliance.
svn-id: r46965
Diffstat (limited to 'engines/mohawk/video/cinepak.cpp')
| -rw-r--r-- | engines/mohawk/video/cinepak.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/mohawk/video/cinepak.cpp b/engines/mohawk/video/cinepak.cpp index dc287ff56c..c5289806cf 100644 --- a/engines/mohawk/video/cinepak.cpp +++ b/engines/mohawk/video/cinepak.cpp @@ -159,7 +159,7 @@ void CinepakDecoder::loadCodebook(Common::SeekableReadStream *stream, uint16 str for (uint16 i = 0; i < 256; i++) { if ((chunkID & 0x01) && !(mask >>= 1)) { if ((stream->pos() - startPos + 4) > (int32)chunkSize) - break; + break; flag = stream->readUint32BE(); mask = 0x80000000; @@ -209,14 +209,14 @@ void CinepakDecoder::decodeVectors(Common::SeekableReadStream *stream, uint16 st mask = 0x80000000; } - if (!(chunkID & 0x01) || (flag & mask)) { - if (!(chunkID & 0x02) && !(mask >>= 1)) { - if ((stream->pos() - startPos + 4) > (int32)chunkSize) - return; + if (!(chunkID & 0x01) || (flag & mask)) { + if (!(chunkID & 0x02) && !(mask >>= 1)) { + if ((stream->pos() - startPos + 4) > (int32)chunkSize) + return; - flag = stream->readUint32BE(); - mask = 0x80000000; - } + flag = stream->readUint32BE(); + mask = 0x80000000; + } if ((chunkID & 0x02) || (~flag & mask)) { if ((stream->pos() - startPos + 1) > (int32)chunkSize) |