[Scummvm-git-logs] scummvm master -> 52005245870c1adb8ea46b6eb452e788f877f46f
digitall
noreply at scummvm.org
Wed Nov 6 13:58:06 UTC 2024
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:
5200524587 BLADERUNNER: Fix Duplicated Branches GCC Compiler Warnings
Commit: 52005245870c1adb8ea46b6eb452e788f877f46f
https://github.com/scummvm/scummvm/commit/52005245870c1adb8ea46b6eb452e788f877f46f
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-06T13:56:58Z
Commit Message:
BLADERUNNER: Fix Duplicated Branches GCC Compiler Warnings
Changed paths:
engines/bladerunner/script/ai/generic_walker_a.cpp
engines/bladerunner/script/ai/generic_walker_b.cpp
engines/bladerunner/script/ai/generic_walker_c.cpp
engines/bladerunner/script/ai/officer_grayford.cpp
engines/bladerunner/script/scene/ar01.cpp
engines/bladerunner/script/scene/ug18.cpp
diff --git a/engines/bladerunner/script/ai/generic_walker_a.cpp b/engines/bladerunner/script/ai/generic_walker_a.cpp
index d3fcffdbf7d..747781b6f46 100644
--- a/engines/bladerunner/script/ai/generic_walker_a.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_a.cpp
@@ -537,6 +537,7 @@ bool AIScriptGenericWalkerA::preparePath() {
isInside = true;
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerA, 164, 0);
+#if 0
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerA, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerA, 162, 0);
@@ -544,21 +545,24 @@ bool AIScriptGenericWalkerA::preparePath() {
AI_Movement_Track_Append(kActorGenwalkerA, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerA, 162, 0);
} else {
+#endif
AI_Movement_Track_Append(kActorGenwalkerA, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerA, 162, 0);
- }
+ //}
} else {
AI_Movement_Track_Append(kActorGenwalkerA, 162, 0);
+#if 0
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerA, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerA, 164, 0);
} else {
+#endif
if (Random_Query(0, 1)) {
AI_Movement_Track_Append_With_Facing(kActorGenwalkerA, 166, 0, 30);
}
AI_Movement_Track_Append(kActorGenwalkerA, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerA, 164, 0);
- }
+ //}
}
AI_Movement_Track_Repeat(kActorGenwalkerA);
return true;
diff --git a/engines/bladerunner/script/ai/generic_walker_b.cpp b/engines/bladerunner/script/ai/generic_walker_b.cpp
index 9b41ba6712c..61a93ff8b88 100644
--- a/engines/bladerunner/script/ai/generic_walker_b.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_b.cpp
@@ -488,6 +488,7 @@ bool AIScriptGenericWalkerB::preparePath() {
isInside = true;
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerB, 164, 0);
+#if 0
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerB, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerB, 162, 0);
@@ -495,11 +496,13 @@ bool AIScriptGenericWalkerB::preparePath() {
AI_Movement_Track_Append(kActorGenwalkerB, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerB, 162, 0);
} else {
+#endif
AI_Movement_Track_Append(kActorGenwalkerB, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerB, 162, 0);
- }
+ //}
} else {
AI_Movement_Track_Append(kActorGenwalkerB, 162, 0);
+#if 0
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerB, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerB, 164, 0);
@@ -507,9 +510,10 @@ bool AIScriptGenericWalkerB::preparePath() {
AI_Movement_Track_Append(kActorGenwalkerB, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerB, 164, 0);
} else {
+#endif
AI_Movement_Track_Append(kActorGenwalkerB, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerB, 164, 0);
- }
+ //}
}
AI_Movement_Track_Repeat(kActorGenwalkerB);
return true;
diff --git a/engines/bladerunner/script/ai/generic_walker_c.cpp b/engines/bladerunner/script/ai/generic_walker_c.cpp
index ee42bf184c6..e284ead7b2b 100644
--- a/engines/bladerunner/script/ai/generic_walker_c.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_c.cpp
@@ -490,6 +490,7 @@ bool AIScriptGenericWalkerC::preparePath() {
isInside = true;
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerC, 164, 0);
+#if 0
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerC, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerC, 162, 0);
@@ -497,21 +498,24 @@ bool AIScriptGenericWalkerC::preparePath() {
AI_Movement_Track_Append(kActorGenwalkerC, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerC, 162, 0);
} else {
+#endif
AI_Movement_Track_Append(kActorGenwalkerC, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerC, 162, 0);
- }
+ //}
} else {
AI_Movement_Track_Append(kActorGenwalkerC, 162, 0);
+#if 0
if (Random_Query(0, 1)) {
AI_Movement_Track_Append(kActorGenwalkerC, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerC, 164, 0);
} else {
+#endif
if (Random_Query(0, 1)) {
AI_Movement_Track_Append_With_Facing(kActorGenwalkerC, 166, 0, 30);
}
AI_Movement_Track_Append(kActorGenwalkerC, 163, 0);
AI_Movement_Track_Append(kActorGenwalkerC, 164, 0);
- }
+ //}
}
AI_Movement_Track_Repeat(kActorGenwalkerC);
return true;
diff --git a/engines/bladerunner/script/ai/officer_grayford.cpp b/engines/bladerunner/script/ai/officer_grayford.cpp
index 5dc3ec28c4a..59ab23e6320 100644
--- a/engines/bladerunner/script/ai/officer_grayford.cpp
+++ b/engines/bladerunner/script/ai/officer_grayford.cpp
@@ -330,11 +330,14 @@ void AIScriptOfficerGrayford::ClickedByPlayer() {
Actor_Set_Goal_Number(kActorOfficerGrayford, kGoalOfficerGrayfordStopAndTalk1);
Actor_Face_Actor(kActorMcCoy, kActorOfficerGrayford, true);
Actor_Face_Actor(kActorOfficerGrayford, kActorMcCoy, true);
+ // TODO: Bug in the original? Both branches are identical
+#if 0
if (Random_Query(1, 2) == 1) {
Actor_Says(kActorMcCoy, 5075, 14); // Hey, pal.
} else {
- Actor_Says(kActorMcCoy, 5075, 14); // Hey, pal. TODO bug in the original? Matches the above statement
- }
+#endif
+ Actor_Says(kActorMcCoy, 5075, 14); // Hey, pal.
+ //}
Actor_Set_Goal_Number(kActorOfficerGrayford, kGoalOfficerGrayfordWalksInPS03c);
break;
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index 2ad36b14661..c3e7a188caf 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -111,11 +111,14 @@ void SceneScriptAR01::InitializeScene() {
&& Game_Flag_Query(kFlagHC01toAR01)
) {
Scene_Loop_Set_Default(kAR01LoopMainLoop);
+ // TODO: Query check not required as NoSpinner is default else branch
+#if 0
} else if (!Game_Flag_Query(kFlagSpinnerAtAR01)
&& Game_Flag_Query(kFlagHC01toAR01)
) {
Scene_Loop_Set_Default(kAR01LoopMainLoopNoSpinner);
- } else { // bug? branch content is equal to previous branch
+#endif
+ } else { // TODO: bug? branch content is equal to previous branch
Scene_Loop_Set_Default(kAR01LoopMainLoopNoSpinner);
}
}
diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp
index 8cc8246c650..d90d2a64fa0 100644
--- a/engines/bladerunner/script/scene/ug18.cpp
+++ b/engines/bladerunner/script/scene/ug18.cpp
@@ -232,10 +232,13 @@ void SceneScriptUG18::SceneFrameAdvanced(int frame) {
|| frame == 240 // end of main loop no trains
) {
if (Global_Variable_Query(kVariableUG18CountUpForNextTrainAction) < kUG18TrainsCountUpTargetRegular) {
+ // FIXME: bug? No difference in branches due to identical values of constants i.e. 4 seconds.
if (Global_Variable_Query(kVariableUG18StateOfTrains) == kUG18NoTrains) {
Global_Variable_Increment(kVariableUG18CountUpForNextTrainAction, kUG18TrainsSecondsOfLoopNoTrains); // add seconds
+ debug(11, "kUG18TrainsSecondsOfLoopNoTrains: %d", kUG18TrainsSecondsOfLoopNoTrains);
} else {
Global_Variable_Increment(kVariableUG18CountUpForNextTrainAction, kUG18TrainsSecondsOfLoopWithTrains); // add seconds
+ debug(11, "kUG18TrainsSecondsOfLoopWithTrains: %d", kUG18TrainsSecondsOfLoopWithTrains);
}
} else {
if (Global_Variable_Query(kVariableUG18StateOfTrains) == kUG18NoTrains) {
More information about the Scummvm-git-logs
mailing list