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

[m_kiewitz at users.sourceforge.net]

Revision: 45004
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45004&view=rev
Author:   m_kiewitz
Date:     2009-10-13 07:17:30 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGuiScreen putPixel etc. needs to use _width and _height instead of _displayWidth and _displayHeight

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

Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-13 06:52:31 UTC (rev 45003)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-13 07:17:30 UTC (rev 45004)
@@ -82,7 +82,7 @@
 }
 
 void SciGuiScreen::putPixel(int x, int y, byte drawMask, byte color, byte priority, byte control) {
-	int offset = y * _displayWidth + x;
+	int offset = y * _width + x;
 
 	if (drawMask & SCI_SCREEN_MASK_VISUAL) {
 		_visualScreen[offset] = color;
@@ -159,26 +159,26 @@
 }
 
 byte SciGuiScreen::getVisual(int x, int y) {
-	return _visualScreen[y * _displayWidth + x];
+	return _visualScreen[y * _width + x];
 }
 
 byte SciGuiScreen::getPriority(int x, int y) {
-	return _priorityScreen[y * _displayWidth + x];
+	return _priorityScreen[y * _width + x];
 }
 
 byte SciGuiScreen::getControl(int x, int y) {
-	return _controlScreen[y * _displayWidth + x];
+	return _controlScreen[y * _width + x];
 }
 
-byte SciGuiScreen::isFillMatch(int16 x, int16 y, byte flag, byte t_color, byte t_pri, byte t_con) {
-	int offset = y * _displayWidth + x;
+byte SciGuiScreen::isFillMatch(int16 x, int16 y, byte screenMask, byte t_color, byte t_pri, byte t_con) {
+	int offset = y * _width + x;
 	byte match = 0;
 
-	if (flag & SCI_SCREEN_MASK_VISUAL && *(_visualScreen + offset) == t_color)
+	if (screenMask & SCI_SCREEN_MASK_VISUAL && *(_visualScreen + offset) == t_color)
 		match |= SCI_SCREEN_MASK_VISUAL;
-	if (flag & SCI_SCREEN_MASK_PRIORITY && *(_priorityScreen + offset) == t_pri)
+	if (screenMask & SCI_SCREEN_MASK_PRIORITY && *(_priorityScreen + offset) == t_pri)
 		match |= SCI_SCREEN_MASK_PRIORITY;
-	if (flag & SCI_SCREEN_MASK_CONTROL && *(_controlScreen + offset) == t_con)
+	if (screenMask & SCI_SCREEN_MASK_CONTROL && *(_controlScreen + offset) == t_con)
 		match |= SCI_SCREEN_MASK_CONTROL;
 	return match;
 }


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