[Scummvm-cvs-logs] scummvm master -> ab5ade8022bd0524b47f4f7dd531cb072ad2eb2f

[bluegr]

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:
ab5ade8022 SCI: Add a hack to fix the inventory in GK1


Commit: ab5ade8022bd0524b47f4f7dd531cb072ad2eb2f
    https://github.com/scummvm/scummvm/commit/ab5ade8022bd0524b47f4f7dd531cb072ad2eb2f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-07-29T18:21:51-07:00

Commit Message:
SCI: Add a hack to fix the inventory in GK1

For some reason, the top left nsRect coordinates get swapped in the GK1
inventory screen, investigate why

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



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index bb960c8..ca1ef35 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -779,6 +779,14 @@ void GfxFrameout::kernelFrameout() {
 						_coordAdjuster->fromDisplayToScript(nsRect.bottom, nsRect.right);
 						g_sci->_gfxCompare->setNSRect(itemEntry->object, nsRect);
 					}
+
+					// TODO: For some reason, the top left nsRect coordinates get
+					// swapped in the GK1 inventory screen, investigate why.
+					// HACK: Fix the coordinates by explicitly setting them here.
+					Common::Rect objNSRect = g_sci->_gfxCompare->getNSRect(itemEntry->object);
+					if (objNSRect.top == nsRect.left && objNSRect.left == nsRect.top && nsRect.top != 0 && nsRect.left != 0) {
+						g_sci->_gfxCompare->setNSRect(itemEntry->object, nsRect);
+					}
 				}
 
 				// Don't attempt to draw sprites that are outside the visible