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

[m_kiewitz at users.sourceforge.net]

Revision: 44882
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44882&view=rev
Author:   m_kiewitz
Date:     2009-10-10 18:39:52 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
SCI/newgui: changed GuiAnimateList struct

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 18:18:12 UTC (rev 44881)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-10 18:39:52 UTC (rev 44882)
@@ -920,22 +920,22 @@
 	return sortedList;
 
 	// First convert the given List to Common::List
-	while (curNode) {
-		curObject = curNode->value;
-		listHelper.address = curAddress;
-		listHelper.y = (int16)GET_SEL32V(curObject, y);
-		listHelper.z = (int16)GET_SEL32V(curObject, priority);
-		sortedList->push_back(listHelper);
+//	while (curNode) {
+//		curObject = curNode->value;
+//		listHelper.address = curAddress;
+//		listHelper.y = (int16)GET_SEL32V(curObject, y);
+//		listHelper.z = (int16)GET_SEL32V(curObject, priority);
+//		sortedList->push_back(listHelper);
 
-		curAddress = curNode->succ;
-		curNode = _s->_segMan->lookupNode(curAddress);
-	}
+//		curAddress = curNode->succ;
+//		curNode = _s->_segMan->lookupNode(curAddress);
+//	}
 
 	// Now do a bubble sort on this Common::List
-	if (sortedList->size() < 2)
-		return sortedList;
+//	if (sortedList->size() < 2)
+//		return sortedList;
 
-	sortedList->begin();
+//	sortedList->begin();
 //	Common::List<ExecStack>::iterator iter;
 //	for (iter = s->_executionStack.begin();
 //	     iter != s->_executionStack.end(); ++iter) {

Modified: scummvm/trunk/engines/sci/gui/gui_helpers.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-10 18:18:12 UTC (rev 44881)
+++ scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-10 18:39:52 UTC (rev 44882)
@@ -72,9 +72,13 @@
 };
 
 struct GuiAnimateList {
-	reg_t address;
-	int16 y;
-	int16 z;
+	reg_t object;
+	GuiResourceId viewId;
+	GuiViewLoopNo loopNo;
+	GuiViewCelNo celNo;
+	int16 x, y, z;
+	uint16 priority, signal;
+	Common::Rect celRect;
 };
 
 struct GuiCast {


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