SCI/newgui: updating flags separately to fix issue in sq1 (almost at the end) where wilco will go michael jackson otherwise

svn-id: r45308

1 files changed, 14 insertions, 3 deletions

diff --git a/engines/sci/gui/gui_animate.cpp b/engines/sci/gui/gui_animate.cpp
index 150e37ec30..f52c5c7ae5 100644
--- a/engines/sci/gui/gui_animate.cpp
+++ b/engines/sci/gui/gui_animate.cpp
@@ -427,6 +427,20 @@ void SciGuiAnimate::restoreAndDelete(int argc, reg_t *argv) {
 	GuiAnimateList::iterator listIterator;
 	GuiAnimateList::iterator listEnd = _list.end();
 
+
+	// This has to be done in a separate loop. At least in sq1 some .dispose modifies FIXEDLOOP flag in signal for
+	//  another object. In that case we would overwrite the new signal with our version of the old signal
+	listIterator = _list.begin();
+	while (listIterator != listEnd) {
+		listEntry = *listIterator;
+		curObject = listEntry->object;
+		signal = listEntry->signal;
+
+		// Finally update signal
+		PUT_SEL32V(segMan, curObject, signal, signal);
+		listIterator++;
+	}
+
 	listIterator = _list.reverse_begin();
 	while (listIterator != listEnd) {
 		listEntry = *listIterator;
@@ -438,9 +452,6 @@ void SciGuiAnimate::restoreAndDelete(int argc, reg_t *argv) {
 			PUT_SEL32V(segMan, curObject, underBits, 0);
 		}
 
-		// Finally update signal
-		PUT_SEL32V(segMan, curObject, signal, signal);
-
 		if (signal & SCI_ANIMATE_SIGNAL_DISPOSEME) {
 			// Call .delete_ method of that object
 			invoke_selector(_s, curObject, _s->_kernel->_selectorCache.delete_, kContinueOnInvalidSelector, argv, argc, __FILE__, __LINE__, 0);