[Scummvm-cvs-logs] SF.net SVN: scummvm:[44937] scummvm/trunk/engines/sci/gui

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Oct 11 20:41:13 CEST 2009


Revision: 44937
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44937&view=rev
Author:   thebluegr
Date:     2009-10-11 18:41:13 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Fill box routines do not translate the fill box coordinates

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui_screen.cpp

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-11 18:40:21 UTC (rev 44936)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-11 18:41:13 UTC (rev 44937)
@@ -396,23 +396,17 @@
 
 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) {

Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-11 18:40:21 UTC (rev 44936)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-11 18:41:13 UTC (rev 44937)
@@ -75,7 +75,6 @@
 }
 
 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());
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list