aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-07 19:36:47 +0000
committerMartin Kiewitz2009-10-07 19:36:47 +0000
commit971f495103355c79f726d5c1c3a33b809f46320e (patch)
treec0d62d95a36305797f76a282a9328e3da65fd410 /engines/sci/gui
parent51784e95808f751027a5ca011d10d421e86d992e (diff)
downloadscummvm-rg350-971f495103355c79f726d5c1c3a33b809f46320e.tar.gz
scummvm-rg350-971f495103355c79f726d5c1c3a33b809f46320e.tar.bz2
scummvm-rg350-971f495103355c79f726d5c1c3a33b809f46320e.zip
SCI/newgui: hopefully the final fix for drawpicture - set priority and control to "not draw" state, also added remark for fillroutine
svn-id: r44745
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui_gfx.cpp1
-rw-r--r--engines/sci/gui/gui_picture.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index a3ff89825e..25010eb3f6 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -922,6 +922,7 @@ void SciGuiGfx::Draw_String(const char *text) {
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;
diff --git a/engines/sci/gui/gui_picture.cpp b/engines/sci/gui/gui_picture.cpp
index 5f97783ba1..9075070319 100644
--- a/engines/sci/gui/gui_picture.cpp
+++ b/engines/sci/gui/gui_picture.cpp
@@ -289,7 +289,7 @@ static const byte vector_defaultEGApriority[PIC_EGAPRIORITY_SIZE] = {
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];