diff options
| author | Colin Snover | 2016-12-18 22:47:57 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-12-19 14:46:58 -0600 |
| commit | ba619a08dd5a2076c361155690736043f01b4703 (patch) | |
| tree | 76e8bc802662ea2eee1d972d90585362c86635dc /engines/sci/graphics/screen_item32.cpp | |
| parent | 6412b323860e9eb351efd46c57ea65ebd56b2823 (diff) | |
| download | scummvm-rg350-ba619a08dd5a2076c361155690736043f01b4703.tar.gz scummvm-rg350-ba619a08dd5a2076c361155690736043f01b4703.tar.bz2 scummvm-rg350-ba619a08dd5a2076c361155690736043f01b4703.zip | |
SCI32: Change plane and screen item sorting algorithm
SSCI's last resort comparison here was to compare the object IDs
of planes & screen items, but this randomly breaks (at least) the
"you have died" dialog at the end of Phant1, and text & buttons
in Hoyle5, even in SSCI itself.
This commit changes last resort comparison to use a monotonically
increasing ID instead, which keeps objects with identical priority
& z-index in creation order when compared.
Fixes Trac#9585.
Diffstat (limited to 'engines/sci/graphics/screen_item32.cpp')
| -rw-r--r-- | engines/sci/graphics/screen_item32.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp index 9b0d390cc3..a70f25fd6b 100644 --- a/engines/sci/graphics/screen_item32.cpp +++ b/engines/sci/graphics/screen_item32.cpp @@ -34,8 +34,10 @@ namespace Sci { #pragma mark ScreenItem uint16 ScreenItem::_nextObjectId = 20000; +uint32 ScreenItem::_nextCreationId = 0; ScreenItem::ScreenItem(const reg_t object) : +_creationId(_nextCreationId++), _celObj(nullptr), _object(object), _pictureId(-1), @@ -51,6 +53,7 @@ _drawBlackLines(false) { } ScreenItem::ScreenItem(const reg_t plane, const CelInfo32 &celInfo) : +_creationId(_nextCreationId++), _plane(plane), _useInsetRect(false), _z(0), @@ -67,6 +70,7 @@ _mirrorX(false), _drawBlackLines(false) {} ScreenItem::ScreenItem(const reg_t plane, const CelInfo32 &celInfo, const Common::Rect &rect) : +_creationId(_nextCreationId++), _plane(plane), _useInsetRect(false), _z(0), @@ -87,6 +91,7 @@ _drawBlackLines(false) { } ScreenItem::ScreenItem(const reg_t plane, const CelInfo32 &celInfo, const Common::Point &position, const ScaleInfo &scaleInfo) : +_creationId(_nextCreationId++), _plane(plane), _scale(scaleInfo), _useInsetRect(false), @@ -104,6 +109,7 @@ _mirrorX(false), _drawBlackLines(false) {} ScreenItem::ScreenItem(const ScreenItem &other) : +_creationId(other._creationId), _plane(other._plane), _scale(other._scale), _useInsetRect(other._useInsetRect), @@ -131,6 +137,7 @@ void ScreenItem::operator=(const ScreenItem &other) { _celObj = nullptr; } + _creationId = other._creationId; _screenRect = other._screenRect; _mirrorX = other._mirrorX; _useInsetRect = other._useInsetRect; @@ -148,6 +155,7 @@ ScreenItem::~ScreenItem() { void ScreenItem::init() { _nextObjectId = 20000; + _nextCreationId = 0; } void ScreenItem::setFromObject(SegManager *segMan, const reg_t object, const bool updateCel, const bool updateBitmap) { @@ -476,10 +484,11 @@ CelObj &ScreenItem::getCelObj() const { } void ScreenItem::printDebugInfo(Console *con) const { - con->debugPrintf("%04x:%04x (%s), prio %d, x %d, y %d, z: %d, scaledX: %d, scaledY: %d flags: %d\n", + con->debugPrintf("%04x:%04x (%s), prio %d, ins %u, x %d, y %d, z: %d, scaledX: %d, scaledY: %d flags: %d\n", _object.getSegment(), _object.getOffset(), g_sci->getEngineState()->_segMan->getObjectName(_object), _priority, + _creationId, _position.x, _position.y, _z, |