[Scummvm-git-logs] scummvm master -> 8ffa6483f45960c2c0d919aa7c11f06a9c79f3b0

[sev-]

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

Summary:
25f13b5dab FULLPIPE: Fix Debug screen functionality
8ffa6483f4 FULLPIPE: Simplified Debug scene logic


Commit: 25f13b5dab0948c9934f5fcbabb5f84f9c9072aa
    https://github.com/scummvm/scummvm/commit/25f13b5dab0948c9934f5fcbabb5f84f9c9072aa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-20T23:03:10+02:00

Commit Message:
FULLPIPE: Fix Debug screen functionality

Changed paths:
    engines/fullpipe/scenes/sceneDbg.cpp



diff --git a/engines/fullpipe/scenes/sceneDbg.cpp b/engines/fullpipe/scenes/sceneDbg.cpp
index bd53f57..9df8c27 100644
--- a/engines/fullpipe/scenes/sceneDbg.cpp
+++ b/engines/fullpipe/scenes/sceneDbg.cpp
@@ -42,7 +42,7 @@ void sceneDbgMenu_initScene(Scene *sc) {
 
 GameObject *sceneHandlerDbgMenu_getObjectAtXY(int x, int y) {
 	if (g_fp->_currentScene)
-		for (uint i = 0; i < g_fp->_currentScene->_picObjList.size(); i++) {
+		for (uint i = 1; i < g_fp->_currentScene->_picObjList.size(); i++) {
 			PictureObject *pic = (PictureObject *)g_fp->_currentScene->_picObjList[i];
 
 			if (x >= pic->_ox && y >= pic->_oy) {


Commit: 8ffa6483f45960c2c0d919aa7c11f06a9c79f3b0
    https://github.com/scummvm/scummvm/commit/8ffa6483f45960c2c0d919aa7c11f06a9c79f3b0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-20T23:03:55+02:00

Commit Message:
FULLPIPE: Simplified Debug scene logic

Changed paths:
    engines/fullpipe/scenes/sceneDbg.cpp



diff --git a/engines/fullpipe/scenes/sceneDbg.cpp b/engines/fullpipe/scenes/sceneDbg.cpp
index 9df8c27..2ba5977 100644
--- a/engines/fullpipe/scenes/sceneDbg.cpp
+++ b/engines/fullpipe/scenes/sceneDbg.cpp
@@ -41,19 +41,21 @@ void sceneDbgMenu_initScene(Scene *sc) {
 }
 
 GameObject *sceneHandlerDbgMenu_getObjectAtXY(int x, int y) {
-	if (g_fp->_currentScene)
-		for (uint i = 1; i < g_fp->_currentScene->_picObjList.size(); i++) {
-			PictureObject *pic = (PictureObject *)g_fp->_currentScene->_picObjList[i];
+	if (!g_fp->_currentScene)
+		return 0;
+
+	for (uint i = 1; i < g_fp->_currentScene->_picObjList.size(); i++) {
+		PictureObject *pic = (PictureObject *)g_fp->_currentScene->_picObjList[i];
 
-			if (x >= pic->_ox && y >= pic->_oy) {
-				Common::Point point;
+		if (x >= pic->_ox && y >= pic->_oy) {
+			Common::Point point;
 
-				pic->getDimensions(&point);
+			pic->getDimensions(&point);
 
-				if (x <= pic->_ox + point.x && y <= pic->_oy + point.y && pic != g_vars->selector)
-					return pic;
-			}
+			if (x <= pic->_ox + point.x && y <= pic->_oy + point.y && pic != g_vars->selector)
+				return pic;
 		}
+	}
 
 	return 0;
 }