From e55c928075c7ad53d478f0dfca0a4e7bbffb27ff Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 4 Sep 2010 18:23:37 +0000
Subject: SCI: kDoBresen changes for sci1early+

including change to compare dest and current position directly, otherwise we would trigger ::moveDone one cycle too late in case the current move completed - fixes lsl5 patti upside down bug #3059336 and lb2cd (cd only!) laura bow getting transformed into a boiler-flame (bug #3050602) - lsl5 was not a real regression, the timing of previous kDoBresen way just off, so it didn't happen in that scene, but happened in lb2cd

svn-id: r52531
---
 engines/sci/engine/kmovement.cpp | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 4758167285..fe8b4e4da3 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -362,16 +362,26 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) {
 		writeSelectorValue(segMan, mover, SELECTOR(b_i1), mover_i1);
 		writeSelectorValue(segMan, mover, SELECTOR(b_i2), mover_i2);
 		writeSelectorValue(segMan, mover, SELECTOR(b_di), mover_di);
+
+		if ((getSciVersion() >= SCI_VERSION_1_EGA)) {
+			// this calling code here was right before the last return in
+			//  sci1ega and got changed to this position since sci1early
+			//  this was an uninitialized issue in sierra sci
+			if ((handleMoveCount) && (getSciVersion() >= SCI_VERSION_1_EARLY))
+				writeSelectorValue(segMan, mover, SELECTOR(b_movCnt), mover_moveCnt);
+			// We need to compare directly in here, complete may have happened during
+			//  the current move
+			if ((client_x == mover_x) && (client_y == mover_y))
+				invokeSelector(s, mover, SELECTOR(moveDone), argc, argv);
+			if (getSciVersion() >= SCI_VERSION_1_EARLY)
+				return s->r_acc;
+		}
 	}
-	if (handleMoveCount)
-		writeSelectorValue(segMan, mover, SELECTOR(b_movCnt), mover_moveCnt);
-
-	if ((getSciVersion() >= SCI_VERSION_1_EGA)) {
-		// Sierra SCI compared client_x&mover_x and client_y&mover_y
-		//  those variables were not initialized in case the moveSpeed
-		//  compare failed
-		if (completed)
-			invokeSelector(s, mover, SELECTOR(moveDone), argc, argv);
+	if (handleMoveCount) {
+		if (getSciVersion() <= SCI_VERSION_1_EGA)
+			writeSelectorValue(segMan, mover, SELECTOR(b_movCnt), mover_moveCnt);
+		else
+			writeSelectorValue(segMan, mover, SELECTOR(b_movCnt), client_moveSpeed);
 	}
 	return s->r_acc;
 }
-- 
cgit v1.2.3