aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/script/scene/ct06.cpp
diff options
context:
space:
mode:
authorPeter Kohaut2019-01-24 22:57:41 +0100
committerPeter Kohaut2019-01-24 23:05:13 +0100
commit2cc09b6b1097007b6eeac12882c03475e56e1be0 (patch)
tree777e076f39c4c7dd246342cfe15b3321076b8c6b /engines/bladerunner/script/scene/ct06.cpp
parent2fd29c5193a0b9e6d3920f0512ce3ca37b00bf7e (diff)
downloadscummvm-rg350-2cc09b6b1097007b6eeac12882c03475e56e1be0.tar.gz
scummvm-rg350-2cc09b6b1097007b6eeac12882c03475e56e1be0.tar.bz2
scummvm-rg350-2cc09b6b1097007b6eeac12882c03475e56e1be0.zip
BLADERUNNER: Fixes for game scripts & cleanup
Diffstat (limited to 'engines/bladerunner/script/scene/ct06.cpp')
-rw-r--r--engines/bladerunner/script/scene/ct06.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp
index a5856b3717..1c5ace1941 100644
--- a/engines/bladerunner/script/scene/ct06.cpp
+++ b/engines/bladerunner/script/scene/ct06.cpp
@@ -51,7 +51,7 @@ void SceneScriptCT06::InitializeScene() {
Ambient_Sounds_Add_Sound(379, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(380, 70, 180, 50, 100, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(377, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0);
- if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06Hide) {
+ if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06HideAtFreeSlotA) {
Ambient_Sounds_Add_Sound(196, 1, 5, 25, 25, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(197, 1, 5, 25, 25, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(198, 1, 5, 25, 25, -100, 100, -101, -101, 0, 0);
@@ -67,7 +67,7 @@ void SceneScriptCT06::SceneLoaded() {
Unobstacle_Object("INSULPIP01", true);
Unobstacle_Object("CB BOX04", true);
Unclickable_Object("DOOR");
- if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06Hide) {
+ if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06HideAtFreeSlotA) {
Preload(3);
Preload(4);
Preload(389);
@@ -90,7 +90,7 @@ bool SceneScriptCT06::ClickedOnActor(int actorId) {
if (actorId == kActorZuben) {
Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorZuben, 24, true, false);
Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
- if (!Game_Flag_Query(kFlagZubenPhoto)) {
+ if (!Game_Flag_Query(kFlagCT06ZubenPhoto)) {
Actor_Clue_Acquire(kActorMcCoy, kClueZuben, true, -1);
Item_Pickup_Spin_Effect(984, 340, 369);
Actor_Voice_Over(350, kActorVoiceOver);
@@ -102,7 +102,7 @@ bool SceneScriptCT06::ClickedOnActor(int actorId) {
Actor_Voice_Over(400, kActorVoiceOver);
Actor_Voice_Over(410, kActorVoiceOver);
}
- Game_Flag_Set(kFlagZubenPhoto);
+ Game_Flag_Set(kFlagCT06ZubenPhoto);
return true;
}
Actor_Says(kActorMcCoy, 8570, 13);
@@ -127,7 +127,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) {
return true;
}
if (exitId == 1) {
- if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06Hide) {
+ if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06HideAtFreeSlotA) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 203.91f, -58.02f, 0.47f, 0, 1, false, 0)) {
Ambient_Sounds_Remove_Sound(196, true);
Ambient_Sounds_Remove_Sound(197, true);