[Scummvm-git-logs] scummvm master -> 17a1c5b2cc2080c13dd4c712b29ba27545cc3a19

[antoniou79]

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:
17a1c5b2cc BLADERUNNER: Use enum labels for two McCoy goals


Commit: 17a1c5b2cc2080c13dd4c712b29ba27545cc3a19
    https://github.com/scummvm/scummvm/commit/17a1c5b2cc2080c13dd4c712b29ba27545cc3a19
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-12-12T13:31:40+02:00

Commit Message:
BLADERUNNER: Use enum labels for two McCoy goals

Changed paths:
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/ai/mccoy.cpp


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 380f6971ac..127aa1172e 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -2842,6 +2842,7 @@ enum AffectionTowards {
 enum GoalMcCoy {
 	kGoalMcCoyDefault              =   0,
 	kGoalMcCoyDodge                =   1,
+	kGoalMcCoyLeanOverAndSearch    =   2, // unused, McCoy searching dumpster is done by Actor_Change_Animation_Mode(kActorMcCoy, 38);
 	kGoalMcCoyBB11GetUp            = 100,
 	kGoalMcCoyBB11PrepareToRunAway = 101,
 	kGoalMcCoyBB11RunAway          = 102,
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index f12f62f4fd..4bed1e78f0 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -371,7 +371,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		dodge();
 		return true;
 
-	case 2:
+	case kGoalMcCoyLeanOverAndSearch:
 		_animationFrame = 0;
 		_animationState = 47;
 		return true;
@@ -535,7 +535,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		}
 		return true;
 
-	case 400:
+	case kGoalMcCoyStartChapter5:
 		Actor_Set_Health(kActorMcCoy, 50, 50);
 		Game_Flag_Set(kFlagKP02Available);
 		affectionTowards = Global_Variable_Query(kVariableAffectionTowards);