[Scummvm-git-logs] scummvm master -> 8f74f0f47ea3f1d956b5a21124d13d9a9a113241
antoniou79
antoniou at cti.gr
Wed Jun 26 15:18:31 CEST 2019
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:
8f74f0f47e BLADERUNNER: Correct fix for maze target timings
Commit: 8f74f0f47ea3f1d956b5a21124d13d9a9a113241
https://github.com/scummvm/scummvm/commit/8f74f0f47ea3f1d956b5a21124d13d9a9a113241
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-06-26T16:17:48+03:00
Commit Message:
BLADERUNNER: Correct fix for maze target timings
Still only applies in Hard and Normal mode difficulty
Changed paths:
engines/bladerunner/script/police_maze.cpp
diff --git a/engines/bladerunner/script/police_maze.cpp b/engines/bladerunner/script/police_maze.cpp
index f3f20b2..68e2b67 100644
--- a/engines/bladerunner/script/police_maze.cpp
+++ b/engines/bladerunner/script/police_maze.cpp
@@ -260,24 +260,31 @@ bool PoliceMazeTargetTrack::tick() {
_timeLeftUpdate -= timeDiff;
if (_timeLeftUpdate > 0) {
-#if !BLADERUNNER_ORIGINAL_BUGS
- // this fix makes the targets appear according to their wait time
- // but it might be too fast for easy or normal mode, so only do this for normal and hard modes
- if (_vm->_settings->getDifficulty() > kGameDifficultyEasy) {
- _time = oldTime;
- }
-#endif // !BLADERUNNER_ORIGINAL_BUGS
return false;
}
- _timeLeftUpdate = 66;
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ if (_vm->_settings->getDifficulty() > kGameDifficultyEasy) {
+ timeDiff = 0 - _timeLeftUpdate;
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
+ _timeLeftUpdate = 66; // update the target track 15 times per second
if (_isPaused) {
return false;
}
if (_isWaiting) {
+#if BLADERUNNER_ORIGINAL_BUGS
_timeLeftWait -= timeDiff;
+#else
+ if (_vm->_settings->getDifficulty() == kGameDifficultyEasy) {
+ _timeLeftWait -= timeDiff; // original behavior
+ } else {
+ _timeLeftWait -= (timeDiff + _timeLeftUpdate); // this deducts an amount >= 66
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
if (_timeLeftWait > 0) {
return true;
}
More information about the Scummvm-git-logs
mailing list