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

[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:
f04acf5709 BLADERUNNER: Clarify naming of unused Luther flag


Commit: f04acf570961896bf58974cfb2cffc92065740ec
    https://github.com/scummvm/scummvm/commit/f04acf570961896bf58974cfb2cffc92065740ec
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-06-06T22:04:22+03:00

Commit Message:
BLADERUNNER: Clarify naming of unused Luther flag

Changed paths:
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/scene/ug16.cpp


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 44fd06268c..d2ab0ae694 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -1039,8 +1039,8 @@ enum Flags {
 	kFlagUG16FolderFound                      = 597,
 	kFlagUG07ClovisCaughtMcCoy                = 598,
 	kFlagKIAPrivacyAddonIntro                 = 599,
-	kFlagUG16LutherLanceTalkReplicants1       = 600,
-	kFlagUG16LutherLanceTalkReplicants2       = 601,
+	kFlagUG16LutherLanceTalkReplicants        = 600,
+	kFlagUG16LutherLanceTalkHumans            = 601,
 	// 602 is never used
 	kFlagSteeleAimingAtGordo                  = 603,
 	kFlagNR03McCoyThrownOut                   = 604,
diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp
index 3f8c5bb3cb..605c243c1c 100644
--- a/engines/bladerunner/script/scene/ug16.cpp
+++ b/engines/bladerunner/script/scene/ug16.cpp
@@ -237,8 +237,8 @@ void SceneScriptUG16::dialogueWithLuther() {
 	Dialogue_Menu_Clear_List();
 	DM_Add_To_List_Never_Repeat_Once_Selected(1400, 5, 6, 2); // REPLICANTS
 	DM_Add_To_List_Never_Repeat_Once_Selected(1410, 5, 4, 8); // WORK
-	if (Game_Flag_Query(kFlagUG16LutherLanceTalkReplicants1)
-	 || Game_Flag_Query(kFlagUG16LutherLanceTalkReplicants2)
+	if (Game_Flag_Query(kFlagUG16LutherLanceTalkReplicants)
+	 || Game_Flag_Query(kFlagUG16LutherLanceTalkHumans)
 	) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1420, 6, 4, 5); // LIFESPAN
 		DM_Add_To_List_Never_Repeat_Once_Selected(1430, 6, 4, 5); // CLOVIS
@@ -287,7 +287,7 @@ void SceneScriptUG16::dialogueWithLuther() {
 			Actor_Says(kActorLance, 140, 16);
 			Actor_Says(kActorMcCoy, 5790, 13);
 			Actor_Says(kActorLuther, 170, 14);
-			Game_Flag_Set(kFlagUG16LutherLanceTalkReplicants1);
+			Game_Flag_Set(kFlagUG16LutherLanceTalkReplicants);
 			Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, 5);
 		} else {
 			Actor_Says(kActorLuther, 180, 14);
@@ -295,7 +295,7 @@ void SceneScriptUG16::dialogueWithLuther() {
 			Actor_Says(kActorLance, 150, 17);
 			Actor_Says(kActorMcCoy, 5800, 13);
 			Actor_Says(kActorLuther, 190, 15);
-			Game_Flag_Set(kFlagUG16LutherLanceTalkReplicants2);
+			Game_Flag_Set(kFlagUG16LutherLanceTalkHumans);
 			Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, -10);
 		}
 		break;