diff options
| author | Eugene Sandulenko | 2019-12-26 00:55:32 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-12-26 00:55:32 +0100 |
| commit | 46dbffe609986bcd9e27ae267ab44dcfe0d1f4d1 (patch) | |
| tree | a066a951c578ff27ca4dc226df4401cc94e58a1a /engines | |
| parent | ac2b6af639289c97cb7ff865e45fd99d85103866 (diff) | |
| download | scummvm-rg350-46dbffe609986bcd9e27ae267ab44dcfe0d1f4d1.tar.gz scummvm-rg350-46dbffe609986bcd9e27ae267ab44dcfe0d1f4d1.tar.bz2 scummvm-rg350-46dbffe609986bcd9e27ae267ab44dcfe0d1f4d1.zip | |
DIRECTOR: Renamed few variables
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/director/cast.cpp | 11 | ||||
| -rw-r--r-- | engines/director/cast.h | 2 | ||||
| -rw-r--r-- | engines/director/score.cpp | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp index 86c4abb16f..e7f30d8461 100644 --- a/engines/director/cast.cpp +++ b/engines/director/cast.cpp @@ -33,7 +33,7 @@ namespace Director { BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint32 castTag, uint16 version) { if (version < 4) { _pitch = 0; - _flags = stream.readByte(); + _flags = stream.readByte(); // region: 0 - auto, 1 - matte, 2 - disabled _bytes = stream.readUint16(); _initialRect = Score::readRect(stream); _boundingRect = Score::readRect(stream); @@ -42,10 +42,10 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint32 castTag, uint16 if (_bytes & 0x8000) { _bitsPerPixel = stream.readUint16(); - _unk2 = stream.readUint16(); + _clut = stream.readUint16(); } else { _bitsPerPixel = 1; - _unk2 = 0; + _clut = 0; } _pitch = _initialRect.width(); @@ -57,7 +57,7 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint32 castTag, uint16 _flags = 0; _bytes = 0; - _unk2 = 0; + _clut = 0; _initialRect = Score::readRect(stream); _boundingRect = Score::readRect(stream); @@ -97,6 +97,7 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint32 castTag, uint16 _regX = 0; _regY = 0; + _clut = 0; stream.readUint32(); } @@ -119,7 +120,7 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) { _palinfo1 = _palinfo2 = _palinfo3 = 0; if (version <= 3) { - _flags1 = stream.readByte(); + _flags1 = stream.readByte(); // region: 0 - auto, 1 - matte, 2 - disabled _borderSize = static_cast<SizeType>(stream.readByte()); _gutterSize = static_cast<SizeType>(stream.readByte()); _boxShadow = static_cast<SizeType>(stream.readByte()); diff --git a/engines/director/cast.h b/engines/director/cast.h index 6c8704158c..9e80545353 100644 --- a/engines/director/cast.h +++ b/engines/director/cast.h @@ -61,7 +61,7 @@ public: uint16 _regY; uint8 _flags; uint16 _bytes; - uint16 _unk2; + uint16 _clut; uint16 _bitsPerPixel; diff --git a/engines/director/score.cpp b/engines/director/score.cpp index 2cb9b6a97b..f74c636b7c 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -346,8 +346,8 @@ void Score::loadSpriteImages(bool isSharedCast) { } int w = bitmapCast->_initialRect.width(), h = bitmapCast->_initialRect.height(); - debugC(4, kDebugImages, "Score::loadSpriteImages(): id: %d, w: %d, h: %d, flags: %x, bytes: %x, bpp: %d unk2: %x", - imgId, w, h, bitmapCast->_flags, bitmapCast->_bytes, bitmapCast->_bitsPerPixel, bitmapCast->_unk2); + debugC(4, kDebugImages, "Score::loadSpriteImages(): id: %d, w: %d, h: %d, flags: %x, bytes: %x, bpp: %d clut: %x", + imgId, w, h, bitmapCast->_flags, bitmapCast->_bytes, bitmapCast->_bitsPerPixel, bitmapCast->_clut); if (pic != NULL && bitmapCast != NULL && w > 0 && h > 0) { if (_vm->getVersion() < 6) { |