[Scummvm-git-logs] scummvm master -> cd6ebdc88b1c33b657c1ae27b97114a5b891b8ab
antoniou79
antoniou at cti.gr
Mon Sep 9 21:02:34 CEST 2019
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f5b79a4cdf BLADERUNNER: Play full exit KIA sound before quit via KIA
cd6ebdc88b BLADERUNNER: Allow McCoy to perform both turns when feeding Maggie
Commit: f5b79a4cdfc2e481c275eb8fb9b3b833648479c5
https://github.com/scummvm/scummvm/commit/f5b79a4cdfc2e481c275eb8fb9b3b833648479c5
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-09-09T21:09:36+03:00
Commit Message:
BLADERUNNER: Play full exit KIA sound before quit via KIA
Changed paths:
engines/bladerunner/ui/kia.cpp
diff --git a/engines/bladerunner/ui/kia.cpp b/engines/bladerunner/ui/kia.cpp
index 9ec9d68..32704fc 100644
--- a/engines/bladerunner/ui/kia.cpp
+++ b/engines/bladerunner/ui/kia.cpp
@@ -663,7 +663,13 @@ void KIA::mouseDownCallback(int buttonId, void *callbackData) {
case 14:
self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN5P), 70, 0, 0, 50, 0);
if (buttonId == 12) {
- self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxSHUTDOWN), 70, 0, 0, 50, 0);
+ int endTrackId = self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxSHUTDOWN), 70, 0, 0, 50, 0);
+ if (endTrackId != -1) {
+ // wait until the full clip has played (similar to the original)
+ while (self->_vm->_audioPlayer->isActive(endTrackId)) {
+ self->_vm->_system->delayMillis(16);
+ }
+ }
}
break;
case 15:
Commit: cd6ebdc88b1c33b657c1ae27b97114a5b891b8ab
https://github.com/scummvm/scummvm/commit/cd6ebdc88b1c33b657c1ae27b97114a5b891b8ab
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-09-09T22:01:36+03:00
Commit Message:
BLADERUNNER: Allow McCoy to perform both turns when feeding Maggie
First animated turn is to the counter, second is towards Maggie
Changed paths:
engines/bladerunner/script/ai/maggie.cpp
diff --git a/engines/bladerunner/script/ai/maggie.cpp b/engines/bladerunner/script/ai/maggie.cpp
index a31c5be..5e6143d 100644
--- a/engines/bladerunner/script/ai/maggie.cpp
+++ b/engines/bladerunner/script/ai/maggie.cpp
@@ -271,6 +271,17 @@ bool AIScriptMaggie::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalMaggieMA02GetFed:
Player_Loses_Control();
AI_Movement_Track_Flush(kActorMaggie);
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ // Allows McCoy to perform both animated turns (first towards the BAR-MAIN and then towards Maggie)
+ // when Maggie is already too close
+ // original bug: When Maggie is close McCoy would alternate between
+ // - turning to Maggie and throw food at her
+ // - only performing the turn toward the BAR-MAIN and "throw" food to wrong direction
+ if (Actor_Query_Inch_Distance_From_Actor(kActorMaggie, kActorMcCoy) <= 85) {
+ Delay(500);
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
Loop_Actor_Walk_To_Actor(kActorMaggie, kActorMcCoy, 48, false, false);
Actor_Face_Actor(kActorMcCoy, kActorMaggie, true);
Actor_Face_Actor(kActorMaggie, kActorMcCoy, false);
More information about the Scummvm-git-logs
mailing list