From 37d610efd3ab76d7684cf2cc6cf728b561b7bd55 Mon Sep 17 00:00:00 2001
From: md5
Date: Sun, 27 Feb 2011 16:15:33 +0200
Subject: SCI: Improved the readability of the kDoBresen code a bit

---
 engines/sci/engine/kmovement.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 76ad6cec23..53a3a53a8a 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -374,18 +374,24 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) {
 		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
+		if (getSciVersion() == SCI_VERSION_1_EGA) {
+			// 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) {
+			// 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))
+			if (handleMoveCount)
 				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;
+			return s->r_acc;
 		}
 	}
 
-- 
cgit v1.2.3