From 15fc39589d109245fd66d5cee6319ee19bb8e4d2 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 21 Jul 2010 12:05:10 +0000
Subject: SCI: more work on coordadjustment sci32

svn-id: r51084
---
 engines/sci/graphics/coordadjuster.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'engines/sci/graphics')

diff --git a/engines/sci/graphics/coordadjuster.cpp b/engines/sci/graphics/coordadjuster.cpp
index fbeffa7cd2..69f89aa656 100644
--- a/engines/sci/graphics/coordadjuster.cpp
+++ b/engines/sci/graphics/coordadjuster.cpp
@@ -101,14 +101,11 @@ void GfxCoordAdjuster32::kernelGlobalToLocal(int16 &x, int16 &y, reg_t planeObje
 	uint16 planeTop = readSelectorValue(s->_segMan, planeObject, SELECTOR(top));
 	uint16 planeLeft = readSelectorValue(s->_segMan, planeObject, SELECTOR(left));
 
-	planeTop = (planeTop * g_sci->_gfxScreen->getHeight()) / planeResY;
-	planeLeft = (planeLeft * g_sci->_gfxScreen->getWidth()) / planeResX;
+	y = ((y * planeResY) / g_sci->_gfxScreen->getHeight());
+	x = ((x * planeResX) / g_sci->_gfxScreen->getWidth());
 
 	y -= planeTop;
 	x -= planeLeft;
-
-	y = ((y * planeResY) / g_sci->_gfxScreen->getHeight());
-	x = ((x * planeResX) / g_sci->_gfxScreen->getWidth());
 }
 void GfxCoordAdjuster32::kernelLocalToGlobal(int16 &x, int16 &y, reg_t planeObject) {
 	EngineState *s = g_sci->getEngineState();
@@ -117,14 +114,11 @@ void GfxCoordAdjuster32::kernelLocalToGlobal(int16 &x, int16 &y, reg_t planeObje
 	uint16 planeTop = readSelectorValue(s->_segMan, planeObject, SELECTOR(top));
 	uint16 planeLeft = readSelectorValue(s->_segMan, planeObject, SELECTOR(left));
 
-	planeTop = (planeTop * g_sci->_gfxScreen->getHeight()) / planeResY;
-	planeLeft = (planeLeft * g_sci->_gfxScreen->getWidth()) / planeResX;
+	x += planeLeft;
+	y += planeTop;
 
 	y = ((y * g_sci->_gfxScreen->getHeight()) / planeResY);
 	x = ((x * g_sci->_gfxScreen->getWidth()) / planeResX);
-
-	x += planeLeft;
-	y += planeTop;
 }
 
 Common::Rect GfxCoordAdjuster32::onControl(Common::Rect rect) {
-- 
cgit v1.2.3