aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/celobj32.cpp
diff options
context:
space:
mode:
authorColin Snover2016-02-18 21:09:15 -0600
committerColin Snover2016-02-18 21:11:06 -0600
commit1c4778d57196f0d0df9dfdb66fd890a23d6c69b4 (patch)
treeb799c48eb387fffb098920b0c0f3f12c69c26cf5 /engines/sci/graphics/celobj32.cpp
parentcca9fc918f9d9c89b5526cce43ea42a9a003735e (diff)
downloadscummvm-rg350-1c4778d57196f0d0df9dfdb66fd890a23d6c69b4.tar.gz
scummvm-rg350-1c4778d57196f0d0df9dfdb66fd890a23d6c69b4.tar.bz2
scummvm-rg350-1c4778d57196f0d0df9dfdb66fd890a23d6c69b4.zip
SCI: Minor cleanup
1. Reorder member initialisations to match class member order 2. Use #pragma mark instead of comments for annotating sections 3. Remove useless >=0 checks on unsigned types
Diffstat (limited to 'engines/sci/graphics/celobj32.cpp')
-rw-r--r--engines/sci/graphics/celobj32.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index d96bf370f5..f8bce26a2c 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -145,8 +145,8 @@ struct SCALER_Scale {
// so just always make the reader decompress an entire
// line of source data when scaling
_reader(celObj, celObj._width),
- _lastIndex(maxWidth - 1),
- _table(CelObj::_scaler->getScalerTable(scaleX, scaleY)) {}
+ _table(CelObj::_scaler->getScalerTable(scaleX, scaleY)),
+ _lastIndex(maxWidth - 1) {}
inline void setSource(const int16 x, const int16 y) {
_row = _reader.getRow(_table->valuesY[y]);
@@ -173,12 +173,10 @@ struct READER_Uncompressed {
private:
byte *_pixels;
const int16 _sourceWidth;
- const int16 _maxWidth;
public:
- READER_Uncompressed(const CelObj &celObj, const int16 maxWidth) :
- _sourceWidth(celObj._width),
- _maxWidth(maxWidth) {
+ READER_Uncompressed(const CelObj &celObj, const int16) :
+ _sourceWidth(celObj._width) {
byte *resource = celObj.getResPointer();
_pixels = resource + READ_SCI11ENDIAN_UINT32(resource + celObj._celHeaderOffset + 24);
}
@@ -202,11 +200,11 @@ private:
public:
READER_Compressed(const CelObj &celObj, const int16 maxWidth) :
- _y(-1),
- _maxWidth(maxWidth),
_resource(celObj.getResPointer()),
+ _y(-1),
_sourceHeight(celObj._height),
- _transparentColor(celObj._transparentColor) {
+ _transparentColor(celObj._transparentColor),
+ _maxWidth(maxWidth) {
assert(_maxWidth <= celObj._width);
byte *celHeader = _resource + celObj._celHeaderOffset;