[Scummvm-git-logs] scummvm master -> 6f38a68c11f41778c6168641de96bade523535aa
antoniou79
noreply at scummvm.org
Sat Jul 29 11:26:10 UTC 2023
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:
6f38a68c11 BLADERUNNER: Use uppercase for overlay names
Commit: 6f38a68c11f41778c6168641de96bade523535aa
https://github.com/scummvm/scummvm/commit/6f38a68c11f41778c6168641de96bade523535aa
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-07-29T14:25:41+03:00
Commit Message:
BLADERUNNER: Use uppercase for overlay names
This is done for code consistency only
Changed paths:
engines/bladerunner/script/scene/ct01.cpp
engines/bladerunner/script/scene/ct02.cpp
engines/bladerunner/script/scene/ct05.cpp
engines/bladerunner/script/scene/dr06.cpp
engines/bladerunner/script/scene/nr04.cpp
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp
index 9ccf1b7cc2a..4bec7828d2a 100644
--- a/engines/bladerunner/script/scene/ct01.cpp
+++ b/engines/bladerunner/script/scene/ct01.cpp
@@ -483,14 +483,14 @@ void SceneScriptCT01::SceneFrameAdvanced(int frame) {
) {
int v3 = Random_Query(0, 6);
if (v3 == 0) {
- Overlay_Play("ct01spnr", 0, false, true, 0);
+ Overlay_Play("CT01SPNR", 0, false, true, 0);
if (Random_Query(0, 1)) {
Ambient_Sounds_Play_Sound(kSfxSPIN2B, Random_Query(33, 50), 0, 0, 0);
} else {
Ambient_Sounds_Play_Sound(kSfxSPIN2A, Random_Query(33, 50), 0, 0, 0);
}
} else if (v3 == 1) {
- Overlay_Play("ct01spnr", 1, false, true, 0);
+ Overlay_Play("CT01SPNR", 1, false, true, 0);
if (Random_Query(0, 1)) {
Ambient_Sounds_Play_Sound(kSfxSPIN3A, Random_Query(33, 50), 0, 0, 0);
} else {
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index 4ffd6f67d75..ef8e643bb37 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -61,7 +61,7 @@ void SceneScriptCT02::InitializeScene() {
if (Actor_Clue_Query(kActorMcCoy, kClueZubenRunsAway)) {
Scene_Exit_Add_2D_Exit(kCT02ExitCT03, 332, 163, 404, 297, 0);
} else {
- Overlay_Play("ct02over", 0, true, false, 0);
+ Overlay_Play("CT02OVER", 0, true, false, 0);
}
Ambient_Sounds_Add_Looping_Sound(kSfxKTCHRAIN, 25, 0, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 38, 100, 1);
@@ -356,7 +356,7 @@ void SceneScriptCT02::PlayerWalkedIn() {
void SceneScriptCT02::PlayerWalkedOut() {
if (!Actor_Clue_Query(kActorMcCoy, kClueZubenRunsAway)) {
- Overlay_Remove("ct02over");
+ Overlay_Remove("CT02OVER");
}
}
diff --git a/engines/bladerunner/script/scene/ct05.cpp b/engines/bladerunner/script/scene/ct05.cpp
index 3ce446aae06..2aeb122844b 100644
--- a/engines/bladerunner/script/scene/ct05.cpp
+++ b/engines/bladerunner/script/scene/ct05.cpp
@@ -52,7 +52,7 @@ void SceneScriptCT05::InitializeScene() {
Scene_Loop_Set_Default(0);
}
if (Actor_Query_Goal_Number(kActorGaff) == kGoalGaffCT12WaitForMcCoy) {
- Overlay_Play("ct05over", 0, true, false, 0);
+ Overlay_Play("CT05OVER", 0, true, false, 0);
}
}
@@ -142,7 +142,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -128.42f, -109.91f, 112.83f, 0, true, false, false)) {
Game_Flag_Set(kFlagCT05toCT12);
if (Actor_Query_Goal_Number(kActorGaff) == kGoalGaffCT12WaitForMcCoy) {
- Overlay_Remove("ct05over");
+ Overlay_Remove("CT05OVER");
}
Set_Enter(kSetCT01_CT12, kSceneCT12);
}
@@ -153,7 +153,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -308.18f, -109.91f, 674.77f, 0, true, false, false)) {
Game_Flag_Set(kFlagCT05toCT04);
if (Actor_Query_Goal_Number(kActorGaff) == kGoalGaffCT12WaitForMcCoy) {
- Overlay_Remove("ct05over");
+ Overlay_Remove("CT05OVER");
Actor_Set_Goal_Number(kActorGaff, kGoalGaffCT12Leave);
Game_Flag_Set(kFlagMA01GaffApproachMcCoy);
}
@@ -172,7 +172,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) {
Footstep_Sound_Override_Off();
Game_Flag_Set(kFlagCT05toCT06);
if (Actor_Query_Goal_Number(kActorGaff) == kGoalGaffCT12WaitForMcCoy) {
- Overlay_Remove("ct05over");
+ Overlay_Remove("CT05OVER");
}
Set_Enter(kSetCT06, kSceneCT06);
}
diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp
index 2c5ba87d839..774fec5068e 100644
--- a/engines/bladerunner/script/scene/dr06.cpp
+++ b/engines/bladerunner/script/scene/dr06.cpp
@@ -47,13 +47,13 @@ void SceneScriptDR06::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxSWEEP4, 5, 60, 20, 20, -100, 100, -101, -101, 0, 0);
if (Game_Flag_Query(kFlagDR06JesterActive)) {
- Overlay_Play("DR06over", 1, true, false, 0);
+ Overlay_Play("DR06OVER", 1, true, false, 0);
Ambient_Sounds_Add_Looping_Sound(kSfxJESTMOV1, 47, -75, 0);
} else {
- Overlay_Play("DR06over", 0, true, false, 0);
+ Overlay_Play("DR06OVER", 0, true, false, 0);
}
if (Game_Flag_Query(kFlagDR06MannequinHeadOpen)) {
- Overlay_Play("DR06ovr2", 0, true, false, 0);
+ Overlay_Play("DR06OVR2", 0, true, false, 0);
}
}
@@ -79,11 +79,11 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -743.0f, 136.6f, -1091.0f, 0, true, false, false);
Actor_Face_Object(kActorMcCoy, "BOX16", true);
if (!Game_Flag_Query(kFlagDR06JesterActive)) {
- Overlay_Play("DR06over", 1, true, true, 0);
+ Overlay_Play("DR06OVER", 1, true, true, 0);
Ambient_Sounds_Add_Looping_Sound(kSfxJESTMOV1, 47, -75, 0);
Game_Flag_Set(kFlagDR06JesterActive);
} else {
- Overlay_Play("DR06over", 0, true, true, 0);
+ Overlay_Play("DR06OVER", 0, true, true, 0);
Ambient_Sounds_Remove_Looping_Sound(kSfxJESTMOV1, 0u);
Game_Flag_Reset(kFlagDR06JesterActive);
}
@@ -167,7 +167,7 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
}
if (!Game_Flag_Query(kFlagDR06MannequinHeadOpen)) {
- Overlay_Play("DR06ovr2", 0, true, false, 0);
+ Overlay_Play("DR06OVR2", 0, true, false, 0);
Game_Flag_Set(kFlagDR06MannequinHeadOpen);
Sound_Play(kSfxCEMENTL1, 100, 0, 0, 50);
if (!Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
@@ -182,7 +182,7 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
}
}
} else {
- Overlay_Remove("DR06ovr2");
+ Overlay_Remove("DR06OVR2");
Game_Flag_Reset(kFlagDR06MannequinHeadOpen);
Sound_Play(kSfxCEMENTL2, 100, 0, 0, 50);
}
@@ -262,7 +262,7 @@ void SceneScriptDR06::PlayerWalkedIn() {
}
void SceneScriptDR06::PlayerWalkedOut() {
- Overlay_Remove("DR06over");
+ Overlay_Remove("DR06OVER");
Ambient_Sounds_Remove_All_Non_Looping_Sounds(false);
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp
index 5b73de20812..c1bba56d64e 100644
--- a/engines/bladerunner/script/scene/nr04.cpp
+++ b/engines/bladerunner/script/scene/nr04.cpp
@@ -313,9 +313,9 @@ void SceneScriptNR04::PlayerWalkedIn() {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 53.0f, 0.0f, -26.0f, 0, false, false, false);
if (Game_Flag_Query(kFlagAR02DektoraBoughtScorpions)) {
- Overlay_Play("nr04over", 0, true, false, 0);
+ Overlay_Play("NR04OVER", 0, true, false, 0);
Delay(4000);
- Overlay_Remove("nr04over");
+ Overlay_Remove("NR04OVER");
}
//return false;
}
More information about the Scummvm-git-logs
mailing list