From d2fdc8fc79839ebb7cc2b2e61644651d534e34a5 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 6 Oct 2009 16:25:34 +0000
Subject: SCI/newgui: Draw_Line() now doesnt modify prio/control anymore

svn-id: r44700
---
 engines/sci/gui/gui_gfx.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index 2274a86de4..dbad1bb162 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -648,11 +648,9 @@ static void drawProc(int x, int y, int c, void *data) {
 	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 @@ void SciGuiGfx::Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte
 	bottom += _curPort->top;
 
 	LineData lineData;
-	lineData.drawMask = flag;
-	lineData.prio = prio;
+	lineData.drawMask = drawMask;
+	lineData.prio = priority;
 	lineData.control = control;
 	lineData.screen = _screen;
 
-- 
cgit v1.2.3