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

m-kiewitz m_kiewitz at users.sourceforge.net
Sat Feb 20 15:48:28 CET 2016


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:
ed251ea004 SCI32: kIsOnMe searches _visiblePlanes, not just _planes


Commit: ed251ea004497b16198149cbe1d048404d05a900
    https://github.com/scummvm/scummvm/commit/ed251ea004497b16198149cbe1d048404d05a900
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-20T15:47:53+01:00

Commit Message:
SCI32: kIsOnMe searches _visiblePlanes, not just _planes

Forgot to mention that in last commit

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



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index d3c566f..a49ea08 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1869,7 +1869,7 @@ void GfxFrameout::kernelFrameout(const bool shouldShowBits) {
 
 uint16 GfxFrameout::kernelIsOnMe(int16 x, int16 y, uint16 checkPixels, reg_t screenObject) {
 	reg_t planeObject = readSelector(_segMan, screenObject, SELECTOR(plane));
-	Plane *screenItemPlane = _visiblePlanes.findByObject(planeObject);
+	Plane *screenItemPlane = _visiblePlanes.findByObject(planeObject); // Search for plane in visible planes
 	ScreenItem *screenItem = nullptr;
 
 	if (!screenItemPlane) {






More information about the Scummvm-git-logs mailing list