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

[m_kiewitz at users.sourceforge.net]

Revision: 44745
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44745&view=rev
Author:   m_kiewitz
Date:     2009-10-07 19:36:47 +0000 (Wed, 07 Oct 2009)

Log Message:
-----------
SCI/newgui: hopefully the final fix for drawpicture - set priority and control to "not draw" state, also added remark for fillroutine

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

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-07 19:02:11 UTC (rev 44744)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-07 19:36:47 UTC (rev 44745)
@@ -922,6 +922,7 @@
 	PenColor(orgPenColor);
 }
 
+// Do not replace w/ some generic code. This algo really needs to behave exactly as the one from sierra
 void SciGuiGfx::Pic_Fill(int16 x, int16 y, byte color, byte prio, byte control) {
 	Common::Stack<Common::Point> stack;
 	Common::Point p, p1;

Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-07 19:02:11 UTC (rev 44744)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-07 19:36:47 UTC (rev 44745)
@@ -289,7 +289,7 @@
 
 void SciGuiPicture::drawVectorData(byte *data, int dataSize) {
 	byte pic_op;
-	byte pic_color = 0, pic_priority = 0x0F, pic_control = 0x0F;
+	byte pic_color = 0, pic_priority = 255, pic_control = 255;
 	int16 x = 0, y = 0, oldx, oldy;
 	byte EGApalettes[PIC_EGAPALETTE_TOTALSIZE] = {0};
 	byte *EGApalette = &EGApalettes[_EGApaletteNo];


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