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

[m_kiewitz at users.sourceforge.net]

Revision: 44700
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44700&view=rev
Author:   m_kiewitz
Date:     2009-10-06 16:25:34 +0000 (Tue, 06 Oct 2009)

Log Message:
-----------
SCI/newgui: Draw_Line() now doesnt modify prio/control anymore

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

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-06 16:19:20 UTC (rev 44699)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-06 16:25:34 UTC (rev 44700)
@@ -648,11 +648,9 @@
 	lineData->screen->putPixel(x, y, lineData->drawMask, (byte)c, lineData->prio, lineData->control);
 }
 
-void SciGuiGfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte color, byte prio, byte control) {
+void SciGuiGfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte color, byte priority, byte control) {
 	//set_drawing_flag
-	byte flag = _screen->getDrawingMask(color, prio, control);
-	prio &= 0xF0;
-	control &= 0x0F;
+	byte drawMask = _screen->getDrawingMask(color, priority, control);
 
 	// offseting the line
 	left += _curPort->left;
@@ -661,8 +659,8 @@
 	bottom += _curPort->top;
 
 	LineData lineData;
-	lineData.drawMask = flag;
-	lineData.prio = prio;
+	lineData.drawMask = drawMask;
+	lineData.prio = priority;
 	lineData.control = control;
 	lineData.screen = _screen;
 


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