[Scummvm-cvs-logs] scummvm master -> 37d610efd3ab76d7684cf2cc6cf728b561b7bd55
bluegr
md5 at scummvm.org
Sun Feb 27 15:16:40 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
37d610efd3 SCI: Improved the readability of the kDoBresen code a bit
Commit: 37d610efd3ab76d7684cf2cc6cf728b561b7bd55
https://github.com/scummvm/scummvm/commit/37d610efd3ab76d7684cf2cc6cf728b561b7bd55
Author: md5 (md5 at scummvm.org)
Date: 2011-02-27T06:15:33-08:00
Commit Message:
SCI: Improved the readability of the kDoBresen code a bit
Changed paths:
engines/sci/engine/kmovement.cpp
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 76ad6ce..53a3a53 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;
}
}
More information about the Scummvm-git-logs
mailing list