SCI/newgui: changed GuiAnimateList struct

svn-id: r44882

2 files changed, 19 insertions, 15 deletions

diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index 32b3d0f0e9..c80ff7da96 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -920,22 +920,22 @@ Common::List<GuiAnimateList> *SciGuiGfx::AnimateMakeSortedList(List *list) {
 	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) {
diff --git a/engines/sci/gui/gui_helpers.h b/engines/sci/gui/gui_helpers.h
index 3a7fa67e14..f66715f275 100644
--- a/engines/sci/gui/gui_helpers.h
+++ b/engines/sci/gui/gui_helpers.h
@@ -72,9 +72,13 @@ struct GuiWindow : public GuiPort {
 };
 
 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 {