ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCI: kDoBresen changes for sci1early+

Browse Source 
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
This commit is contained in:
Martin Kiewitz
2010-09-04 18:23:37 +00:00
parent 3972091734
commit e55c928075
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/sci/engine/kmovement.cpp
+19 -9
View File
@@ -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 (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 ((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) {
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;
}