aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-11 18:41:13 +0000
committerFilippos Karapetis2009-10-11 18:41:13 +0000
commit222b0d38876e39b71910600edfc80c673643a3b8 (patch)
tree001177bb0dcccf4364e31d8a6a9b35cf1d66730a
parent16e852159a57d59f4b57a2752a50eb7611c5ab78 (diff)
downloadscummvm-rg350-222b0d38876e39b71910600edfc80c673643a3b8.tar.gz
scummvm-rg350-222b0d38876e39b71910600edfc80c673643a3b8.tar.bz2
scummvm-rg350-222b0d38876e39b71910600edfc80c673643a3b8.zip
Fill box routines do not translate the fill box coordinates
svn-id: r44937
-rw-r--r--engines/sci/gui/gui.cpp12
-rw-r--r--engines/sci/gui/gui_screen.cpp1
2 files changed, 3 insertions, 10 deletions
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());
}