thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BLADERUNNER: Increase distance thresh for Dektora on fire

Browse source
This commit is contained in:
Thanasis Antoniou 2019-06-24 13:36:33 +03:00
parent c4dc251f2b
commit a9ecbce2f1
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/bladerunner/script/ai/dektora.cpp
View file

@ -83,10 +83,17 @@ bool AIScriptDektora::Update() {
break; break;
case kGoalDektoraNR11BurningGoToMcCoy: case kGoalDektoraNR11BurningGoToMcCoy:
#if BLADERUNNER_ORIGINAL_BUGS
if (Actor_Query_Inch_Distance_From_Actor(kActorDektora, kActorMcCoy) <= 48) { if (Actor_Query_Inch_Distance_From_Actor(kActorDektora, kActorMcCoy) <= 48) {
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11BurningFallToNR10); Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11BurningFallToNR10);
break; break;
} }
#else
if (Actor_Query_Inch_Distance_From_Actor(kActorDektora, kActorMcCoy) <= 54) {
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11BurningFallToNR10);
break;
}
#endif // BLADERUNNER_ORIGINAL_BUGS
if (comp_distance(kActorMcCoy, _x, _y, _z) > 12.0f) { if (comp_distance(kActorMcCoy, _x, _y, _z) > 12.0f) {
Actor_Query_XYZ(kActorMcCoy, &_x, &_y, &_z); Actor_Query_XYZ(kActorMcCoy, &_x, &_y, &_z);
@ -511,7 +518,9 @@ bool AIScriptDektora::GoalChanged(int currentGoalNumber, int newGoalNumber) {
break; break;
case kGoalDektoraNR11PrepareBurning: case kGoalDektoraNR11PrepareBurning:
// fall through
case kGoalDektoraNR11BurningGoToMcCoy: case kGoalDektoraNR11BurningGoToMcCoy:
// fall through
case kGoalDektoraGone: case kGoalDektoraGone:
break; // return true break; // return true

2
engines/bladerunner/script/ai/early_q.cpp
View file

@ -395,7 +395,7 @@ bool AIScriptEarlyQ::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalEarlyQNR04HandDrink: case kGoalEarlyQNR04HandDrink:
if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorEarlyQ) > 36) { if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorEarlyQ) > 36) {
Loop_Actor_Walk_To_Actor(kActorEarlyQ, kActorMcCoy, 36, kActorMcCoy, kActorMcCoy); Loop_Actor_Walk_To_Actor(kActorEarlyQ, kActorMcCoy, 36, false, false);
} }
Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true); Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true);
Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true); Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);