[Scummvm-git-logs] scummvm branch-2-2 -> 4a7cb520c15e2cbfe6a6d70f4e95ab71993c1553

[yuv422]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4a7cb520c1 DRAGONS: Fixed Flicker sprite priority when walking off screen. Trac#11642


Commit: 4a7cb520c15e2cbfe6a6d70f4e95ab71993c1553
    https://github.com/scummvm/scummvm/commit/4a7cb520c15e2cbfe6a6d70f4e95ab71993c1553
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-09-01T22:51:18+10:00

Commit Message:
DRAGONS: Fixed Flicker sprite priority when walking off screen. Trac#11642

Changed paths:
    engines/dragons/dragons.cpp


diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index 29b2609929..1fb05730c7 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -689,7 +689,7 @@ void DragonsEngine::updateHandler() {
 				int16 priority = _scene->getPriorityAtPosition(Common::Point(actor->_x_pos, actor->_y_pos));
 				DragonINI *flicker = _dragonINIResource->getFlickerRecord();
 				if (flicker && _scene->contains(flicker) && flicker->actor->_actorID == i) {
-					if (priority < 8 || priority == 0x10) {
+					if ((priority >= 0 && priority < 8) || priority == 0x10) {
 						actor->_priorityLayer = priority;
 					}
 				} else {