SCI/newgui: changed GuiAnimateList struct

svn-id: r44882
This commit is contained in:
Martin Kiewitz 2009-10-10 18:39:52 +00:00
parent 0a3e03a166
commit 7f2259d280
2 changed files with 19 additions and 15 deletions

View File

@ -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) {

View File

@ -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 {