diff options
| author | Colin Snover | 2016-05-26 19:11:55 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-05-27 15:54:14 -0500 |
| commit | 4ee5b0f910ff46c386141cc72a627ac6aeb3ef03 (patch) | |
| tree | e2b30268c09a45a19f48199657cbcd4e9d544628 /engines | |
| parent | 2b2dffc02ce4c37466b1d31cf53ddb963a05e185 (diff) | |
| download | scummvm-rg350-4ee5b0f910ff46c386141cc72a627ac6aeb3ef03.tar.gz scummvm-rg350-4ee5b0f910ff46c386141cc72a627ac6aeb3ef03.tar.bz2 scummvm-rg350-4ee5b0f910ff46c386141cc72a627ac6aeb3ef03.zip | |
SCI32: Use better name for fixed priority field
The old name matches the selector, but isn’t as clear.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/plane32.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/screen_item32.cpp | 12 | ||||
| -rw-r--r-- | engines/sci/graphics/screen_item32.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp index d5c297ebf7..470986fb3c 100644 --- a/engines/sci/graphics/plane32.cpp +++ b/engines/sci/graphics/plane32.cpp @@ -173,7 +173,7 @@ void Plane::addPicInternal(const GuiResourceId pictureId, const Common::Point *p screenItem->_pictureId = pictureId; screenItem->_mirrorX = mirrorX; screenItem->_priority = celObj->_priority; - screenItem->_fixPriority = true; + screenItem->_fixedPriority = true; if (position != nullptr) { screenItem->_position = *position + celObj->_relativePosition; } else { diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp index c3fdbb6845..953091470f 100644 --- a/engines/sci/graphics/screen_item32.cpp +++ b/engines/sci/graphics/screen_item32.cpp @@ -55,7 +55,7 @@ _useInsetRect(false), _z(0), _celInfo(celInfo), _celObj(nullptr), -_fixPriority(false), +_fixedPriority(false), _position(0, 0), _object(make_reg(0, _nextObjectId++)), _pictureId(-1), @@ -70,7 +70,7 @@ _useInsetRect(false), _z(0), _celInfo(celInfo), _celObj(nullptr), -_fixPriority(false), +_fixedPriority(false), _position(rect.left, rect.top), _object(make_reg(0, _nextObjectId++)), _pictureId(-1), @@ -90,7 +90,7 @@ _useInsetRect(false), _z(0), _celInfo(celInfo), _celObj(nullptr), -_fixPriority(false), +_fixedPriority(false), _position(position), _object(make_reg(0, _nextObjectId++)), _pictureId(-1), @@ -209,10 +209,10 @@ void ScreenItem::setFromObject(SegManager *segMan, const reg_t object, const boo } if (readSelectorValue(segMan, object, SELECTOR(fixPriority))) { - _fixPriority = true; + _fixedPriority = true; _priority = readSelectorValue(segMan, object, SELECTOR(priority)); } else { - _fixPriority = false; + _fixedPriority = false; writeSelectorValue(segMan, object, SELECTOR(priority), _position.y); } @@ -402,7 +402,7 @@ void ScreenItem::calcRects(const Plane &plane) { _screenRect.top = 0; } - if (!_fixPriority) { + if (!_fixedPriority) { _priority = _z + _position.y; } } else { diff --git a/engines/sci/graphics/screen_item32.h b/engines/sci/graphics/screen_item32.h index 977d80ebad..cda98c8281 100644 --- a/engines/sci/graphics/screen_item32.h +++ b/engines/sci/graphics/screen_item32.h @@ -132,7 +132,7 @@ public: * in place. Otherwise, the priority of the screen item * is calculated from its y-position + z-index. */ - bool _fixPriority; + bool _fixedPriority; /** * The rendering priority of the screen item, relative |