[Scummvm-git-logs] scummvm master -> 52c03a2a590f750503bea91fb0376ff90060de15
antoniou79
antoniou at cti.gr
Mon Jul 29 10:06: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:
52c03a2a59 BLADERUNNER: Fix Izo getting stuck in RC03
Commit: 52c03a2a590f750503bea91fb0376ff90060de15
https://github.com/scummvm/scummvm/commit/52c03a2a590f750503bea91fb0376ff90060de15
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-07-29T11:02:47+03:00
Commit Message:
BLADERUNNER: Fix Izo getting stuck in RC03
Bug case was for when he runs away (Steele is blocked)
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/izo.cpp
engines/bladerunner/script/ai/steele.cpp
engines/bladerunner/script/scene/bb09.cpp
engines/bladerunner/script/scene/rc03.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 18697a9..e41ed4f 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -2278,6 +2278,7 @@ enum GoalIzo {
kGoalIzoRC03RunAway = 114,
kGoalIzoGetArrested = 120,
kGoalIzoGotArrested = 180,
+ kGoalIzoRC03RanAwayDone = 181, // new - added for bug fix of Izo getting stuck at RC03
kGoalIzoGoToHC01 = 150,
kGoalIzoGoToHC03 = 155,
kGoalIzoDieHidden = 198,
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index 2787636..f3bd3f4 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -118,6 +118,7 @@ void AIScriptIzo::CompletedMovementTrack() {
// prevent re-apprehending of Izo
if (Actor_Query_Goal_Number(kActorIzo) != kGoalIzoGetArrested
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoGotArrested
+ && Actor_Query_Goal_Number(kActorIzo) != kGoalIzoRC03RanAwayDone
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoDie
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoDieHidden
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoEscape
@@ -134,7 +135,19 @@ void AIScriptIzo::CompletedMovementTrack() {
return; //true;
case kGoalIzoRC03RunAway:
+#if BLADERUNNER_ORIGINAL_BUGS
+ // Enabling exits here will cause in some cases
+ // McCoy to be able to exit the scene if player clicks fast
+ // in which case the apprehending of Izo will take place off-screen
+ // and the player will listen to it as if it happened in the current scene
Scene_Exits_Enable();
+#else
+ // In some occasions Izo will be block and won't reach exactly the 174 waypoint
+ // but he'll stand still at a distance from it (this would still trigger the CompletedMovementTrack() )
+ // In this case, Izo would remain stuck standing still in RC03 forever (in Act 2)
+ // This makes him teleport elsewhere (behavior similar to when he's arrested)
+ Actor_Set_Goal_Number(kActorIzo, kGoalIzoRC03RanAwayDone);
+#endif // BLADERUNNER_ORIGINAL_BUGS
return; //true;
case kGoalIzoGetArrested:
@@ -198,6 +211,7 @@ void AIScriptIzo::ClickedByPlayer() {
// prevent re-apprehending of Izo
if (Actor_Query_Goal_Number(kActorIzo) != kGoalIzoGetArrested
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoGotArrested
+ && Actor_Query_Goal_Number(kActorIzo) != kGoalIzoRC03RanAwayDone
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoDie
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoDieHidden
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoEscape
@@ -305,6 +319,7 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
|| newGoalNumber == kGoalIzoDie
|| newGoalNumber == kGoalIzoDieHidden
|| newGoalNumber == kGoalIzoGotArrested
+ || newGoalNumber == kGoalIzoRC03RanAwayDone
|| newGoalNumber == kGoalIzoEscape
) {
Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationDNARow, true);
@@ -343,8 +358,8 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalIzoRunToRC03:
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append_Run(kActorIzo, 153, 0);
- AI_Movement_Track_Append(kActorIzo, 154, 0);
+ AI_Movement_Track_Append_Run(kActorIzo, 153, 0); // kSetUG02
+ AI_Movement_Track_Append(kActorIzo, 154, 0); // kSetRC03
AI_Movement_Track_Repeat(kActorIzo);
return true;
@@ -353,40 +368,52 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalIzoEscape:
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 153, 0);
- AI_Movement_Track_Append(kActorIzo, 39, 120);
- AI_Movement_Track_Append(kActorIzo, 33, 0);
+ AI_Movement_Track_Append(kActorIzo, 153, 0); // kSetUG02
+ AI_Movement_Track_Append(kActorIzo, 39, 120); // kSetFreeSlotG
+ AI_Movement_Track_Append(kActorIzo, 33, 0); // kSetFreeSlotA
AI_Movement_Track_Repeat(kActorIzo);
return true;
case kGoalIzoRC03Walk:
Game_Flag_Set(kFlagDNARowAvailable);
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 349, 0);
+ AI_Movement_Track_Append(kActorIzo, 349, 0); // kSetRC03
AI_Movement_Track_Repeat(kActorIzo);
return true;
case kGoalIzoRC03Run:
Game_Flag_Set(kFlagDNARowAvailable);
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append_Run(kActorIzo, 349, 0);
+ AI_Movement_Track_Append_Run(kActorIzo, 349, 0); // kSetRC03
AI_Movement_Track_Repeat(kActorIzo);
return true;
case kGoalIzoRC03RunAway:
Game_Flag_Set(kFlagDNARowAvailable);
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append_Run(kActorIzo, 174, 0);
+#if BLADERUNNER_ORIGINAL_BUGS
+ AI_Movement_Track_Append_Run(kActorIzo, 174, 0); // kSetRC03
+#else
+ // set a waypoint near 174 but not exactly same coordinates
+ // to make colliding with Steele or McCoy less likely
+ World_Waypoint_Set(553, kSetRC03, 346.96f, -4.01f, 419.16f);
+
+ // prevent Izo from getting stuck in-scene RC03
+ // Note: this alone won't work as a fix;
+ // it still requires the additional fix in CompletedMovementTrack()
+ AI_Movement_Track_Append_Run(kActorIzo, 553, 0); // kSetRC03
+ AI_Movement_Track_Append_Run(kActorIzo, 33, 0); // kSetFreeSlotA
+#endif // BLADERUNNER_ORIGINAL_BUGS
AI_Movement_Track_Repeat(kActorIzo);
return true;
case 115:
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 39, 60);
+ AI_Movement_Track_Append(kActorIzo, 39, 60); // kSetFreeSlotG
if (Game_Flag_Query(kFlagIzoIsReplicant)) {
- AI_Movement_Track_Append(kActorIzo, 33, 0);
+ AI_Movement_Track_Append(kActorIzo, 33, 0); // kSetFreeSlotA
} else {
- AI_Movement_Track_Append(kActorIzo, 34, 0);
+ AI_Movement_Track_Append(kActorIzo, 34, 0); // kSetFreeSlotB
}
AI_Movement_Track_Repeat(kActorIzo);
Game_Flag_Set(kFlagDNARowAvailable);
@@ -395,30 +422,30 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalIzoGetArrested:
Actor_Set_Targetable(kActorIzo, false);
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 174, 0);
- AI_Movement_Track_Append(kActorIzo, 33, 0);
+ AI_Movement_Track_Append(kActorIzo, 174, 0); // kSetRC03
+ AI_Movement_Track_Append(kActorIzo, 33, 0); // kSetFreeSlotA
AI_Movement_Track_Repeat(kActorIzo);
return true;
case kGoalIzoGoToHC01:
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 39, Random_Query(15, 30));
- AI_Movement_Track_Append(kActorIzo, 149, 0);
- AI_Movement_Track_Append(kActorIzo, 323, Random_Query(90, 120));
+ AI_Movement_Track_Append(kActorIzo, 39, Random_Query(15, 30)); // kSetFreeSlotG
+ AI_Movement_Track_Append(kActorIzo, 149, 0); // kSetHC01_HC02_HC03_HC04
+ AI_Movement_Track_Append(kActorIzo, 323, Random_Query(90, 120)); // kSetHC01_HC02_HC03_HC04
AI_Movement_Track_Repeat(kActorIzo);
return true;
case kGoalIzoGoToHC03:
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 149, 0);
+ AI_Movement_Track_Append(kActorIzo, 149, 0); // kSetHC01_HC02_HC03_HC04
if (Game_Flag_Query(kFlagIzoIsReplicant)) {
- AI_Movement_Track_Append(kActorIzo, 39, 5);
- AI_Movement_Track_Append(kActorIzo, 34, Random_Query(10, 20));
- AI_Movement_Track_Append(kActorIzo, 39, 5);
- AI_Movement_Track_Append(kActorIzo, 33, Random_Query(10, 20));
+ AI_Movement_Track_Append(kActorIzo, 39, 5); // kSetFreeSlotG
+ AI_Movement_Track_Append(kActorIzo, 34, Random_Query(10, 20)); // kSetFreeSlotB
+ AI_Movement_Track_Append(kActorIzo, 39, 5); // kSetFreeSlotG
+ AI_Movement_Track_Append(kActorIzo, 33, Random_Query(10, 20)); // kSetFreeSlotA
} else {
- AI_Movement_Track_Append(kActorIzo, 39, Random_Query(5, 15));
- AI_Movement_Track_Append(kActorIzo, 34, Random_Query(20, 40));
+ AI_Movement_Track_Append(kActorIzo, 39, Random_Query(5, 15)); // kSetFreeSlotG
+ AI_Movement_Track_Append(kActorIzo, 34, Random_Query(20, 40)); // kSetFreeSlotB
}
AI_Movement_Track_Repeat(kActorIzo);
return true;
@@ -427,15 +454,17 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
AI_Movement_Track_Flush(kActorIzo);
return true;
+ case kGoalIzoRC03RanAwayDone:
+ // fall through
case kGoalIzoGotArrested:
Game_Flag_Set(kFlagDNARowAvailable);
Actor_Put_In_Set(kActorIzo, kSetFreeSlotA);
- Actor_Set_At_Waypoint(kActorIzo, 33, 0);
+ Actor_Set_At_Waypoint(kActorIzo, 33, 0); // kSetFreeSlotA
return true;
case kGoalIzoDieHidden:
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 41, 0);
+ AI_Movement_Track_Append(kActorIzo, 41, 0); // kSetFreeSlotI
AI_Movement_Track_Repeat(kActorIzo);
Actor_Set_Goal_Number(kActorIzo, 999);
return true;
@@ -469,14 +498,14 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case 301:
AI_Movement_Track_Flush(kActorIzo);
- AI_Movement_Track_Append(kActorIzo, 34, 1);
+ AI_Movement_Track_Append(kActorIzo, 34, 1); // kSetFreeSlotB
AI_Movement_Track_Repeat(kActorIzo);
return true;
case 400:
AI_Movement_Track_Flush(kActorIzo);
Actor_Put_In_Set(kActorIzo, kSetFreeSlotA);
- Actor_Set_At_Waypoint(kActorIzo, 33, 0);
+ Actor_Set_At_Waypoint(kActorIzo, 33, 0); // kSetFreeSlotA
return true;
case 999:
@@ -1159,7 +1188,7 @@ void AIScriptIzo::modifyWaypoints() {
break;
default:
- AI_Movement_Track_Append(kActorIzo, 34, 60);
+ AI_Movement_Track_Append(kActorIzo, 34, 60); // kSetFreeSlotB
break;
}
}
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index 10dd1d9..739ef95 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -364,6 +364,17 @@ void AIScriptSteele::ClickedByPlayer() {
return; //true;
}
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ if (goal == kGoalSteeleApprehendIzo
+ || goal == kGoalSteeleArrestIzo
+ || goal == kGoalSteeleShootIzo
+ ) {
+ // don't interrupt Steele before she apprehends Izo
+ return; //true;
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
+
AI_Movement_Track_Pause(kActorSteele);
Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
diff --git a/engines/bladerunner/script/scene/bb09.cpp b/engines/bladerunner/script/scene/bb09.cpp
index 7e74fca..56dc386 100644
--- a/engines/bladerunner/script/scene/bb09.cpp
+++ b/engines/bladerunner/script/scene/bb09.cpp
@@ -37,7 +37,7 @@ void SceneScriptBB09::InitializeScene() {
#if BLADERUNNER_ORIGINAL_BUGS
Scene_Exit_Add_2D_Exit(0, 224, 213, 286, 353, 1);
#else
- // in the original McCoy could run ahead of Sadik to the next room
+ // in the original McCoy could run ahead of Sadik to the next room (BB10)
// if the player clicked quickly enough
// kFlagBB11SadikFight is set after Sadik exits this room in Chapter 2
// (and his goal is set to kGoalSadikBB11Wait)
@@ -133,7 +133,7 @@ void SceneScriptBB09::SceneFrameAdvanced(int frame) {
void SceneScriptBB09::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bool currentSet) {
#if BLADERUNNER_ORIGINAL_BUGS
#else
- // in the original McCoy could run ahead of Sadik to the next room
+ // in the original McCoy could run ahead of Sadik to the next room (BB10)
// if the player clicked quickly enough
if (actorId == kActorSadik && newGoal == kGoalSadikBB11Wait) {
Scene_Exit_Add_2D_Exit(0, 224, 213, 286, 353, 1);
diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp
index 17837ca..3b0bfdf 100644
--- a/engines/bladerunner/script/scene/rc03.cpp
+++ b/engines/bladerunner/script/scene/rc03.cpp
@@ -321,6 +321,7 @@ void SceneScriptRC03::PlayerWalkedIn() {
// prevent re-apprehending of Izo
if (Actor_Query_Goal_Number(kActorIzo) != kGoalIzoDie
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoDieHidden
+ && Actor_Query_Goal_Number(kActorIzo) != kGoalIzoRC03RanAwayDone
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoEscape
&& Actor_Query_Goal_Number(kActorSteele) != kGoalSteeleShootIzo
&& Actor_Query_Goal_Number(kActorSteele) != kGoalSteeleIzoBlockedByMcCoy
@@ -341,6 +342,7 @@ void SceneScriptRC03::PlayerWalkedIn() {
// prevent re-apprehending of Izo
if (Actor_Query_Goal_Number(kActorIzo) != kGoalIzoGetArrested
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoGotArrested
+ && Actor_Query_Goal_Number(kActorIzo) != kGoalIzoRC03RanAwayDone
&& Actor_Query_Goal_Number(kActorIzo) != kGoalIzoEscape
&& Actor_Query_Goal_Number(kActorSteele) != kGoalSteeleApprehendIzo
&& Actor_Query_Goal_Number(kActorSteele) != kGoalSteeleArrestIzo
More information about the Scummvm-git-logs
mailing list