[Scummvm-git-logs] scummvm master -> c683f99192cbef07f56644f99833021d017d54cf

[peterkohaut]

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:
c683f99192 BLADERUNNER: Fix compilation errors


Commit: c683f99192cbef07f56644f99833021d017d54cf
    https://github.com/scummvm/scummvm/commit/c683f99192cbef07f56644f99833021d017d54cf
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-01-12T19:11:08+01:00

Commit Message:
BLADERUNNER: Fix compilation errors

Changed paths:
    engines/bladerunner/bladerunner.h
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/ai/zuben.cpp
    engines/bladerunner/script/scene/ma04.cpp


diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index 6218aa4..eb59bc2 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -37,7 +37,7 @@
 
 //TODO: remove these when game is playable
 #define BLADERUNNER_DEBUG_CONSOLE 0
-#define BLADERUNNER_DEBUG_GAME 1
+#define BLADERUNNER_DEBUG_GAME 0
 
 namespace Common {
 struct Event;
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 68cbdef..605bde5 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -960,12 +960,12 @@ enum PoliceMazeTrackInstruction {
 
 enum GoalMcCoy {
 	kGoalMcCoyDefault = 0,
-	kGoalMcCoyDodge = 1,
+	kGoalMcCoyDodge = 1
 };
 
 enum GoalTransient {
 	kGoalTransientDefault = 0,
-	kGoalTransientCT04Leave = 2,
+	kGoalTransientCT04Leave = 2
 };
 
 enum GoalZuben {
@@ -981,7 +981,8 @@ enum GoalZuben {
 	kGoalZubenCT06Hide = 13,
 	kGoalZubenCT02PotDodgeCheck = 14,
 	kGoalZubenFled = 20,
-	kGoalZubenMA01AttackMcCoy = 21
+	kGoalZubenMA01AttackMcCoy = 21,
+	kGoalZubenDead = 599
 
 };
 
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index 9b99e2c..da40917 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -46,7 +46,7 @@ void AIScriptZuben::Initialize() {
 }
 
 bool AIScriptZuben::Update() {
-	if (Actor_Query_Goal_Number(kActorZuben) == 599 && Actor_Query_Which_Set_In(kActorZuben) != kSetFreeSlotI) {
+	if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead && Actor_Query_Which_Set_In(kActorZuben) != kSetFreeSlotI) {
 		if (Actor_Query_Which_Set_In(kActorZuben) != Player_Query_Current_Set() ) {
 			Actor_Put_In_Set(kActorZuben, kSetFreeSlotI);
 			Actor_Set_At_Waypoint(kActorZuben, 41, 0);
@@ -173,7 +173,7 @@ void AIScriptZuben::ReceivedClue(int clueId, int fromActorId) {
 }
 
 void AIScriptZuben::ClickedByPlayer() {
-	if (Actor_Query_Goal_Number(kActorZuben) == 599) {
+	if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead) {
 		if (Player_Query_Current_Scene() == kSceneCT06) {
 			// return true;
 			return;
@@ -253,7 +253,7 @@ void AIScriptZuben::Retired(int byActorId) {
 		return;
 	}
 	Global_Variable_Decrement(51, 1);
-	Actor_Set_Goal_Number(kActorZuben, 599);
+	Actor_Set_Goal_Number(kActorZuben, kGoalZubenDead);
 	if (Global_Variable_Query(51)) {
 		// return false;
 		return;
@@ -332,7 +332,7 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Player_Set_Combat_Mode(false);
 			Actor_Set_Goal_Number(kActorGaff, 3);
 		}
-		Actor_Set_Goal_Number(kActorZuben, 599);
+		Actor_Set_Goal_Number(kActorZuben, kGoalZubenDead);
 		return false;
 	case kGoalZubenCT02PushPot:
 		_animationFrame = 0;
diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp
index ead9f19..0b26431 100644
--- a/engines/bladerunner/script/scene/ma04.cpp
+++ b/engines/bladerunner/script/scene/ma04.cpp
@@ -564,8 +564,8 @@ void SceneScriptMA04::sleep() {
 		Player_Loses_Control();
 		Game_Flag_Set(kFlagMcCoySleeping);
 		if ((Game_Flag_Query(kFlagZubenRetired) || Game_Flag_Query(kFlagZubenSpared)) && Global_Variable_Query(kVariableChapter) == 1) {
-			if (Actor_Query_Goal_Number(kActorZuben) == 599) {
-				Actor_Put_In_Set(kActorZuben, 91);
+			if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead) {
+				Actor_Put_In_Set(kActorZuben, kSetFreeSlotA);
 				Actor_Set_At_Waypoint(kActorZuben, 33, 0);
 			}
 			Game_Flag_Set(kFlagChapter2Intro);