From b9ad7e80a5ec37f59f39858dd5eef7e519afffa2 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 17 Oct 2013 20:24:17 +0000
Subject: ZVISION: screenSpaceToImageSpace return 0,0 when pointer outside
 working window.

---
 engines/zvision/render_manager.cpp | 44 +++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index af8ca7fd64..cb13606b11 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -385,30 +385,34 @@ Common::Rect RenderManager::renderTextToWorkingWindow(uint32 idNumber, const Com
 }
 
 const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &point) {
-	// Convert from screen space to working window space
-	Common::Point newPoint(point - Common::Point(_workingWindow.left, _workingWindow.top));
+	if (_workingWindow.contains(point)) {
+		// Convert from screen space to working window space
+		Common::Point newPoint(point - Common::Point(_workingWindow.left, _workingWindow.top));
 
-	RenderTable::RenderState state = _renderTable.getRenderState();
-	if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-		newPoint = _renderTable.convertWarpedCoordToFlatCoord(newPoint);
-	}
+		RenderTable::RenderState state = _renderTable.getRenderState();
+		if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
+			newPoint = _renderTable.convertWarpedCoordToFlatCoord(newPoint);
+		}
 
-	if (state == RenderTable::PANORAMA) {
-		newPoint -= (Common::Point(_screenCenterX, 0) - _backgroundOffset);
-	} else if (state == RenderTable::TILT) {
-		newPoint -= (Common::Point(0, _screenCenterY) - _backgroundOffset);
-	}
+		if (state == RenderTable::PANORAMA) {
+			newPoint -= (Common::Point(_screenCenterX, 0) - _backgroundOffset);
+		} else if (state == RenderTable::TILT) {
+			newPoint -= (Common::Point(0, _screenCenterY) - _backgroundOffset);
+		}
 
-	if (newPoint.x < 0)
-		newPoint.x += _backgroundWidth;
-	else if (newPoint.x >= _backgroundWidth)
-		newPoint.x -= _backgroundWidth;
-	if (newPoint.y < 0)
-		newPoint.y += _backgroundHeight;
-	else if (newPoint.y >= _backgroundHeight)
-		newPoint.y -= _backgroundHeight;
+		if (newPoint.x < 0)
+			newPoint.x += _backgroundWidth;
+		else if (newPoint.x >= _backgroundWidth)
+			newPoint.x -= _backgroundWidth;
+		if (newPoint.y < 0)
+			newPoint.y += _backgroundHeight;
+		else if (newPoint.y >= _backgroundHeight)
+			newPoint.y -= _backgroundHeight;
 
-	return newPoint;
+		return newPoint;
+	} else {
+		return Common::Point(0, 0);
+	}
 }
 
 const Common::Point RenderManager::imageSpaceToWorkingWindowSpace(const Common::Point &point) {
-- 
cgit v1.2.3