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

[m_kiewitz at users.sourceforge.net]

Revision: 44886
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44886&view=rev
Author:   m_kiewitz
Date:     2009-10-10 20:30:31 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
SCI/newgui: kAnimate list - showBitsFlag implemented

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

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-10 20:25:04 UTC (rev 44885)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-10 20:30:31 UTC (rev 44886)
@@ -897,6 +897,7 @@
 		listEntry->priority = GET_SEL32V(curObject, priority);
 		listEntry->signal = GET_SEL32V(curObject, signal);
 		// listEntry->celRect is filled in AnimateFill()
+		listEntry->showBitsFlag = false;
 
 		listEntry++;
 		curAddress = curNode->succ;
@@ -983,7 +984,7 @@
 				bitsHandle = GET_SEL32(curObject, underBits);
 				if (_screen->_picNotValid != 1) {
 					RestoreBits(bitsHandle);
-					//arr1[i] = 1;
+					listEntry->showBitsFlag = true;
 				} else	{
 					//FreeBits(bits_gfx->UnloadBits(hBits);
 				}
@@ -1006,7 +1007,8 @@
 		if (signal & SCI_ANIMATE_SIGNAL_ALWAYSUPDATE) {
 			// draw corresponding cel
 			drawCel(listEntry->viewId, listEntry->loopNo, listEntry->celNo, listEntry->celRect.left, listEntry->celRect.top, listEntry->priority, listEntry->paletteNo);
-//			arr1[i] = 1;
+			listEntry->showBitsFlag = true;
+
 			signal &= 0xFFFF ^ (SCI_ANIMATE_SIGNAL_STOPUPDATE | SCI_ANIMATE_SIGNAL_VIEWUPDATED | SCI_ANIMATE_SIGNAL_NOUPDATE | SCI_ANIMATE_SIGNAL_FORCEUPDATE);
 			if ((signal & SCI_ANIMATE_SIGNAL_IGNOREACTOR) == 0) {
 				rect = listEntry->celRect;
@@ -1047,7 +1049,8 @@
 		if (signal & SCI_ANIMATE_SIGNAL_NOUPDATE && !(signal & SCI_ANIMATE_SIGNAL_HIDDEN)) {
 			// draw corresponding cel
 			drawCel(listEntry->viewId, listEntry->loopNo, listEntry->celNo, listEntry->celRect.left, listEntry->celRect.top, listEntry->priority, listEntry->paletteNo);
-			// arr1[i] = 1;
+			listEntry->showBitsFlag = true;
+
 			if ((signal & SCI_ANIMATE_SIGNAL_IGNOREACTOR) == 0) {
 				rect = listEntry->celRect;
 				rect.top = CLIP<int16>(PriorityToCoordinate(listEntry->priority) - 1, rect.top, rect.bottom - 1);  
@@ -1077,8 +1080,8 @@
 
 			// draw corresponding cel
 			drawCel(listEntry->viewId, listEntry->loopNo, listEntry->celNo, listEntry->celRect.left, listEntry->celRect.top, listEntry->priority, listEntry->paletteNo);
+			listEntry->showBitsFlag = true;
 
-			// arr1[inx] = 1;
 			if (signal & SCI_ANIMATE_SIGNAL_REMOVEVIEW) {
 				signal &= 0xFFFF ^ SCI_ANIMATE_SIGNAL_REMOVEVIEW;
 			}

Modified: scummvm/trunk/engines/sci/gui/gui_helpers.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-10 20:25:04 UTC (rev 44885)
+++ scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-10 20:30:31 UTC (rev 44886)
@@ -80,6 +80,7 @@
 	int16 x, y, z;
 	uint16 priority, signal;
 	Common::Rect celRect;
+	bool showBitsFlag;
 };
 
 struct GuiCast {


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