From 222b0d38876e39b71910600edfc80c673643a3b8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 11 Oct 2009 18:41:13 +0000
Subject: Fill box routines do not translate the fill box coordinates

svn-id: r44937
---
 engines/sci/gui/gui.cpp        | 12 +++---------
 engines/sci/gui/gui_screen.cpp |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'engines/sci/gui')

diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 6757efe155..424bc591ce 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -396,23 +396,17 @@ void SciGui::editControl(reg_t controlObject, reg_t eventObject) {
 
 void SciGui::graphFillBoxForeground(Common::Rect rect) {
 	_gfx->PaintRect(rect);
-	Common::Rect screenRect = rect;
-	_gfx->OffsetRect(screenRect);
-	_screen->copyRectToScreen(screenRect);
+	_screen->copyRectToScreen(rect);
 }
 
 void SciGui::graphFillBoxBackground(Common::Rect rect) {
 	_gfx->EraseRect(rect);
-	Common::Rect screenRect = rect;
-	_gfx->OffsetRect(screenRect);
-	_screen->copyRectToScreen(screenRect);
+	_screen->copyRectToScreen(rect);
 }
 
 void SciGui::graphFillBox(Common::Rect rect, uint16 colorMask, int16 color, int16 priority, int16 control) {
 	_gfx->FillRect(rect, colorMask, color, priority, control);
-	Common::Rect screenRect = rect;
-	_gfx->OffsetRect(screenRect);
-	_screen->copyRectToScreen(screenRect);
+	_screen->copyRectToScreen(rect);
 }
 
 void SciGui::graphDrawLine(Common::Point startPoint, Common::Point endPoint, int16 color, int16 priority, int16 control) {
diff --git a/engines/sci/gui/gui_screen.cpp b/engines/sci/gui/gui_screen.cpp
index eb58dda28d..18d5793606 100644
--- a/engines/sci/gui/gui_screen.cpp
+++ b/engines/sci/gui/gui_screen.cpp
@@ -75,7 +75,6 @@ void SciGuiScreen::copyToScreen() {
 }
 
 void SciGuiScreen::copyRectToScreen(const Common::Rect &rect) {
-	//g_system->copyRectToScreen(_activeScreen, _displayWidth, 0, 0, _displayWidth, _displayHeight);
 	g_system->copyRectToScreen(_activeScreen + rect.top * _displayWidth + rect.left, _displayWidth, rect.left, rect.top, rect.width(), rect.height());
 }
 
-- 
cgit v1.2.3