[Scummvm-git-logs] scummvm master -> 5f520aa386d829f2bbb168f31318f3422ecf01f1

[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:
5f520aa386 BLADERUNNER: Small clean-up of macros


Commit: 5f520aa386d829f2bbb168f31318f3422ecf01f1
    https://github.com/scummvm/scummvm/commit/5f520aa386d829f2bbb168f31318f3422ecf01f1
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-02-24T00:36:41+01:00

Commit Message:
BLADERUNNER: Small clean-up of macros

Changed paths:
    engines/bladerunner/bladerunner.h
    engines/bladerunner/script/ai/moraji.cpp
    engines/bladerunner/script/scene/ct01.cpp
    engines/bladerunner/script/scene/dr04.cpp


diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index 35e0a3f..816ae6c 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -38,6 +38,7 @@
 //TODO: change this to debugflag
 #define BLADERUNNER_DEBUG_CONSOLE 0
 #define BLADERUNNER_ORIGINAL_SETTINGS 0
+#define BLADERUNNER_ORIGINAL_BUGS 0
 
 namespace Common {
 struct Event;
diff --git a/engines/bladerunner/script/ai/moraji.cpp b/engines/bladerunner/script/ai/moraji.cpp
index 0c07d3c..e1180a8 100644
--- a/engines/bladerunner/script/ai/moraji.cpp
+++ b/engines/bladerunner/script/ai/moraji.cpp
@@ -152,11 +152,11 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalMorajiShot:
 		// applies only when shot inside the Dermo Design Lab
 		Actor_Set_Targetable(kActorMoraji, false);
-		#if BLADE_RUNNER_ORIGINAL_BUGS
+#if BLADERUNNER_ORIGINAL_BUGS
 		Sound_Play(4, 100, 0, 0, 50);	// Original code has female scream here (FEMHURT2)
-		#else
+#else
 		Sound_Play_Speech_Line(kActorMoraji, 9020, 50, 0, 50); // fix: Use Moraji's death SPCHSFX, also lower volume
-		#endif // BLADE_RUNNER_ORIGINAL_BUGS
+#endif // BLADERUNNER_ORIGINAL_BUGS
 		_animationState = 10;
 		_animationFrame = 0;
 		Actor_Retired_Here(kActorMoraji, 60, 16, true, -1);
@@ -192,11 +192,11 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		// Added check here  to have Moraji death speech SFX
 		// when shot by McCoy outside the Dermo Design Lab
 		if (Game_Flag_Query(kFlagDR04McCoyShotMoraji)) {
-			#if BLADE_RUNNER_ORIGINAL_BUGS
+#if BLADERUNNER_ORIGINAL_BUGS
 			// original code uses no voice here
-			#else
+#else
 			Sound_Play_Speech_Line(kActorMoraji, 9020, 50, 0, 50); // Use Moraji's death SPCHSFX, also lower volume
-			#endif // BLADE_RUNNER_ORIGINAL_BUGS
+#endif // BLADERUNNER_ORIGINAL_BUGS
 		}
 		_animationFrame = -1;
 		_animationState = 13;
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp
index 8d1ccfa..5bf254b 100644
--- a/engines/bladerunner/script/scene/ct01.cpp
+++ b/engines/bladerunner/script/scene/ct01.cpp
@@ -199,11 +199,11 @@ bool SceneScriptCT01::ClickedOnActor(int actorId) {
 			Actor_Says(kActorGordo, 20, 30);
 			Game_Flag_Set(kFlagCT01GordoTalk);
 			Actor_Clue_Acquire(kActorGordo, kClueMcCoysDescription, true, kActorMcCoy);
-			#if BLADE_RUNNER_ORIGINAL_BUGS
+#if BLADERUNNER_ORIGINAL_BUGS
 			Actor_Clue_Acquire(kActorMcCoy, kClueMcCoyIsABladeRunner, true, kActorMcCoy);
-			#else
+#else
 			Actor_Clue_Acquire(kActorGordo, kClueMcCoyIsABladeRunner, true, kActorMcCoy);
-			#endif // BLADE_RUNNER_ORIGINAL_BUGS
+#endif // BLADERUNNER_ORIGINAL_BUGS
 			Actor_Modify_Friendliness_To_Other(kActorGordo, kActorMcCoy, -1);
 		} else {
 			if (Actor_Query_Goal_Number(kActorGordo) == kGoalGordoDefault) {
diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp
index b0d801b..8b5225e 100644
--- a/engines/bladerunner/script/scene/dr04.cpp
+++ b/engines/bladerunner/script/scene/dr04.cpp
@@ -127,19 +127,19 @@ bool SceneScriptDR04::ClickedOnActor(int actorId) {
 
 		if (Actor_Query_Goal_Number(kActorMoraji) == kGoalMorajiDead) {
 			if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorMoraji, 36, true, false)) {
-				#if BLADERUNNER_ORIGINAL_BUGS
+#if BLADERUNNER_ORIGINAL_BUGS
 				Actor_Set_Goal_Number(kActorOfficerGrayford, 106);
-				#else
+#else
 				// bugfix: original code would result in this conversation repeating multiple times if:
 				// Officer Grayford is at 103 goal (asking "What do you know about this?"...
 				// and the player skips the conversation fast.
 				// So ask about a sheet (goal 106) for Moraji only when Grayford starts patrolling (104, 105 goals)
-				if (Actor_Query_Goal_Number(kActorOfficerGrayford)
-						&& ( Actor_Query_Goal_Number(kActorOfficerGrayford) == 104
-							|| Actor_Query_Goal_Number(kActorOfficerGrayford) == 105 ) ) {
+				if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 104
+				 || Actor_Query_Goal_Number(kActorOfficerGrayford) == 105
+				) {
 					Actor_Set_Goal_Number(kActorOfficerGrayford, 106); // This goal reverts to the previous one after finishing up
 				}
-				#endif // BLADERUNNER_ORIGINAL_BUGS#else [new code]
+#endif // BLADERUNNER_ORIGINAL_BUGS
 				return true;
 			}
 		}