[Scummvm-cvs-logs] scummvm master -> 6269075ad67de618722e1c9e1e712950a749002b

[m-kiewitz]

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:
6269075ad6 SCI: fix kernelCoordinateToPriority


Commit: 6269075ad67de618722e1c9e1e712950a749002b
    https://github.com/scummvm/scummvm/commit/6269075ad67de618722e1c9e1e712950a749002b
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-01-14T23:37:13+01:00

Commit Message:
SCI: fix kernelCoordinateToPriority

do not check _priorityTop. Sierra never did it (I checked all sorts
of SCI versions, kq4 early, kq5, kq6, etc.) and checking it will
cause at least a priority issue in lsl2 in room 54 (airplane that
is taking off will be drawn using priority 1 instead of 0)

Changed paths:
    engines/sci/graphics/ports.cpp



diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp
index bcc9910..0d00ce0 100644
--- a/engines/sci/graphics/ports.cpp
+++ b/engines/sci/graphics/ports.cpp
@@ -717,8 +717,10 @@ void GfxPorts::kernelGraphAdjustPriority(int top, int bottom) {
 }
 
 byte GfxPorts::kernelCoordinateToPriority(int16 y) {
-	if (y < _priorityTop)
-		return _priorityBands[_priorityTop];
+	if (y < 0) // Sierra did not check this, we do for safety reasons
+		return _priorityBands[0];
+	// do NOT check for _priorityTop in here. Sierra never did that and it would cause
+	// at least priority issues in room 54 of lsl2 (airplane)
 	if (y > _priorityBottom)
 		return _priorityBands[_priorityBottom];
 	return _priorityBands[y];