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

[m_kiewitz at users.sourceforge.net]

Revision: 47412
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47412&view=rev
Author:   m_kiewitz
Date:     2010-01-20 21:59:12 +0000 (Wed, 20 Jan 2010)

Log Message:
-----------
SCI: control icons now use objects priority selector instead of hardcoded priority 255. fixes jones speech bubbles

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/graphics/gui.cpp
    scummvm/trunk/engines/sci/graphics/gui.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-20 20:53:59 UTC (rev 47411)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-20 21:59:12 UTC (rev 47412)
@@ -707,6 +707,7 @@
 	GuiResourceId viewId;
 	int16 loopNo;
 	int16 celNo;
+	int16 priority;
 	reg_t listSeeker;
 	Common::String *listStrings = NULL;
 	const char **listEntries = NULL;
@@ -744,9 +745,10 @@
 			loopNo = (l & 0x80) ? l - 256 : l;
 			int c = GET_SEL32V(s->_segMan, controlObject, cel);
 			celNo = (c & 0x80) ? c - 256 : c;
+			priority = GET_SEL32V(s->_segMan, controlObject, priority);
 		}
 		debugC(2, kDebugLevelGraphics, "drawing icon control %04x:%04x to %d,%d\n", PRINT_REG(controlObject), x, y - 1);
-		s->_gui->drawControlIcon(rect, controlObject, viewId, loopNo, celNo, style, hilite);
+		s->_gui->drawControlIcon(rect, controlObject, viewId, loopNo, celNo, priority, style, hilite);
 		return;
 
 	case SCI_CONTROLS_TYPE_LIST:

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-20 20:53:59 UTC (rev 47411)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-20 21:59:12 UTC (rev 47412)
@@ -445,9 +445,9 @@
 		_gfx->BitsShow(rect);
 }
 
-void SciGui::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 style, bool hilite) {
+void SciGui::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 priority, int16 style, bool hilite) {
 	if (!hilite) {
-		_gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, 255, 0);
+		_gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, priority, 0);
 		if (style & 0x20) {
 			_gfx->FrameRect(rect);
 		}

Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h	2010-01-20 20:53:59 UTC (rev 47411)
+++ scummvm/trunk/engines/sci/graphics/gui.h	2010-01-20 21:59:12 UTC (rev 47412)
@@ -92,7 +92,7 @@
 	virtual void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite);
 	virtual void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 alignment, int16 style, bool hilite);
 	virtual void drawControlTextEdit(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite);
-	virtual void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 style, bool hilite);
+	virtual void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 priority, int16 style, bool hilite);
 	virtual void drawControlList(Common::Rect rect, reg_t obj, int16 maxChars, int16 count, const char **entries, GuiResourceId fontId, int16 style, int16 upperPos, int16 cursorPos, bool isAlias, bool hilite);
 	virtual void editControl(reg_t controlObject, reg_t eventObject);
 


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