diff options
| author | Peter Kohaut | 2019-01-13 20:38:17 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-01-13 21:06:58 +0100 |
| commit | eb84113222562a3da2161ca7190cfd26a57f8080 (patch) | |
| tree | cbd5e8ab78fe12126e83edb4b5fabf617fb402a4 | |
| parent | efbcc757b62461914121e4e00891361994d90643 (diff) | |
| download | scummvm-rg350-eb84113222562a3da2161ca7190cfd26a57f8080.tar.gz scummvm-rg350-eb84113222562a3da2161ca7190cfd26a57f8080.tar.bz2 scummvm-rg350-eb84113222562a3da2161ca7190cfd26a57f8080.zip | |
BLADERUNNER: More variable names in the game scripts
62 files changed, 834 insertions, 605 deletions
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp index 57b49b0f19..58994b8d08 100644 --- a/engines/bladerunner/debugger.cpp +++ b/engines/bladerunner/debugger.cpp @@ -292,7 +292,7 @@ bool Debugger::cmdSay(int argc, const char **argv) { int sentenceId = atoi(argv[2]); Actor *actor = nullptr; - if (actorId >= 0 && actorId < (int)_vm->_gameInfo->getActorCount()) { + if ((actorId >= 0 && actorId < (int)_vm->_gameInfo->getActorCount()) || (actorId == kActorVoiceOver)) { actor = _vm->_actors[actorId]; } diff --git a/engines/bladerunner/dialogue_menu.cpp b/engines/bladerunner/dialogue_menu.cpp index 4491a94080..1b7c8713cc 100644 --- a/engines/bladerunner/dialogue_menu.cpp +++ b/engines/bladerunner/dialogue_menu.cpp @@ -24,6 +24,7 @@ #include "bladerunner/bladerunner.h" #include "bladerunner/font.h" +#include "bladerunner/game_constants.h" #include "bladerunner/mouse.h" #include "bladerunner/savefile.h" #include "bladerunner/settings.h" diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h index 09b326c460..58297758e4 100644 --- a/engines/bladerunner/game_constants.h +++ b/engines/bladerunner/game_constants.h @@ -439,39 +439,68 @@ enum SpinnerDestinations { }; enum Flags { + // 0 is never checked kFlagRC02Discovered = 1, + // 2 is never used kFlagGotOfficersStatement = 3, kFlagRC02FirstLeave = 4, + // 5 is never used + kFlagRunciterInterviewA = 6, + // 7 is never used kFlagRC01toRC02 = 8, kFlagRC02toRC01 = 9, + kFlagDR01toDR04 = 10, + kFlagDR04toDR01 = 11, kFlagKleinTalkShellCasings = 12, kFlagKleinTalkOfficersStatement = 13, + kFlagPS10toPS11 = 14, + kFlagPS11toPS10 = 15, + kFlagPS11toPS12 = 16, + kFlagPS12toPS11 = 17, // is never checked + kFlagPS12toPS13 = 18, kFlagPS13toPS12 = 19, + // 20 is never used kFlagPS13toPS05 = 21, kFlagPS02toPS05 = 22, kFlagPS06toPS05 = 23, kFlagIntroPlayed = 24, kFlagCT01Visited = 25, + kFlagCT01McCoyTalkedToHowieLee = 26, + kFlagCT01Evidence1Linked = 27, + kFlagCT01Evidence2Linked = 28, kFlagCT01ZubenLeft = 29, + // 30 is never set + kFlagCT01ZubenGone = 31, + kFlagCT01McCoyTalkedToGordo = 32, kFlagMA02toMA06 = 33, kFlagMA06ToMA02 = 34, kFlagMA02ToMA04 = 35, kFlagMA04ToMA02 = 36, kFlagMA01toMA06 = 37, kFlagMA06toMA01 = 38, + kFlagPS04toPS03 = 39, kFlagZubenRetired = 40, kFlagZubenSpared = 41, + kFlagPS03toPS04 = 42, + kFlagPS15Entered = 43, kFlagIzoIsReplicant = 44, kFlagGordoIsReplicant = 45, kFlagLucyIsReplicant = 46, kFlagDektoraIsReplicant = 47, kFlagSadikIsReplicant = 48, + kFlagMA07toMA06 = 57, kFlagMA06toMA07 = 58, kFlagCT02ZubenTalk = 59, kFlagChapter1Ended = 61, + kFlagMA02MaggieIntroduced = 60, + // 61 is never used kFlagMA04toMA05 = 62, kFlagMA05toMA04 = 63, + + // 65 is never used + // 66 is never used + // 67 is never used kFlagCT02toCT01 = 68, kFlagCT02toCT03 = 69, kFlagCT03toCT02 = 70, @@ -484,17 +513,48 @@ enum Flags { kFlagCT05toCT06 = 77, kFlagCT06toCT05 = 78, kFlagCT06toCT08 = 79, + kFlagCT08toCT06 = 80, // is never checked + kFlagCT08toCT09 = 81, + kFlagCT09toCT10 = 82, // is never checked + kFlagCT09toCT11 = 83, // is never checked + kFlagCT09toCT08 = 84, // is never checked + kFlagCT10toCT09 = 85, + kFlagCT11toCT12 = 86, + // 87 is never used kFlagCT12toCT01 = 88, kFlagCT12toCT03 = 89, kFlagCT12toCT05 = 90, kFlagCT12toCT11 = 91, + // 92 is never used + // 93 is never used kFlagWarehouseOpen = 94, + kFlagTB05toTB02 = 95, + kFlagTB02toTB05 = 96, // is never checked + kFlagTB05toTB06 = 97, // is never checked + kFlagTB06toTB05 = 98, + + // 103 is never set kFlagKleinTalkPaintTransfer = 104, kFlagKleinTalkChromeDebris = 105, + kFlagIsabellaIntroduced = 105, + kFlagHC04toRC03 = 107, + kFlagRC03toHC04 = 108, + kFlagHC04toHC02 = 109, + kFlagHC02toHC04 = 110, kFlagKleinTalkClues = 111, + // 112 is never used + // 113 is never used kFlagRC03toRC01 = 114, kFlagRC01toRC03 = 115, + kFlagRC03toAR02 = 116, + kFlagAR02toRC03 = 117, + kFlagRC03toUG01 = 118, + kFlagUG01toRC03 = 119, + kFlagRC03toRC04 = 120, // is never checked + kFlagRC04toRC03 = 121, + // 122 is never used kFlagCT01toCT12 = 123, + // 122 is never used kFlagPlayerHasShellCasings = 125, kFlagPlayerHasOfficersStatement = 126, kFlagPlayerHasPaintTransfer = 127, @@ -507,36 +567,55 @@ enum Flags { kFlagPS05toPS06 = 136, kFlagHomelessTalkedTo = 137, kFlagKleinInsulted = 138, + // 140 is never used kFlagRC02LucyDeskAvailable = 141, + // 142 is never checked + // 143 is never used kFlagCT07toCT06 = 144, + kFlagChapter1Ending = 146, kFlagChopstickWrapperTaken = 147, kFlagCandyTaken = 148, kFlagDogTaken = 149, + // 150 has no use + kFlagRC03UnlockedToUG01 = 151, + kFlagUG15toUG16 = 152, + kFlagUG16toUG15 = 153, + kFlagTB02toTB03 = 154, // is never checked + kFlagTB03toTB02 = 155, kFlagKleinInsultedTalk = 156, + // 157 is never used + kFlagGuzzaTalkZubenRetired = 159, kFlagGuzzaTalkZubenEscaped = 160, + kFlagChromeDebrisTaken = 163, - kFlagHomelessShot = 169, + kFlagMcCoyKilledHomeless = 169, + kFlagHomelessBodyInDumpster = 170, + kFlagHomelessBodyFound = 171, + kFlagDumpsterEmptied = 172, + kFlagHomelessBodyInDumpsterNotChecked = 173, // is never checked + kFlagLicensePlaceFound = 174, kFlagRC01PoliceDone = 186, + kFlagRC02TalkedToRunciter = 187, kFlagShellCasingsTaken = 190, kFlagBoughtHowieLeeFood = 192, kFlagPS15toPS05 = 204, kFlagCT02ZubenFled = 210, kFlagCT02toCT01walk = 234, kFlagArrivedFromSpinner = 247, - kFlagSpinnerToCT01 = 248, - kFlagSpinnerToRC01 = 249, - kFlagSpinnerToMA01 = 250, - kFlagSpinnerToPS01 = 251, - kFlagSpinnerToAR01 = 252, - kFlagSpinnerToDR01 = 253, - kFlagSpinnerToBB01 = 254, - kFlagSpinnerToNR01 = 255, - kFlagSpinnerToHF01 = 256, + kFlagSpinnerAtCT01 = 248, + kFlagSpinnerAtRC01 = 249, + kFlagSpinnerAtMA01 = 250, + kFlagSpinnerAtPS01 = 251, + kFlagSpinnerAtAR01 = 252, + kFlagSpinnerAtDR01 = 253, + kFlagSpinnerAtBB01 = 254, + kFlagSpinnerAtNR01 = 255, + kFlagSpinnerAtHF01 = 256, kFlagCT02PotTipped = 293, kFlagGaffSpinnerCT12 = 294, - kFlagSpinnerToTB02 = 307, + kFlagSpinnerAtTB02 = 307, kFlagDirectorsCut = 378, KFlagMcCoyAndOfficerLearyTalking = 392, KFlagMcCoyAndOfficerLearyArtMetaphor = 397, @@ -961,6 +1040,14 @@ enum PoliceMazeTrackInstruction { kPMTI26 = 0 }; +enum PlayerAgenda { + kPlayerAgendaPolite = 0, + kPlayerAgendaNormal = 1, + kPlayerAgendaSurly = 2, + kPlayerAgendaErratic = 3, + kPlayerAgendaUserChoice = 4 +}; + enum GoalMcCoy { kGoalMcCoyDefault = 0, kGoalMcCoyDodge = 1 @@ -989,7 +1076,11 @@ enum GoalZuben { kGoalZubenFled = 20, kGoalZubenMA01AttackMcCoy = 21, kGoalZubenDead = 599 +}; +enum GoalOfficerLeary { + kGoalOfficerLearyDefault = 0, + kGoalOfficerLearyCrowdInterrogation = 1 }; } // End of namespace BladeRunner diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp index da50c894a8..3c78254160 100644 --- a/engines/bladerunner/script/ai/gordo.cpp +++ b/engines/bladerunner/script/ai/gordo.cpp @@ -301,7 +301,7 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) { AI_Movement_Track_Repeat(kActorGordo); break; case 90: - Game_Flag_Set(32); + Game_Flag_Set(kFlagCT01McCoyTalkedToGordo); Actor_Set_Goal_Number(kActorGordo, 99); Actor_Change_Animation_Mode(kActorGordo, 29); break; @@ -1579,7 +1579,7 @@ void AIScriptGordo::sub_41090C() { Actor_Says(kActorGordo, 370, 13); Actor_Says(kActorGordo, 380, 12); Actor_Says(kActorGordo, 390, 14); - if (Player_Query_Agenda() == 2) { + if (Player_Query_Agenda() == kPlayerAgendaSurly) { Actor_Says(kActorMcCoy, 3265, 13); Actor_Says(kActorGordo, 400, 12); Actor_Modify_Friendliness_To_Other(kActorGordo, kActorMcCoy, -3); diff --git a/engines/bladerunner/script/ai/howie_lee.cpp b/engines/bladerunner/script/ai/howie_lee.cpp index 27be2bd995..edd131ccb2 100644 --- a/engines/bladerunner/script/ai/howie_lee.cpp +++ b/engines/bladerunner/script/ai/howie_lee.cpp @@ -99,13 +99,23 @@ void AIScriptHowieLee::ClickedByPlayer() { } void AIScriptHowieLee::EnteredScene(int sceneId) { - if (Actor_Query_Goal_Number(kActorHowieLee) == 4 && Actor_Query_In_Set(kActorHowieLee, kSetCT03_CT04)) { - if (Game_Flag_Query(kFlagHomelessShot) && !Game_Flag_Query(170) && !Game_Flag_Query(171)) { - Game_Flag_Set(171); + if (Actor_Query_Goal_Number(kActorHowieLee) == 4 + && Actor_Query_In_Set(kActorHowieLee, kSetCT03_CT04) + ) { + if ( Game_Flag_Query(kFlagMcCoyKilledHomeless) + && !Game_Flag_Query(kFlagHomelessBodyInDumpster) + && !Game_Flag_Query(kFlagHomelessBodyFound) + ) { + Game_Flag_Set(kFlagHomelessBodyFound); // return false; } - if (!Game_Flag_Query(kFlagHomelessShot) && Game_Flag_Query(170) && !Game_Flag_Query(171) && Random_Query(1, 10) == 1) { - Game_Flag_Set(171); + + if (!Game_Flag_Query(kFlagMcCoyKilledHomeless) + && Game_Flag_Query(kFlagHomelessBodyInDumpster) + && !Game_Flag_Query(kFlagHomelessBodyFound) + && Random_Query(1, 10) == 1 + ) { + Game_Flag_Set(kFlagHomelessBodyFound); // return true; } // return false; diff --git a/engines/bladerunner/script/ai/klein.cpp b/engines/bladerunner/script/ai/klein.cpp index 897b3122f4..3f116d30b3 100644 --- a/engines/bladerunner/script/ai/klein.cpp +++ b/engines/bladerunner/script/ai/klein.cpp @@ -48,26 +48,39 @@ bool AIScriptKlein::Update() { Actor_Set_Goal_Number(kActorKlein, 1); return true; } - if (Actor_Clue_Query(kActorMcCoy, kClueOfficersStatement) && !Game_Flag_Query(kFlagPlayerHasOfficersStatement)) { + if ( Actor_Clue_Query(kActorMcCoy, kClueOfficersStatement) + && !Game_Flag_Query(kFlagPlayerHasOfficersStatement) + ) { Game_Flag_Set(kFlagPlayerHasOfficersStatement); } - if (Actor_Clue_Query(kActorMcCoy, kCluePaintTransfer) && !Game_Flag_Query(kFlagPlayerHasPaintTransfer)) { + if ( Actor_Clue_Query(kActorMcCoy, kCluePaintTransfer) + && !Game_Flag_Query(kFlagPlayerHasPaintTransfer) + ) { Game_Flag_Set(kFlagPlayerHasPaintTransfer); } - if (Actor_Clue_Query(kActorMcCoy, kClueShellCasings) && !Game_Flag_Query(kFlagPlayerHasShellCasings)) { + if ( Actor_Clue_Query(kActorMcCoy, kClueShellCasings) + && !Game_Flag_Query(kFlagPlayerHasShellCasings) + ) { Game_Flag_Set(kFlagPlayerHasShellCasings); } - if (Actor_Clue_Query(kActorMcCoy, kClueChromeDebris) && !Game_Flag_Query(kFlagPlayerHasChromeDebris)) { + if ( Actor_Clue_Query(kActorMcCoy, kClueChromeDebris) + && !Game_Flag_Query(kFlagPlayerHasChromeDebris) + ) { Game_Flag_Set(kFlagPlayerHasChromeDebris); } - if (Player_Query_Current_Scene() == kScenePS07 && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 35 && !Game_Flag_Query(kFlagKleinInsulted)) { + if ( Player_Query_Current_Scene() == kScenePS07 + && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 35 + && !Game_Flag_Query(kFlagKleinInsulted) + ) { AI_Countdown_Timer_Reset(kActorKlein, 2); AI_Countdown_Timer_Start(kActorKlein, 2, 5); Game_Flag_Set(kFlagKleinInsulted); return true; } if (Actor_Query_Goal_Number(kActorKlein) == 7) { - if (Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) > 20 && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 40) { + if (Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) > 20 + && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 40 + ) { Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, 2); } AI_Movement_Track_Flush(kActorKlein); @@ -79,7 +92,10 @@ bool AIScriptKlein::Update() { void AIScriptKlein::TimerExpired(int timer) { if (timer == 2) { - if (Game_Flag_Query(kFlagKleinInsulted) && !Game_Flag_Query(kFlagKleinInsultedTalk) && Actor_Query_Is_In_Current_Set(kActorKlein)) { + if ( Game_Flag_Query(kFlagKleinInsulted) + && !Game_Flag_Query(kFlagKleinInsultedTalk) + && Actor_Query_Is_In_Current_Set(kActorKlein) + ) { Actor_Face_Actor(kActorKlein, kActorMcCoy, true); Actor_Says(kActorKlein, 10, kAnimationModeTalk); Actor_Says(kActorMcCoy, 4120, kAnimationModeTalk); diff --git a/engines/bladerunner/script/ai/mutant1.cpp b/engines/bladerunner/script/ai/mutant1.cpp index d9b309813d..8a531ed3cf 100644 --- a/engines/bladerunner/script/ai/mutant1.cpp +++ b/engines/bladerunner/script/ai/mutant1.cpp @@ -178,7 +178,7 @@ bool AIScriptMutant1::GoalChanged(int currentGoalNumber, int newGoalNumber) { AI_Movement_Track_Append(kActorMutant1, 39, 0); AI_Movement_Track_Repeat(kActorMutant1); - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { Actor_Set_Combat_Aggressiveness(kActorMutant1, 70); Actor_Set_Friendliness_To_Other(kActorMutant1, kActorMcCoy, 20); } @@ -352,7 +352,7 @@ bool AIScriptMutant1::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Set_Intelligence(kActorMutant1, 40); Actor_Set_Health(kActorMutant1, 10 * Query_Difficulty_Level() + 30, 10 * Query_Difficulty_Level() + 30); - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { Actor_Set_Combat_Aggressiveness(kActorMutant1, 70); Actor_Set_Friendliness_To_Other(kActorMutant1, kActorMcCoy, 20); } else { diff --git a/engines/bladerunner/script/ai/mutant2.cpp b/engines/bladerunner/script/ai/mutant2.cpp index 94be111865..16b2ca8592 100644 --- a/engines/bladerunner/script/ai/mutant2.cpp +++ b/engines/bladerunner/script/ai/mutant2.cpp @@ -162,7 +162,7 @@ bool AIScriptMutant2::GoalChanged(int currentGoalNumber, int newGoalNumber) { AI_Movement_Track_Append(kActorMutant2, 39, 0); AI_Movement_Track_Repeat(kActorMutant2); - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { Actor_Set_Combat_Aggressiveness(kActorMutant2, 60); Actor_Set_Friendliness_To_Other(kActorMutant2, kActorMcCoy, 30); } @@ -334,7 +334,7 @@ bool AIScriptMutant2::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Set_Intelligence(kActorMutant2, 20); Actor_Set_Health(71, 10 * Query_Difficulty_Level() + 50, 10 * Query_Difficulty_Level() + 50); - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { Actor_Set_Combat_Aggressiveness(kActorMutant2, 60); Actor_Set_Friendliness_To_Other(kActorMutant2, kActorMcCoy, 30); } else { diff --git a/engines/bladerunner/script/ai/mutant3.cpp b/engines/bladerunner/script/ai/mutant3.cpp index ff31d22061..0a6875e560 100644 --- a/engines/bladerunner/script/ai/mutant3.cpp +++ b/engines/bladerunner/script/ai/mutant3.cpp @@ -175,7 +175,7 @@ bool AIScriptMutant3::GoalChanged(int currentGoalNumber, int newGoalNumber) { AI_Movement_Track_Append(kActorMutant3, 39, 0); AI_Movement_Track_Repeat(kActorMutant3); - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { Actor_Set_Combat_Aggressiveness(kActorMutant3, 80); Actor_Set_Friendliness_To_Other(kActorMutant3, kActorMcCoy, 20); } @@ -345,7 +345,7 @@ bool AIScriptMutant3::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Set_Intelligence(kActorMutant3, 40); Actor_Set_Health(kActorMutant3, 10 * Query_Difficulty_Level() + 50, 10 * Query_Difficulty_Level() + 50); - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { Actor_Set_Combat_Aggressiveness(kActorMutant3, 80); Actor_Set_Friendliness_To_Other(kActorMutant3, kActorMcCoy, 20); } else { diff --git a/engines/bladerunner/script/ai/officer_leary.cpp b/engines/bladerunner/script/ai/officer_leary.cpp index db3725165a..dbfe6ceddd 100644 --- a/engines/bladerunner/script/ai/officer_leary.cpp +++ b/engines/bladerunner/script/ai/officer_leary.cpp @@ -37,108 +37,128 @@ void AIScriptOfficerLeary::Initialize() { var_45D5BC = 0; _animationNext = 0; - Actor_Put_In_Set(kActorOfficerLeary, 69); + Actor_Put_In_Set(kActorOfficerLeary, kSetRC01); Actor_Set_At_XYZ(kActorOfficerLeary, -261.80f, 6.00f, 79.58f, 512); - Actor_Set_Goal_Number(kActorOfficerLeary, 0); + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault); Actor_Set_Frame_Rate_FPS(kActorOfficerLeary, 8); } bool AIScriptOfficerLeary::Update() { - if (Global_Variable_Query(kVariableChapter) == 4 && Actor_Query_Goal_Number(kActorOfficerLeary) < 300) { + if (Global_Variable_Query(kVariableChapter) == 4 + && Actor_Query_Goal_Number(kActorOfficerLeary) < 300 + ) { AI_Movement_Track_Flush(kActorOfficerLeary); Actor_Set_Goal_Number(kActorOfficerLeary, 300); - } else if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_Goal_Number(kActorOfficerLeary) < 400) { + } else if (Global_Variable_Query(kVariableChapter) == 5 + && Actor_Query_Goal_Number(kActorOfficerLeary) < 400 + ) { AI_Movement_Track_Flush(kActorOfficerLeary); Actor_Set_Goal_Number(kActorOfficerLeary, 400); - } else if (!Game_Flag_Query(182) && Game_Flag_Query(147) == 1 && Game_Flag_Query(kFlagChromeDebrisTaken) == 1 && Player_Query_Current_Scene() != 78 && Global_Variable_Query(kVariableChapter) < 3) { + } else if (!Game_Flag_Query(182) + && Game_Flag_Query(147) + && Game_Flag_Query(kFlagChromeDebrisTaken) + && Player_Query_Current_Scene() != kSceneRC01 + && Global_Variable_Query(kVariableChapter) < 3 + ) { Game_Flag_Set(kFlagRC01PoliceDone); Actor_Set_Goal_Number(kActorOfficerLeary, 3); - } else if (Actor_Query_Goal_Number(kActorOfficerLeary) != 1 && Actor_Query_Goal_Number(kActorOfficerLeary) != 2 && Game_Flag_Query(199) == 1) { + } else if (Actor_Query_Goal_Number(kActorOfficerLeary) != kGoalOfficerLearyCrowdInterrogation + && Actor_Query_Goal_Number(kActorOfficerLeary) != 2 + && Game_Flag_Query(199) + ) { Game_Flag_Reset(199); - } else if (Global_Variable_Query(15) > 4 && !Actor_Clue_Query(kActorOfficerLeary, kClueMcCoyIsStupid)) { + } else if ( Global_Variable_Query(15) > 4 + && !Actor_Clue_Query(kActorOfficerLeary, kClueMcCoyIsStupid) + ) { Actor_Clue_Acquire(kActorOfficerLeary, kClueMcCoyIsStupid, 1, -1); - } else if (Game_Flag_Query(629) == 1) { + } else if (Game_Flag_Query(629)) { Game_Flag_Reset(629); - } else if (Game_Flag_Query(623) == 1 && !Game_Flag_Query(664)) { + } else if ( Game_Flag_Query(623) + && !Game_Flag_Query(664) + ) { Game_Flag_Set(664); Actor_Set_Goal_Number(kActorOfficerLeary, 305); - } else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 310 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) { + } else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 310 + && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set() + ) { Non_Player_Actor_Combat_Mode_Off(kActorOfficerLeary); Actor_Set_Goal_Number(kActorOfficerLeary, 305); - } else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 599 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) { + } else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 599 + && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set() + ) { Actor_Set_Health(kActorOfficerLeary, 40, 40); Actor_Set_Goal_Number(kActorOfficerLeary, 305); } else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 305) { switch (Actor_Query_Which_Set_In(kActorOfficerLeary)) { - case 7: + case kSetDR01_DR02_DR04: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 0, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 20: + case kSetBB01: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 1, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 33: + case kSetCT11: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 5, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 53: + case kSetMA07: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 7, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 54: + case kSetNR01: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 3, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 70: + case kSetRC03: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 18, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 74: + case kSetUG01: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 77: - case 78: - case 79: + case kSetUG04: + case kSetUG05: + case kSetUG06: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 81: + case kSetUG08: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 13, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 83: + case kSetUG10: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 84: + case kSetUG12: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 16, 4, 7, 8, -1, -1, -1, 10, 300, 0); } break; - case 86: + case kSetUG14: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, 310); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 17, 4, 7, 8, -1, -1, -1, 10, 300, 0); @@ -280,12 +300,12 @@ bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber) } if (Game_Flag_Query(182)) { if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA) && Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) { - Actor_Set_Goal_Number(kActorOfficerLeary, 0); + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault); } else { - Actor_Set_Goal_Number(kActorOfficerLeary, 1); + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyCrowdInterrogation); } } else { - Actor_Set_Goal_Number(kActorOfficerLeary, 0); + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault); } return true; case 3: diff --git a/engines/bladerunner/script/ai/rachael.cpp b/engines/bladerunner/script/ai/rachael.cpp index 950007ef36..20a4578ed4 100644 --- a/engines/bladerunner/script/ai/rachael.cpp +++ b/engines/bladerunner/script/ai/rachael.cpp @@ -62,7 +62,7 @@ void AIScriptRachael::ClickedByPlayer() { AI_Movement_Track_Pause(57); dialogue_start(); - if (Player_Query_Agenda() == 2 || Player_Query_Agenda() == 3) { + if (Player_Query_Agenda() == kPlayerAgendaSurly || Player_Query_Agenda() == kPlayerAgendaErratic) { dialogue_agenda2(); } else if (Player_Query_Agenda()) { if (Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy) > Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy)) { diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp index 9da49b259b..5420abd1b1 100644 --- a/engines/bladerunner/script/ai/steele.cpp +++ b/engines/bladerunner/script/ai/steele.cpp @@ -357,44 +357,43 @@ void AIScriptSteele::ClickedByPlayer() { void AIScriptSteele::EnteredScene(int sceneId) { if (Actor_Query_Goal_Number(kActorSteele) == 2) { - if (Game_Flag_Query(147) || Random_Query(1, 3) != 1) { - if (Game_Flag_Query(148) || Random_Query(1, 3) != 1) { - if (!Game_Flag_Query(149) && Random_Query(1, 20) == 1) { - Actor_Clue_Acquire(kActorSteele, 7, 1, -1); - Game_Flag_Set(149); - - if (Game_Flag_Query(709)) - Item_Remove_From_World(98); - } - } else { - Actor_Clue_Acquire(kActorSteele, 6, 1, -1); - Game_Flag_Set(148); - - if (Game_Flag_Query(709)) - Item_Remove_From_World(79); - } - } else { + if (!Game_Flag_Query(147) && Random_Query(1, 3) == 1) { Actor_Clue_Acquire(kActorSteele, 8, 1, -1); Game_Flag_Set(147); - if (Game_Flag_Query(709)) + if (Game_Flag_Query(709)) { Item_Remove_From_World(82); + } Global_Variable_Increment(14, 1); + } else if (!Game_Flag_Query(148) && Random_Query(1, 3) == 1) { + Actor_Clue_Acquire(kActorSteele, 6, 1, -1); + Game_Flag_Set(148); + + if (Game_Flag_Query(709)) { + Item_Remove_From_World(79); + } + } else if (!Game_Flag_Query(149) && Random_Query(1, 20) == 1) { + Actor_Clue_Acquire(kActorSteele, 7, 1, -1); + Game_Flag_Set(149); + + if (Game_Flag_Query(709)) { + Item_Remove_From_World(98); + } } } - if (Actor_Query_Goal_Number(kActorSteele) != 5 - || !Actor_Query_In_Set(kActorSteele, kSetCT03_CT04) - || !Game_Flag_Query(kFlagHomelessShot) - || Game_Flag_Query(170) - || Game_Flag_Query(171)) { - return; //false; + if ( Actor_Query_Goal_Number(kActorSteele) == 5 + && Actor_Query_In_Set(kActorSteele, kSetCT03_CT04) + && Game_Flag_Query(kFlagMcCoyKilledHomeless) + && !Game_Flag_Query(kFlagHomelessBodyInDumpster) + && !Game_Flag_Query(kFlagHomelessBodyFound) + ) { + Game_Flag_Set(kFlagHomelessBodyFound); + return; //true; } - Game_Flag_Set(171); - - return; //true; + return; //false; } void AIScriptSteele::OtherAgentEnteredThisScene(int otherActorId) { diff --git a/engines/bladerunner/script/ai/transient.cpp b/engines/bladerunner/script/ai/transient.cpp index a8ff812c4b..b5f42bdc72 100644 --- a/engines/bladerunner/script/ai/transient.cpp +++ b/engines/bladerunner/script/ai/transient.cpp @@ -40,20 +40,41 @@ void AIScriptTransient::Initialize() { } bool AIScriptTransient::Update() { - if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_Which_Set_In(kActorTransient) != kSetFreeSlotG) { + if (Global_Variable_Query(kVariableChapter) == 5 + && Actor_Query_Which_Set_In(kActorTransient) != kSetFreeSlotG + ) { Actor_Put_In_Set(kActorTransient, kSetFreeSlotG); Actor_Set_At_Waypoint(kActorTransient, 39, false); } - if (Global_Variable_Query(kVariableChapter) == 2 && (Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault || Actor_Query_Goal_Number(kActorTransient) == 10)) { + + if (Global_Variable_Query(kVariableChapter) == 2 + && (Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault + || Actor_Query_Goal_Number(kActorTransient) == 10 + ) + ) { Actor_Set_Goal_Number(kActorTransient, 200); } - if (Global_Variable_Query(kVariableChapter) == 3 && Game_Flag_Query(kFlagHomelessShot) && Game_Flag_Query(170) && !Game_Flag_Query(171) && !Game_Flag_Query(172)) { - Game_Flag_Set(172); + + if ( Global_Variable_Query(kVariableChapter) == 3 + && Game_Flag_Query(kFlagMcCoyKilledHomeless) + && Game_Flag_Query(kFlagHomelessBodyInDumpster) + && !Game_Flag_Query(kFlagHomelessBodyFound) + && !Game_Flag_Query(kFlagDumpsterEmptied) + ) { + Game_Flag_Set(kFlagDumpsterEmptied); } - if (Global_Variable_Query(kVariableChapter) < 4 && Game_Flag_Query(171) && Actor_Query_Goal_Number(kActorTransient) != 6 && Actor_Query_Goal_Number(kActorTransient) != 599) { + + if (Global_Variable_Query(kVariableChapter) < 4 + && Game_Flag_Query(kFlagHomelessBodyFound) + && Actor_Query_Goal_Number(kActorTransient) != 6 + && Actor_Query_Goal_Number(kActorTransient) != 599 + ) { Actor_Set_Goal_Number(kActorTransient, 6); } - if (Player_Query_Current_Scene() == kSceneCT04 && !Game_Flag_Query(kFlagCT04HomelessTrashFinish)) { + + if ( Player_Query_Current_Scene() == kSceneCT04 + && !Game_Flag_Query(kFlagCT04HomelessTrashFinish) + ) { Game_Flag_Set(kFlagCT04HomelessTrashFinish); AI_Countdown_Timer_Reset(kActorTransient, 1); AI_Countdown_Timer_Start(kActorTransient, 1, 12); @@ -83,7 +104,7 @@ void AIScriptTransient::TimerExpired(int timer) { } } if (timer == 1) { - if (Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault) { + if (Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault) { // stop diggin the trash Actor_Set_Goal_Number(kActorTransient, 10); Actor_Change_Animation_Mode(kActorTransient, kAnimationModeIdle); } @@ -142,7 +163,7 @@ bool AIScriptTransient::ShotAtAndHit() { Actor_Set_Goal_Number(kActorTransient, 599); } - Game_Flag_Set(kFlagHomelessShot); + Game_Flag_Set(kFlagMcCoyKilledHomeless); return false; } diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp index cfa146cd5e..8215c4c983 100644 --- a/engines/bladerunner/script/ai/zuben.cpp +++ b/engines/bladerunner/script/ai/zuben.cpp @@ -46,19 +46,26 @@ void AIScriptZuben::Initialize() { } bool AIScriptZuben::Update() { - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead && Actor_Query_Which_Set_In(kActorZuben) != kSetFreeSlotI) { - if (Actor_Query_Which_Set_In(kActorZuben) != Player_Query_Current_Set() ) { - Actor_Put_In_Set(kActorZuben, kSetFreeSlotI); - Actor_Set_At_Waypoint(kActorZuben, 41, 0); - } + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead + && Actor_Query_Which_Set_In(kActorZuben) != kSetFreeSlotI + && Actor_Query_Which_Set_In(kActorZuben) != Player_Query_Current_Set() + ) { + Actor_Put_In_Set(kActorZuben, kSetFreeSlotI); + Actor_Set_At_Waypoint(kActorZuben, 41, 0); } - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDefault && Player_Query_Current_Scene() == kSceneCT01 && !Game_Flag_Query(kFlagZubenCheckOnMcCoy) ) { + if ( Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDefault + && Player_Query_Current_Scene() == kSceneCT01 + && !Game_Flag_Query(kFlagZubenCheckOnMcCoy) + ) { AI_Countdown_Timer_Reset(kActorZuben, 2); AI_Countdown_Timer_Start(kActorZuben, 2, 30); Game_Flag_Set(kFlagZubenCheckOnMcCoy); return true; } - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDefault && Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) < 48 && Actor_Query_Is_In_Current_Set(kActorZuben)) { + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDefault + && Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) < 48 + && Actor_Query_Is_In_Current_Set(kActorZuben) + ) { Actor_Face_Actor(kActorZuben, kActorHowieLee, true); Actor_Says(kActorZuben, 0, 14); if (Random_Query(1, 3) == 1) { @@ -68,17 +75,25 @@ bool AIScriptZuben::Update() { Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT01Leave); return true; } - if (Global_Variable_Query(kVariableChapter) >= 4 && !Game_Flag_Query(kFlagZubenRetired) && Actor_Query_Goal_Number(kActorZuben) < 200) { + if ( Global_Variable_Query(kVariableChapter) >= 4 + && !Game_Flag_Query(kFlagZubenRetired) + && Actor_Query_Goal_Number(kActorZuben) < 200 + ) { AI_Movement_Track_Flush(kActorZuben); Actor_Set_Goal_Number(kActorZuben, 200); return true; } - if (Global_Variable_Query(kVariableChapter) == 5 && !Game_Flag_Query(kFlagZubenRetired) && Actor_Query_Goal_Number(kActorZuben) < 400) { + if ( Global_Variable_Query(kVariableChapter) == 5 + && !Game_Flag_Query(kFlagZubenRetired) + && Actor_Query_Goal_Number(kActorZuben) < 400 + ) { AI_Movement_Track_Flush(kActorZuben); Actor_Set_Goal_Number(kActorZuben, 400); return true; } - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06AttackMcCoy && Player_Query_Current_Scene() == kSceneCT07) { + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06AttackMcCoy + && Player_Query_Current_Scene() == kSceneCT07 + ) { AI_Countdown_Timer_Reset(kActorZuben, 0); Game_Flag_Set(kFlagWarehouseOpen); Actor_Set_Targetable(kActorZuben, true); @@ -87,7 +102,9 @@ bool AIScriptZuben::Update() { } return true; } - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT02PotDodgeCheck && !Game_Flag_Query(kFlagCT02ZubenFled)) { + if ( Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT02PotDodgeCheck + && !Game_Flag_Query(kFlagCT02ZubenFled) + ) { Game_Flag_Set(kFlagCT02ZubenFled); return true; } @@ -96,7 +113,10 @@ bool AIScriptZuben::Update() { void AIScriptZuben::TimerExpired(int timer) { if (timer == 2) { // Check on McCoy every 30s - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDefault && Player_Query_Current_Scene() == kSceneCT01 && Random_Query(1, 3) < 3) { + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDefault + && Player_Query_Current_Scene() == kSceneCT01 + && Random_Query(1, 3) < 3 + ) { Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, -1); } Game_Flag_Reset(kFlagZubenCheckOnMcCoy); @@ -120,14 +140,18 @@ void AIScriptZuben::TimerExpired(int timer) { } void AIScriptZuben::CompletedMovementTrack() { - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT02Flee && Game_Flag_Query(kFlagCT02McCoyFell)) { + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT02Flee + && Game_Flag_Query(kFlagCT02McCoyFell) + ) { Set_Enter(kSetCT03_CT04, kSceneCT03); } if (Actor_Query_Goal_Number(kActorZuben) == 3) { // not set anywhere Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT07Leave); //return true; - } else if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06Hide && Game_Flag_Query(kFlagCT02McCoyFell)) { + } else if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06Hide + && Game_Flag_Query(kFlagCT02McCoyFell) + ) { AI_Countdown_Timer_Reset(kActorZuben, 0); Game_Flag_Reset(kFlagCT02McCoyFell); Game_Flag_Set(kFlagCT02McCoyCombatReady); @@ -146,7 +170,7 @@ void AIScriptZuben::CompletedMovementTrack() { Delay(2000); Game_Flag_Set(144); Game_Flag_Set(kFlagZubenSpared); - Game_Flag_Set(31); + Game_Flag_Set(kFlagCT01ZubenGone); Actor_Set_Goal_Number(kActorZuben, kGoalZubenSpared); Actor_Set_Goal_Number(kActorGaff, 1); Set_Enter(kSetCT06, kSceneCT06); @@ -218,7 +242,11 @@ void AIScriptZuben::OtherAgentExitedThisScene(int otherActorId) { } void AIScriptZuben::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) { - if (otherActorId == kActorMcCoy && !combatMode && Game_Flag_Query(kFlagCT07ZubenAttack) && !Game_Flag_Query(kFlagMcCoyShotAtZuben)) { + if ( otherActorId == kActorMcCoy + && !combatMode + && Game_Flag_Query(kFlagCT07ZubenAttack) + && !Game_Flag_Query(kFlagMcCoyShotAtZuben) + ) { Non_Player_Actor_Combat_Mode_Off(kActorZuben); Game_Flag_Reset(kFlagCT07ZubenAttack); AI_Movement_Track_Flush(kActorZuben); @@ -236,7 +264,9 @@ void AIScriptZuben::ShotAtAndMissed() { bool AIScriptZuben::ShotAtAndHit() { Game_Flag_Set(kFlagMcCoyShotAtZuben); - if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT07Leave && !Actor_Clue_Query(kActorZuben, kClueMcCoyShotZubenInTheBack)) { + if ( Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT07Leave + && !Actor_Clue_Query(kActorZuben, kClueMcCoyShotZubenInTheBack) + ) { Actor_Clue_Acquire(kActorZuben, kClueMcCoyShotZubenInTheBack, true, -1); Actor_Clue_Lose(kActorZuben, kClueMcCoyLetZubenEscape); Actor_Start_Speech_Sample(kActorMcCoy, 490); @@ -323,7 +353,7 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) { return false; case kGoalZubenDie: Game_Flag_Set(kFlagZubenRetired); - Game_Flag_Set(31); + Game_Flag_Set(kFlagCT01ZubenGone); if (Actor_Query_In_Set(kActorZuben, kSetCT07)) { Game_Flag_Set(kFlagCT07toCT06); Actor_Set_Goal_Number(kActorGaff, 1); diff --git a/engines/bladerunner/script/init_script.cpp b/engines/bladerunner/script/init_script.cpp index fc78269076..a8c617bb27 100644 --- a/engines/bladerunner/script/init_script.cpp +++ b/engines/bladerunner/script/init_script.cpp @@ -111,7 +111,7 @@ void InitScript::Init_Game_Flags() { } Game_Flag_Set(182); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Set(kFlagSpinnerAtRC01); } void InitScript::Init_Clues() { diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp index d6c33b1913..c69dbffcfc 100644 --- a/engines/bladerunner/script/scene/ar01.cpp +++ b/engines/bladerunner/script/scene/ar01.cpp @@ -35,7 +35,7 @@ void SceneScriptAR01::InitializeScene() { } Scene_Exit_Add_2D_Exit(0, 134, 165, 177, 290, 3); Scene_Exit_Add_2D_Exit(1, 319, 0, 639, 207, 0); - if (Game_Flag_Query(kFlagSpinnerToAR01)) { + if (Game_Flag_Query(kFlagSpinnerAtAR01)) { Scene_Exit_Add_2D_Exit(2, 0, 404, 99, 479, 2); } Ambient_Sounds_Add_Looping_Sound(54, 50, 1, 1); @@ -67,22 +67,22 @@ void SceneScriptAR01::InitializeScene() { Ambient_Sounds_Add_Sound(375, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(376, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); - if (Game_Flag_Query(kFlagSpinnerToAR01) && !Game_Flag_Query(321) && !Game_Flag_Query(323)) { + if (Game_Flag_Query(kFlagSpinnerAtAR01) && !Game_Flag_Query(321) && !Game_Flag_Query(323)) { Actor_Set_Invisible(kActorMcCoy, true); Game_Flag_Set(273); Scene_Loop_Start_Special(0, 1, 0); Scene_Loop_Set_Default(2); - } else if (Game_Flag_Query(kFlagSpinnerToAR01) && Game_Flag_Query(321)) { + } else if (Game_Flag_Query(kFlagSpinnerAtAR01) && Game_Flag_Query(321)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(2); Game_Flag_Reset(321); - } else if (!Game_Flag_Query(kFlagSpinnerToAR01) && Game_Flag_Query(321)) { + } else if (!Game_Flag_Query(kFlagSpinnerAtAR01) && Game_Flag_Query(321)) { Scene_Loop_Start_Special(0, 6, 0); Scene_Loop_Set_Default(7); Game_Flag_Reset(321); - } else if (Game_Flag_Query(kFlagSpinnerToAR01) && Game_Flag_Query(323)) { + } else if (Game_Flag_Query(kFlagSpinnerAtAR01) && Game_Flag_Query(323)) { Scene_Loop_Set_Default(2); - } else if (!Game_Flag_Query(kFlagSpinnerToAR01) && Game_Flag_Query(323)) { + } else if (!Game_Flag_Query(kFlagSpinnerAtAR01) && Game_Flag_Query(323)) { Scene_Loop_Set_Default(7); } else { Scene_Loop_Set_Default(7); @@ -227,64 +227,64 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) { switch (spinnerDest) { case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 5, 1); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 5, 1); break; case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 5, 1); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 5, 1); break; case 5: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 5, 1); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 5, 1); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 5, 1); break; case 8: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 5, 1); break; case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToAR01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtAR01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 5, 1); break; diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp index d68efb377f..104ba2ccc4 100644 --- a/engines/bladerunner/script/scene/ar02.cpp +++ b/engines/bladerunner/script/scene/ar02.cpp @@ -26,7 +26,7 @@ namespace BladeRunner { void SceneScriptAR02::InitializeScene() { Music_Play(0, 22, 0, 2, -1, 1, 2); - if (Game_Flag_Query(116)) { + if (Game_Flag_Query(kFlagRC03toAR02)) { Setup_Scene_Information(-560.0f, 0.0f, -799.0f, 333); } else { Setup_Scene_Information(-182.0f, 0.0f, -551.0f, 973); @@ -62,11 +62,11 @@ void SceneScriptAR02::InitializeScene() { Ambient_Sounds_Add_Sound(375, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(376, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); - if (Game_Flag_Query(kFlagSpinnerToAR01) && Game_Flag_Query(320)) { + if (Game_Flag_Query(kFlagSpinnerAtAR01) && Game_Flag_Query(320)) { Scene_Loop_Start_Special(0, 1, 0); Scene_Loop_Set_Default(2); Game_Flag_Reset(320); - } else if (!Game_Flag_Query(kFlagSpinnerToAR01) && Game_Flag_Query(320)) { + } else if (!Game_Flag_Query(kFlagSpinnerAtAR01) && Game_Flag_Query(320)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(2); Game_Flag_Reset(320); @@ -201,18 +201,18 @@ bool SceneScriptAR02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -551.0f, 0, 1, false, 0)) { Game_Flag_Set(321); Async_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -407.0f, 0, false); - Set_Enter(0, kSceneAR01); + Set_Enter(kSetAR01_AR02, kSceneAR01); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -465.0f, 0.0f, -799.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -560.0f, 0.0f, -799.0f, 0, 0, false, 0); - Game_Flag_Set(117); + Game_Flag_Set(kFlagAR02toRC03); Game_Flag_Reset(180); Game_Flag_Set(182); Music_Stop(3); - Set_Enter(70, kSceneRC03); + Set_Enter(kSetRC03, kSceneRC03); } return true; } @@ -230,9 +230,9 @@ void SceneScriptAR02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptAR02::PlayerWalkedIn() { - if (Game_Flag_Query(116) == 1) { + if (Game_Flag_Query(kFlagRC03toAR02)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -465.0f, 0.0f, -799.0f, 0, 0, false, 0); - Game_Flag_Reset(116); + Game_Flag_Reset(kFlagRC03toAR02); } Game_Flag_Set(726); } diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp index 5bc75907c0..9bdae8c9f0 100644 --- a/engines/bladerunner/script/scene/bb01.cpp +++ b/engines/bladerunner/script/scene/bb01.cpp @@ -34,7 +34,7 @@ void SceneScriptBB01::InitializeScene() { } Scene_Exit_Add_2D_Exit(0, 0, 0, 72, 299, 3); Scene_Exit_Add_2D_Exit(1, 151, 218, 322, 290, 3); - if (Game_Flag_Query(kFlagSpinnerToBB01)) { + if (Game_Flag_Query(kFlagSpinnerAtBB01)) { Scene_Exit_Add_2D_Exit(2, 0, 311, 312, 479, 2); } Ambient_Sounds_Add_Looping_Sound(54, 50, 0, 1); @@ -51,12 +51,12 @@ void SceneScriptBB01::InitializeScene() { Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); - if (Game_Flag_Query(kFlagSpinnerToBB01) && !Game_Flag_Query(265) && !Game_Flag_Query(263)) { + if (Game_Flag_Query(kFlagSpinnerAtBB01) && !Game_Flag_Query(265) && !Game_Flag_Query(263)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); - } else if (Game_Flag_Query(kFlagSpinnerToBB01) && Game_Flag_Query(265)) { + } else if (Game_Flag_Query(kFlagSpinnerAtBB01) && Game_Flag_Query(265)) { Scene_Loop_Set_Default(1); - } else if (Game_Flag_Query(kFlagSpinnerToBB01) && Game_Flag_Query(263)) { + } else if (Game_Flag_Query(kFlagSpinnerAtBB01) && Game_Flag_Query(263)) { Scene_Loop_Set_Default(1); } else { Scene_Loop_Set_Default(5); @@ -112,64 +112,64 @@ bool SceneScriptBB01::ClickedOnExit(int exitId) { switch (spinnerDest) { case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 4, 1); break; case 5: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 4, 1); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToBB01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtBB01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 4, 1); break; diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp index 0237f0aa2c..931749f735 100644 --- a/engines/bladerunner/script/scene/ct01.cpp +++ b/engines/bladerunner/script/scene/ct01.cpp @@ -53,14 +53,16 @@ void SceneScriptCT01::InitializeScene() { } else if (Game_Flag_Query(kFlagCT12toCT01)) { Game_Flag_Reset(kFlagCT12toCT01); Setup_Scene_Information(-419.0f, -6.5f, 696.0f, 28); - if (Global_Variable_Query(kVariableChapter) != 2 && Global_Variable_Query(kVariableChapter) != 3) { - if (Game_Flag_Query(kFlagSpinnerToCT01)) { + if (Global_Variable_Query(kVariableChapter) != 2 + && Global_Variable_Query(kVariableChapter) != 3 + ) { + if (Game_Flag_Query(kFlagSpinnerAtCT01)) { Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kCT01LoopInshotFromCT12WithSpinner, false); } else { Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kCT01LoopInshotFromCT12NoSpinner, false); } } - } else if (Game_Flag_Query(kFlagSpinnerToCT01)) { + } else if (Game_Flag_Query(kFlagSpinnerAtCT01)) { Setup_Scene_Information(-530.0f, -6.5f, 241.0f, 506); Game_Flag_Set(kFlagArrivedFromSpinner); } else { @@ -73,7 +75,7 @@ void SceneScriptCT01::InitializeScene() { if (Game_Flag_Query(kFlagWarehouseOpen)) { Scene_Exit_Add_2D_Exit(kCT01ExitCT12, 506, 400, 639, 479, 2); } - if (Game_Flag_Query(kFlagSpinnerToCT01)) { + if (Game_Flag_Query(kFlagSpinnerAtCT01)) { Scene_Exit_Add_2D_Exit(kCT01ExitSpinner, 0, 286, 158, 350, 2); } Ambient_Sounds_Add_Looping_Sound(54, 50, 1, 1); @@ -92,7 +94,7 @@ void SceneScriptCT01::InitializeScene() { Ambient_Sounds_Add_Sound(375, 20, 40, 33, 50, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(376, 20, 40, 33, 50, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 20, 40, 33, 50, -100, 100, -101, -101, 0, 0); - if (Game_Flag_Query(kFlagSpinnerToCT01)) { + if (Game_Flag_Query(kFlagSpinnerAtCT01)) { Scene_Loop_Set_Default(kCT01LoopMain); } else { Scene_Loop_Set_Default(kCT01LoopMainLoopNoSpinner); @@ -136,16 +138,16 @@ bool SceneScriptCT01::ClickedOnActor(int actorId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -335.23f, -6.5f, 578.97f, 12, 1, false, 0)) { Actor_Face_Actor(kActorMcCoy, kActorHowieLee, true); Actor_Face_Actor(kActorHowieLee, kActorMcCoy, true); - if (!Game_Flag_Query(26)) { + if (!Game_Flag_Query(kFlagCT01McCoyTalkedToHowieLee)) { Actor_Says(kActorMcCoy, 260, 18); Actor_Says(kActorHowieLee, 0, 14); - Game_Flag_Set(26); + Game_Flag_Set(kFlagCT01McCoyTalkedToHowieLee); Actor_Set_Goal_Number(kActorHowieLee, 0); } else if (!Game_Flag_Query(30) && Actor_Query_Friendliness_To_Other(kActorHowieLee, kActorMcCoy) >= 40) { dialogueWithHowieLee(); Actor_Set_Goal_Number(kActorHowieLee, 0); } else { - if (Game_Flag_Query(31)) { + if (Game_Flag_Query(kFlagCT01ZubenGone)) { Actor_Says(kActorMcCoy, 330, 17); Actor_Says(kActorHowieLee, 130, 13); Actor_Says(kActorHowieLee, 140, 14); @@ -186,14 +188,14 @@ bool SceneScriptCT01::ClickedOnActor(int actorId) { } Actor_Face_Actor(kActorMcCoy, kActorGordo, true); - if (!Game_Flag_Query(32)) { + if (!Game_Flag_Query(kFlagCT01McCoyTalkedToGordo)) { Actor_Says(kActorMcCoy, 335, 18); Actor_Says(kActorGordo, 20, 30); - Game_Flag_Set(32); + Game_Flag_Set(kFlagCT01McCoyTalkedToGordo); Actor_Clue_Acquire(kActorGordo, kClueMcCoysDescription, 1, kActorMcCoy); Actor_Clue_Acquire(kActorMcCoy, kClueMcCoyIsABladeRunner, 1, kActorMcCoy); Actor_Modify_Friendliness_To_Other(kActorGordo, kActorMcCoy, -1); - } else if (Actor_Query_Goal_Number(kActorGordo)) { + } else if (Actor_Query_Goal_Number(kActorGordo) != 0) { Actor_Says(kActorMcCoy, 365, 14); } else { Actor_Says(kActorMcCoy, 340, 13); @@ -260,72 +262,72 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { case kSpinnerDestinationPoliceStation: Game_Flag_Set(178); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(kSetPS01, kScenePS01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationMcCoysApartment: Game_Flag_Set(179); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(kSetMA01, kSceneMA01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationRuncitersAnimals: Game_Flag_Set(182); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(kSetRC01, kSceneRC01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationAnimoidRow: Game_Flag_Set(180); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(kSetAR01_AR02, kSceneAR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationTyrellBuilding: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtCT01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(kSetTB02_TB03, kSceneTB02); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationDNARow: Game_Flag_Set(177); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(kSetDR01_DR02_DR04, kSceneDR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationBradburyBuilding: Game_Flag_Set(258); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(kSetBB01, kSceneBB01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationNightclubRow: Game_Flag_Set(181); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(kSetNR01, kSceneNR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; case kSpinnerDestinationHysteriaHall: Game_Flag_Set(257); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Reset(kFlagSpinnerToCT01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtCT01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(kSetHF01, kSceneHF01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kCT01LoopOutshot, true); break; @@ -427,10 +429,19 @@ void SceneScriptCT01::dialogueWithHowieLee() { if (Actor_Clue_Query(kActorMcCoy, kClueLucy)) { DM_Add_To_List_Never_Repeat_Once_Selected(40, 4, 5, 6); } - if ((Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) && !Game_Flag_Query(27)) { + if ( + ( Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) + || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) + ) + && !Game_Flag_Query(kFlagCT01Evidence1Linked) + ) { DM_Add_To_List_Never_Repeat_Once_Selected(50, 5, 5, 4); } - if (Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) && Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) && Game_Flag_Query(27) && !Game_Flag_Query(28)) { + if ( Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) + && Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) + && Game_Flag_Query(kFlagCT01Evidence1Linked) + && !Game_Flag_Query(kFlagCT01Evidence2Linked) + ) { DM_Add_To_List_Never_Repeat_Once_Selected(60, 3, 5, 5); } if (Game_Flag_Query(kFlagCT02PotTipped)) { @@ -451,7 +462,7 @@ void SceneScriptCT01::dialogueWithHowieLee() { Actor_Says(kActorMcCoy, 265, 11); Actor_Says(kActorHowieLee, 20, 14); if (Actor_Query_Is_In_Current_Set(kActorZuben)) { - if (!Actor_Query_Goal_Number(kActorZuben)) { + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDefault) { Actor_Face_Actor(kActorHowieLee, kActorZuben, true); Actor_Says(kActorHowieLee, 120, 14); Actor_Face_Actor(kActorZuben, kActorHowieLee, true); @@ -467,17 +478,17 @@ void SceneScriptCT01::dialogueWithHowieLee() { } break; case 50: - if (Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) == 1) { + if (Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper)) { Actor_Says(kActorMcCoy, 270, 11); Actor_Says(kActorHowieLee, 30, 16); } else { Actor_Says(kActorMcCoy, 280, 11); Actor_Says(kActorHowieLee, 40, 14); } - Game_Flag_Set(27); + Game_Flag_Set(kFlagCT01Evidence1Linked); break; case 60: - if (Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) == 1) { + if (Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) { Actor_Says(kActorMcCoy, 270, 11); Actor_Says(kActorHowieLee, 40, 15); } else { @@ -485,7 +496,7 @@ void SceneScriptCT01::dialogueWithHowieLee() { Actor_Says(kActorHowieLee, 30, 14); } Actor_Modify_Friendliness_To_Other(kActorHowieLee, kActorMcCoy, 5); - Game_Flag_Set(28); + Game_Flag_Set(kFlagCT01Evidence2Linked); break; case 70: Actor_Says(kActorMcCoy, 290, 13); diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp index 34480c7279..07819ceba2 100644 --- a/engines/bladerunner/script/scene/ct04.cpp +++ b/engines/bladerunner/script/scene/ct04.cpp @@ -62,7 +62,7 @@ void SceneScriptCT04::SceneLoaded() { if (Game_Flag_Query(kFlagCT03toCT04)) { Game_Flag_Reset(kFlagCT03toCT04); } - if (!Actor_Query_Goal_Number(kActorTransient)) { + if (Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault) { Actor_Change_Animation_Mode(kActorTransient, 38); } } @@ -73,56 +73,63 @@ bool SceneScriptCT04::MouseClick(int x, int y) { bool SceneScriptCT04::ClickedOn3DObject(const char *objectName, bool a2) { if (objectName) { // this can be only "DUMPSTER" - if (!Game_Flag_Query(kFlagHomelessTalkedTo) && !Game_Flag_Query(kFlagHomelessShot) && Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault) { + if (!Game_Flag_Query(kFlagHomelessTalkedTo) + && !Game_Flag_Query(kFlagMcCoyKilledHomeless) + && Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault + ) { Game_Flag_Set(kFlagHomelessTalkedTo); Actor_Set_Goal_Number(kActorTransient, kGoalTransientCT04Leave); } - if (Game_Flag_Query(kFlagHomelessShot) && !Game_Flag_Query(170) && !Game_Flag_Query(171) && !Game_Flag_Query(172) && Global_Variable_Query(kVariableChapter) == 1) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -147.41f, -621.3f, 724.57f, 0, 1, false, 0)) { + if ( Game_Flag_Query(kFlagMcCoyKilledHomeless) + && !Game_Flag_Query(kFlagHomelessBodyInDumpster) + && !Game_Flag_Query(kFlagHomelessBodyFound) + && !Game_Flag_Query(kFlagDumpsterEmptied) + && Global_Variable_Query(kVariableChapter) == 1 + ) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -147.41f, -621.3f, 724.57f, 0, true, false, 0)) { Player_Loses_Control(); Actor_Face_Heading(kActorMcCoy, 792, false); - Actor_Put_In_Set(kActorTransient, 99); + Actor_Put_In_Set(kActorTransient, kSetFreeSlotI); Actor_Set_At_XYZ(kActorTransient, 0, 0, 0, 0); Actor_Change_Animation_Mode(kActorMcCoy, 40); Actor_Voice_Over(320, kActorVoiceOver); Actor_Voice_Over(330, kActorVoiceOver); Actor_Voice_Over(340, kActorVoiceOver); - Game_Flag_Set(170); - Game_Flag_Set(173); + Game_Flag_Set(kFlagHomelessBodyInDumpster); + Game_Flag_Set(kFlagHomelessBodyInDumpsterNotChecked); } return false; } - if (Game_Flag_Query(170)) { - if (Game_Flag_Query(172)) { + if (Game_Flag_Query(kFlagHomelessBodyInDumpster)) { + if (Game_Flag_Query(kFlagDumpsterEmptied)) { Actor_Voice_Over(270, kActorVoiceOver); Actor_Voice_Over(280, kActorVoiceOver); - } else if (Game_Flag_Query(171)) { + } else if (Game_Flag_Query(kFlagHomelessBodyFound)) { Actor_Voice_Over(250, kActorVoiceOver); Actor_Voice_Over(260, kActorVoiceOver); } else { Actor_Voice_Over(230, kActorVoiceOver); Actor_Voice_Over(240, kActorVoiceOver); - Game_Flag_Reset(173); + Game_Flag_Reset(kFlagHomelessBodyInDumpsterNotChecked); } return true; } - if (Game_Flag_Query(174)) { - if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 75, 0, 1, false)) { + if (Game_Flag_Query(kFlagLicensePlaceFound)) { + if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 75, 0, true, false)) { Actor_Face_Heading(kActorMcCoy, 707, false); Actor_Change_Animation_Mode(kActorMcCoy, 38); - Ambient_Sounds_Play_Sound(553, 45, 30, 30, 0); - Actor_Voice_Over(1810, kActorVoiceOver); - Actor_Voice_Over(1820, kActorVoiceOver); + Actor_Clue_Acquire(kActorMcCoy, kClueLicensePlate, 1, -1); + Item_Pickup_Spin_Effect(952, 392, 225); + Game_Flag_Set(kFlagLicensePlaceFound); return true; } - return false; } - if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 75, 0, 1, false)) { + if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 75, 0, true, false)) { Actor_Face_Heading(kActorMcCoy, 707, false); Actor_Change_Animation_Mode(kActorMcCoy, 38); - Actor_Clue_Acquire(kActorMcCoy, kClueLicensePlate, 1, -1); - Item_Pickup_Spin_Effect(952, 392, 225); - Game_Flag_Set(174); + Ambient_Sounds_Play_Sound(553, 45, 30, 30, 0); + Actor_Voice_Over(1810, kActorVoiceOver); + Actor_Voice_Over(1820, kActorVoiceOver); return true; } } @@ -154,7 +161,7 @@ void SceneScriptCT04::dialogueWithHomeless() { bool SceneScriptCT04::ClickedOnActor(int actorId) { if (actorId == kActorTransient) { - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorTransient, 36, true, false)) { Actor_Voice_Over(290, kActorVoiceOver); Actor_Voice_Over(300, kActorVoiceOver); @@ -166,11 +173,11 @@ bool SceneScriptCT04::ClickedOnActor(int actorId) { Actor_Face_Actor(kActorMcCoy, kActorTransient, true); if (!Game_Flag_Query(kFlagHomelessTalkedTo)) { if (Game_Flag_Query(kFlagZubenRetired)) { - Actor_Says(kActorMcCoy, 435, 3); + Actor_Says(kActorMcCoy, 435, kAnimationModeTalk); Actor_Set_Goal_Number(kActorTransient, kGoalTransientCT04Leave); } else { Music_Stop(3); - Actor_Says(kActorMcCoy, 425, 3); + Actor_Says(kActorMcCoy, 425, kAnimationModeTalk); Actor_Says(kActorTransient, 0, 13); dialogueWithHomeless(); Actor_Set_Goal_Number(kActorTransient, kGoalTransientCT04Leave); @@ -178,7 +185,7 @@ bool SceneScriptCT04::ClickedOnActor(int actorId) { Game_Flag_Set(kFlagHomelessTalkedTo); } else { Actor_Face_Actor(kActorMcCoy, kActorTransient, true); - Actor_Says(kActorMcCoy, 435, 3); + Actor_Says(kActorMcCoy, 435, kAnimationModeTalk); } } } diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp index 378da29fe6..a4ba9362b5 100644 --- a/engines/bladerunner/script/scene/ct08.cpp +++ b/engines/bladerunner/script/scene/ct08.cpp @@ -115,8 +115,8 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -183.0f, 0.0f, 128.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(81); - Set_Enter(31, kSceneCT09); + Game_Flag_Set(kFlagCT08toCT09); + Set_Enter(kSetCT09, kSceneCT09); } return true; } @@ -134,8 +134,8 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -143.0f, 0.0f, -92.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(80); - Set_Enter(29, kSceneCT06); + Game_Flag_Set(kFlagCT08toCT06); + Set_Enter(kSetCT06, kSceneCT06); } return true; } @@ -180,7 +180,7 @@ void SceneScriptCT08::PlayerWalkedIn() { Game_Flag_Reset(kFlagCT06toCT08); } else { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -156.0f, 0.0f, 128.0f, 0, 0, false, 0); - Game_Flag_Reset(84); + Game_Flag_Reset(kFlagCT09toCT08); } } diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp index 4f81a9ee95..1e6918d6de 100644 --- a/engines/bladerunner/script/scene/ct09.cpp +++ b/engines/bladerunner/script/scene/ct09.cpp @@ -27,7 +27,7 @@ namespace BladeRunner { void SceneScriptCT09::InitializeScene() { if (Game_Flag_Query(85)) { Setup_Scene_Information(160.0f, 349.0f, 587.0f, 490); - } else if (Game_Flag_Query(81)) { + } else if (Game_Flag_Query(kFlagCT08toCT09)) { Setup_Scene_Information(235.0f, 3348.52f, 599.0f, 800); } else { Setup_Scene_Information(107.0f, 348.52f, 927.0f, 200); @@ -111,8 +111,8 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 348.52f, 599.0f, 0, 0, false, 0); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(84); - Set_Enter(6, kSceneCT08); + Game_Flag_Set(kFlagCT09toCT08); + Set_Enter(kSetCT08_CT51_UG12, kSceneCT08); } return true; } @@ -120,8 +120,8 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 107.0f, 348.52f, 927.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(83); - Set_Enter(33, kSceneCT11); + Game_Flag_Set(kFlagCT09toCT11); + Set_Enter(kSetCT11, kSceneCT11); } return true; } @@ -129,8 +129,8 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 159.0f, 349.0f, 570.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(82); - Set_Enter(32, kSceneCT10); + Game_Flag_Set(kFlagCT09toCT10); + Set_Enter(kSetCT10, kSceneCT10); } return true; } @@ -157,15 +157,15 @@ void SceneScriptCT09::PlayerWalkedIn() { Actor_Set_Goal_Number(kActorLeon, 1); v0 = true; } - if (Game_Flag_Query(85)) { - Game_Flag_Reset(85); - } else if (Game_Flag_Query(81)) { + if (Game_Flag_Query(kFlagCT10toCT09)) { + Game_Flag_Reset(kFlagCT10toCT09); + } else if (Game_Flag_Query(kFlagCT08toCT09)) { if (v0) { Async_Actor_Walk_To_XYZ(kActorMcCoy, 206.0f, 348.52f, 599.0f, 0, false); } else { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 206.0f, 348.52f, 599.0f, 0, 0, false, 0); } - Game_Flag_Reset(81); + Game_Flag_Reset(kFlagCT08toCT09); } else { if (v0) { Async_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 348.52f, 886.0f, 0, false); diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp index c0ad361642..53d3ee717c 100644 --- a/engines/bladerunner/script/scene/ct10.cpp +++ b/engines/bladerunner/script/scene/ct10.cpp @@ -26,7 +26,7 @@ namespace BladeRunner { void SceneScriptCT10::InitializeScene() { Setup_Scene_Information(-121.0f, 0.0f, -78.0f, 446); - Game_Flag_Reset(84); + Game_Flag_Reset(kFlagCT09toCT08); // a bug? Scene_Exit_Add_2D_Exit(0, 135, 74, 238, 340, 0); Ambient_Sounds_Add_Looping_Sound(336, 28, 0, 1); Ambient_Sounds_Add_Sound(375, 6, 180, 33, 33, 0, 0, -101, -101, 0, 0); @@ -120,8 +120,8 @@ bool SceneScriptCT10::ClickedOnExit(int exitId) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -121.0f, 0.0f, -78.0f, 0, 0, false, 0); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(85); - Set_Enter(31, kSceneCT09); + Game_Flag_Set(kFlagCT10toCT09); + Set_Enter(kSetCT09, kSceneCT09); } } return false; diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp index 49dd417ae1..44a05e1a07 100644 --- a/engines/bladerunner/script/scene/ct11.cpp +++ b/engines/bladerunner/script/scene/ct11.cpp @@ -108,8 +108,8 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -300.0f, 9.68f, 66.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -400.0f, 9.68f, -70.0f, 0, 1, false, 0); - Game_Flag_Set(86); - Set_Enter(4, kSceneCT12); + Game_Flag_Set(kFlagCT11toCT12); + Set_Enter(kSetCT01_CT12, kSceneCT12); } return true; } @@ -198,7 +198,7 @@ void SceneScriptCT11::PlayerWalkedIn() { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 125.0f, 9.68f, 74.0f, 0, 0, false, 0); Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false); Player_Gains_Control(); - Game_Flag_Reset(83); + Game_Flag_Reset(kFlagCT09toCT11); } } diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp index 0487de598b..e3201af272 100644 --- a/engines/bladerunner/script/scene/ct12.cpp +++ b/engines/bladerunner/script/scene/ct12.cpp @@ -33,7 +33,7 @@ void SceneScriptCT12::InitializeScene() { Game_Flag_Set(150); } Game_Flag_Reset(432); - } else if (Game_Flag_Query(86)) { + } else if (Game_Flag_Query(kFlagCT11toCT12)) { Setup_Scene_Information(-493.0f, -6.5f, 1174.0f, 990); } else { Setup_Scene_Information(-386.13f, -6.5f, 1132.72f, 783); @@ -64,13 +64,13 @@ void SceneScriptCT12::InitializeScene() { Actor_Set_At_XYZ(kActorGaff, -534.0f, -6.5f, 952.0f, 367); Game_Flag_Set(kFlagGaffSpinnerCT12); } - if (Game_Flag_Query(kFlagCT01toCT12) && Game_Flag_Query(kFlagSpinnerToCT01)) { + if (Game_Flag_Query(kFlagCT01toCT12) && Game_Flag_Query(kFlagSpinnerAtCT01)) { if (Global_Variable_Query(kVariableChapter) != 2 && Global_Variable_Query(kVariableChapter) != 3) { Scene_Loop_Start_Special(0, 1, 0); } Scene_Loop_Set_Default(2); Game_Flag_Reset(kFlagCT01toCT12); - } else if (Game_Flag_Query(kFlagCT01toCT12) && !Game_Flag_Query(kFlagSpinnerToCT01)) { + } else if (Game_Flag_Query(kFlagCT01toCT12) && !Game_Flag_Query(kFlagSpinnerAtCT01)) { if (Global_Variable_Query(kVariableChapter) != 2 && Global_Variable_Query(kVariableChapter) != 3) { Scene_Loop_Start_Special(0, 0, 0); } @@ -264,9 +264,9 @@ void SceneScriptCT12::PlayerWalkedIn() { } Actor_Set_Goal_Number(kActorGaff, 2); } - if (Game_Flag_Query(86)) { + if (Game_Flag_Query(kFlagCT11toCT12)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -520.0f, -6.5f, 1103.0f, 0, 0, false, 0); - Game_Flag_Reset(86); + Game_Flag_Reset(kFlagCT11toCT12); } } diff --git a/engines/bladerunner/script/scene/dr01.cpp b/engines/bladerunner/script/scene/dr01.cpp index 685076ceb8..2300afc6d4 100644 --- a/engines/bladerunner/script/scene/dr01.cpp +++ b/engines/bladerunner/script/scene/dr01.cpp @@ -27,7 +27,7 @@ namespace BladeRunner { void SceneScriptDR01::InitializeScene() { if (Game_Flag_Query(225)) { Setup_Scene_Information(-835.0f, -0.04f, -118.0f, 664); - } else if (Game_Flag_Query(11)) { + } else if (Game_Flag_Query(kFlagDR04toDR01)) { Setup_Scene_Information(-711.0f, -0.04f, 70.0f, 307); } else if (Game_Flag_Query(531)) { Setup_Scene_Information(-1765.28f, -0.04f, -23.82f, 269); @@ -36,7 +36,7 @@ void SceneScriptDR01::InitializeScene() { } Scene_Exit_Add_2D_Exit(0, 240, 60, 450, 250, 0); Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); - if (Game_Flag_Query(kFlagSpinnerToDR01) && Global_Variable_Query(kVariableChapter) < 4) { + if (Game_Flag_Query(kFlagSpinnerAtDR01) && Global_Variable_Query(kVariableChapter) < 4) { Scene_Exit_Add_2D_Exit(2, 610, 0, 639, 479, 1); } if (Global_Variable_Query(kVariableChapter) >= 3) { @@ -55,10 +55,10 @@ void SceneScriptDR01::InitializeScene() { Ambient_Sounds_Add_Sound(378, 5, 80, 50, 100, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(379, 5, 80, 50, 100, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(380, 5, 80, 50, 100, -100, 100, -101, -101, 0, 0); - if (Game_Flag_Query(272) && Game_Flag_Query(11)) { + if (Game_Flag_Query(272) && Game_Flag_Query(kFlagDR04toDR01)) { Scene_Loop_Start_Special(0, 3, 0); Scene_Loop_Set_Default(4); - } else if (!Game_Flag_Query(272) && Game_Flag_Query(11)) { + } else if (!Game_Flag_Query(272) && Game_Flag_Query(kFlagDR04toDR01)) { Scene_Loop_Start_Special(0, 2, 0); Scene_Loop_Set_Default(4); } else if (Game_Flag_Query(225)) { @@ -110,15 +110,15 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -911.0f, -0.04f, -118.0f, 0, false); Ambient_Sounds_Adjust_Looping_Sound(112, 10, -100, 1); Game_Flag_Set(224); - Set_Enter(7, kSceneDR02); + Set_Enter(kSetDR01_DR02_DR04, kSceneDR02); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -711.0f, -0.04f, 70.0f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -796.0f, -0.04f, 166.0f, 0, false); - Game_Flag_Set(10); - Set_Enter(7, kSceneDR04); + Game_Flag_Set(kFlagDR01toDR04); + Set_Enter(kSetDR01_DR02_DR04, kSceneDR04); } return true; } @@ -136,56 +136,56 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { switch (spinnerDest) { case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); break; case 5: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(17, kSceneTB02); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); break; case 8: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(54, kSceneNR01); break; case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToDR01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtDR01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); break; default: @@ -238,18 +238,18 @@ void SceneScriptDR01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptDR01::PlayerWalkedIn() { if (Game_Flag_Query(531)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -757.15f, -0.04f, 24.64f, 0, false); - } else if (!Game_Flag_Query(225) && !Game_Flag_Query(11)) { + } else if (!Game_Flag_Query(225) && !Game_Flag_Query(kFlagDR04toDR01)) { Player_Loses_Control(); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -447.39f, 0.16f, -92.38f, 0, 0, false, 0); Player_Gains_Control(); } Game_Flag_Reset(225); - Game_Flag_Reset(11); + Game_Flag_Reset(kFlagDR04toDR01); Game_Flag_Reset(531); } void SceneScriptDR01::PlayerWalkedOut() { - if (!Game_Flag_Query(10) && !Game_Flag_Query(224) && !Game_Flag_Query(558)) { + if (!Game_Flag_Query(kFlagDR01toDR04) && !Game_Flag_Query(224) && !Game_Flag_Query(558)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Outtake_Play(kOuttakeInside2, true, -1); diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp index fd7316536d..e36c696811 100644 --- a/engines/bladerunner/script/scene/dr04.cpp +++ b/engines/bladerunner/script/scene/dr04.cpp @@ -27,7 +27,7 @@ namespace BladeRunner { void SceneScriptDR04::InitializeScene() { if (Game_Flag_Query(515)) { Setup_Scene_Information(0.0f, 0.0f, 0.0f, 0); - } else if (Game_Flag_Query(10)) { + } else if (Game_Flag_Query(kFlagDR01toDR04)) { Setup_Scene_Information(-711.0f, -0.04f, 70.0f, 472); } else if (Game_Flag_Query(229)) { Setup_Scene_Information(-1067.0f, 7.18f, 421.0f, 125); @@ -57,7 +57,7 @@ void SceneScriptDR04::InitializeScene() { } else { Scene_Loop_Set_Default(4); } - if (Game_Flag_Query(10)) { + if (Game_Flag_Query(kFlagDR01toDR04)) { if (Game_Flag_Query(272)) { Scene_Loop_Start_Special(0, 0, 0); } else { @@ -137,8 +137,8 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -761.0f, -0.04f, 97.0f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -683.0f, -0.04f, 43.0f, 0, false); - Game_Flag_Set(11); - Set_Enter(7, kSceneDR01); + Game_Flag_Set(kFlagDR04toDR01); + Set_Enter(kSetDR01_DR02_DR04, kSceneDR01); } return true; } @@ -252,7 +252,7 @@ void SceneScriptDR04::PlayerWalkedIn() { Footstep_Sound_Override_Off(); } } - Game_Flag_Reset(10); + Game_Flag_Reset(kFlagDR01toDR04); Game_Flag_Reset(229); Game_Flag_Reset(231); } diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp index 97292f29ac..8723186333 100644 --- a/engines/bladerunner/script/scene/hc02.cpp +++ b/engines/bladerunner/script/scene/hc02.cpp @@ -26,7 +26,7 @@ namespace BladeRunner { void SceneScriptHC02::InitializeScene() { Music_Play(4, 45, -60, 1, -1, 1, 3); - if (Game_Flag_Query(109)) { + if (Game_Flag_Query(kFlagHC04toHC02)) { Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 540); } else { Setup_Scene_Information(-57.0f, 0.14f, 83.0f, 746); @@ -172,9 +172,9 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, 0.14f, -339.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(110); + Game_Flag_Set(kFlagHC02toHC04); Async_Actor_Walk_To_XYZ(kActorMcCoy, -88.0f, 0.14f, -463.0f, 0, false); - Set_Enter(8, kSceneHC04); + Set_Enter(kSetHC01_HC02_HC03_HC04, kSceneHC04); } return true; } @@ -201,9 +201,9 @@ void SceneScriptHC02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptHC02::PlayerWalkedIn() { - if (Game_Flag_Query(109)) { + if (Game_Flag_Query(kFlagHC04toHC02)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, 0.14f, -339.0f, 0, 0, false, 0); - Game_Flag_Reset(109); + Game_Flag_Reset(kFlagHC04toHC02); } } diff --git a/engines/bladerunner/script/scene/hc04.cpp b/engines/bladerunner/script/scene/hc04.cpp index 43745380b8..b264306321 100644 --- a/engines/bladerunner/script/scene/hc04.cpp +++ b/engines/bladerunner/script/scene/hc04.cpp @@ -25,9 +25,9 @@ namespace BladeRunner { void SceneScriptHC04::InitializeScene() { - if (Game_Flag_Query(108)) { + if (Game_Flag_Query(kFlagRC03toHC04)) { Setup_Scene_Information(-112.0f, 0.14f, -655.0f, 460); - Game_Flag_Reset(108); + Game_Flag_Reset(kFlagRC03toHC04); } else { Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 1013); } @@ -59,10 +59,10 @@ void SceneScriptHC04::InitializeScene() { Ambient_Sounds_Add_Sound(260, 3, 60, 16, 16, -100, -100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(261, 3, 60, 16, 16, -100, -100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(262, 3, 60, 16, 16, -100, -100, -101, -101, 0, 0); - if (Game_Flag_Query(110)) { + if (Game_Flag_Query(kFlagHC02toHC04)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); - Game_Flag_Reset(110); + Game_Flag_Reset(kFlagHC02toHC04); } else { Scene_Loop_Set_Default(1); } @@ -87,14 +87,14 @@ bool SceneScriptHC04::ClickedOnActor(int actorId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -155.0f, 0.0f, -475.0f, 12, 1, false, 0)) { Actor_Face_Actor(kActorMcCoy, kActorIsabella, true); Actor_Face_Actor(kActorIsabella, kActorMcCoy, true); - if (Game_Flag_Query(106)) { + if (Game_Flag_Query(kFlagIsabellaIntroduced)) { sub_401B90(); return true; } else { Actor_Says(kActorIsabella, 0, 3); Actor_Says(kActorMcCoy, 1280, 3); Actor_Says(kActorIsabella, 20, 3); - Game_Flag_Set(106); + Game_Flag_Set(kFlagIsabellaIntroduced); return true; } } @@ -110,17 +110,17 @@ bool SceneScriptHC04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -108.0f, 0.14f, -639.0f, 0, 1, false, 0)) { Music_Stop(2); - Game_Flag_Set(107); + Game_Flag_Set(kFlagHC04toRC03); Game_Flag_Reset(479); Game_Flag_Set(182); - Set_Enter(70, kSceneRC03); + Set_Enter(kSetRC03, kSceneRC03); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -72.0f, 0.14f, -399.0f, 0, 1, false, 0)) { - Game_Flag_Set(109); - Set_Enter(8, kSceneHC02); + Game_Flag_Set(kFlagHC04toHC02); + Set_Enter(kSetHC01_HC02_HC03_HC04, kSceneHC02); } return true; } diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp index d75c381f35..ee5a1163fb 100644 --- a/engines/bladerunner/script/scene/hf01.cpp +++ b/engines/bladerunner/script/scene/hf01.cpp @@ -40,7 +40,7 @@ void SceneScriptHF01::InitializeScene() { if (!Game_Flag_Query(663)) { Scene_Exit_Add_2D_Exit(1, 304, 239, 492, 339, 0); Scene_Exit_Add_2D_Exit(2, 560, 231, 639, 360, 0); - if (Game_Flag_Query(kFlagSpinnerToHF01)) { + if (Game_Flag_Query(kFlagSpinnerAtHF01)) { Scene_Exit_Add_2D_Exit(3, 0, 311, 66, 417, 2); } } @@ -61,7 +61,7 @@ void SceneScriptHF01::InitializeScene() { Ambient_Sounds_Add_Sound(375, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(376, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0); - if (Game_Flag_Query(kFlagSpinnerToHF01)) { + if (Game_Flag_Query(kFlagSpinnerAtHF01)) { if (!Game_Flag_Query(309) && !Game_Flag_Query(311) && !Game_Flag_Query(313)) { Scene_Loop_Start_Special(0, 0, 0); } @@ -75,7 +75,7 @@ void SceneScriptHF01::InitializeScene() { void SceneScriptHF01::SceneLoaded() { Obstacle_Object("LOFT41", true); - if (!Game_Flag_Query(kFlagSpinnerToHF01)) { + if (!Game_Flag_Query(kFlagSpinnerAtHF01)) { Unobstacle_Object("OBSTACLE BOX15", true); } } @@ -190,64 +190,64 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { switch (spinnerDest) { case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 4, 1); break; case 5: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 4, 1); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToHF01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtHF01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp index c96f852973..57846f2b73 100644 --- a/engines/bladerunner/script/scene/hf05.cpp +++ b/engines/bladerunner/script/scene/hf05.cpp @@ -468,7 +468,7 @@ void SceneScriptHF05::sub_403738() { Actor_Set_At_XYZ(kActorCrazylegs, -315.15f, 0.0f, 241.06f, 583); Actor_Set_Goal_Number(kActorCrazylegs, 699); Game_Flag_Set(652); - if (Game_Flag_Query(kFlagSpinnerToNR01)) { + if (Game_Flag_Query(kFlagSpinnerAtNR01)) { Set_Enter(54, kSceneNR01); } else { Game_Flag_Set(313); diff --git a/engines/bladerunner/script/scene/ma01.cpp b/engines/bladerunner/script/scene/ma01.cpp index b839886eff..5acd8c48e2 100644 --- a/engines/bladerunner/script/scene/ma01.cpp +++ b/engines/bladerunner/script/scene/ma01.cpp @@ -38,14 +38,14 @@ enum kMA01Exits { void SceneScriptMA01::InitializeScene() { Setup_Scene_Information(381.0f, 0.0f, 54.0f, 992); - if (Game_Flag_Query(kFlagSpinnerToMA01)) { + if (Game_Flag_Query(kFlagSpinnerAtMA01)) { Setup_Scene_Information(381.0f, 0.0f, 54.0f, 992); } if (Game_Flag_Query(kFlagMA06toMA01)) { Setup_Scene_Information(1446.0f, 0.0f, -725.0f, 660); } Scene_Exit_Add_2D_Exit(kMA01ExitMA06, 328, 132, 426, 190, 0); - if (Game_Flag_Query(kFlagSpinnerToMA01)) { + if (Game_Flag_Query(kFlagSpinnerAtMA01)) { Scene_Exit_Add_2D_Exit(kMA01ExitSpinner, 234, 240, 398, 328, 2); } Ambient_Sounds_Add_Looping_Sound(101, 90, 0, 1); @@ -130,64 +130,64 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) { switch (spinnerDest) { case kSpinnerDestinationPoliceStation: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(kSetPS01, kScenePS01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationRuncitersAnimals: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(kSetRC01, kSceneRC01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationChinatown: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(kSetCT01_CT12, kSceneCT01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationTyrellBuilding: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(kSetTB02_TB03, kSceneTB02); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationAnimoidRow: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(kSetAR01_AR02, kSceneAR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationDNARow: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(kSetDR01_DR02_DR04, kSceneDR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationBradburyBuilding: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(kSetBB01, kSceneBB01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationNightclubRow: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(kSetNR01, kSceneNR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; case kSpinnerDestinationHysteriaHall: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToMA01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtMA01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(kSetHF01, kSceneHF01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA01LoopOutshotRoof, true); break; diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp index e8bb134557..edaae510f8 100644 --- a/engines/bladerunner/script/scene/ma02.cpp +++ b/engines/bladerunner/script/scene/ma02.cpp @@ -156,7 +156,9 @@ void SceneScriptMA02::PlayerWalkedIn() { if (Game_Flag_Query(kFlagMA04ToMA02)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -148.12f, -144.13f, 34.27f, 0, 1, false, 0); } - if (Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(655)) { + if ( Global_Variable_Query(kVariableChapter) == 4 + && !Game_Flag_Query(655) + ) { Game_Flag_Set(623); Game_Flag_Set(655); dialogueWithRajif(); @@ -166,7 +168,9 @@ void SceneScriptMA02::PlayerWalkedIn() { // return true; return; } - if (Global_Variable_Query(kVariableChapter) == 5 && !Game_Flag_Query(654)) { + if ( Global_Variable_Query(kVariableChapter) == 5 + && !Game_Flag_Query(654) + ) { if (Game_Flag_Query(653)) { Actor_Says(kActorMcCoy, 2390, 0); Music_Play(2, 25, 0, 3, -1, 0, 0); @@ -176,10 +180,13 @@ void SceneScriptMA02::PlayerWalkedIn() { Game_Flag_Set(654); Autosave_Game(3); } - if (Global_Variable_Query(kVariableChapter) < 4 && !Game_Flag_Query(kFlagMA04ToMA02) && Actor_Query_Goal_Number(kActorMaggie) != 2) { + if ( Global_Variable_Query(kVariableChapter) < 4 + && !Game_Flag_Query(kFlagMA04ToMA02) + && Actor_Query_Goal_Number(kActorMaggie) != 2 + ) { Actor_Set_Goal_Number(kActorMaggie, 1); - if (!Game_Flag_Query(60)) { - Game_Flag_Set(60); + if (!Game_Flag_Query(kFlagMA02MaggieIntroduced)) { + Game_Flag_Set(kFlagMA02MaggieIntroduced); Actor_Face_Actor(kActorMcCoy, kActorMaggie, true); Actor_Voice_Over(1210, kActorVoiceOver); if (!Game_Flag_Query(kFlagDirectorsCut)) { @@ -242,7 +249,7 @@ void SceneScriptMA02::selectNextTvNews() { if (Global_Variable_Query(kVariableChapter) >= 2 && Global_Variable_Query(kVariableChapter) <= 4) { arr[i++] = 3; } - if (Game_Flag_Query(171) && Game_Flag_Query(170)) { + if (Game_Flag_Query(kFlagHomelessBodyFound) && Game_Flag_Query(kFlagHomelessBodyInDumpster)) { arr[i++] = 4; } Global_Variable_Set(kVariableNextTvNews, arr[Random_Query(0, i - 1)]); diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp index cf69ded5f3..b7a6da38e2 100644 --- a/engines/bladerunner/script/scene/ma06.cpp +++ b/engines/bladerunner/script/scene/ma06.cpp @@ -138,7 +138,7 @@ void SceneScriptMA06::activateElevator() { if (floor > 1) { Game_Flag_Set(kFlagMA06toMA07); } else if (floor == 1) { - if (Game_Flag_Query(kFlagSpinnerToMA01)) { + if (Game_Flag_Query(kFlagSpinnerAtMA01)) { Game_Flag_Set(kFlagMA06toMA01); } else { Sound_Play(412, 100, 0, 0, 50); diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp index 8fe96be783..9fc87d8367 100644 --- a/engines/bladerunner/script/scene/nr01.cpp +++ b/engines/bladerunner/script/scene/nr01.cpp @@ -47,7 +47,7 @@ void SceneScriptNR01::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 201, 320, 276, 357, 2); } Scene_Exit_Add_2D_Exit(2, 583, 262, 639, 365, 1); - if (Game_Flag_Query(kFlagSpinnerToNR01)) { + if (Game_Flag_Query(kFlagSpinnerAtNR01)) { Scene_Exit_Add_2D_Exit(3, 320, 445, 639, 479, 2); } Ambient_Sounds_Add_Looping_Sound(54, 50, 0, 1); @@ -68,14 +68,14 @@ void SceneScriptNR01::InitializeScene() { Ambient_Sounds_Add_Sound(376, 10, 80, 33, 33, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 10, 80, 33, 33, 0, 0, -101, -101, 0, 0); if (Game_Flag_Query(643) && Actor_Query_Goal_Number(kActorSteele) == 230) { - Game_Flag_Reset(kFlagSpinnerToNR01); - Game_Flag_Reset(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtNR01); + Game_Flag_Reset(kFlagSpinnerAtHF01); } - if (Game_Flag_Query(kFlagSpinnerToNR01) && !Game_Flag_Query(kFlagArrivedFromSpinner)) { + if (Game_Flag_Query(kFlagSpinnerAtNR01) && !Game_Flag_Query(kFlagArrivedFromSpinner)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); Game_Flag_Set(kFlagArrivedFromSpinner); - } else if (Game_Flag_Query(kFlagSpinnerToNR01) && Game_Flag_Query(kFlagArrivedFromSpinner)) { + } else if (Game_Flag_Query(kFlagSpinnerAtNR01) && Game_Flag_Query(kFlagArrivedFromSpinner)) { Scene_Loop_Set_Default(1); } else { Scene_Loop_Set_Default(4); @@ -154,72 +154,72 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { switch (Spinner_Interface_Choose_Dest(-1, 1)) { case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToNR01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtNR01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 3, 1); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 3, 1); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 3, 1); break; case 5: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 3, 1); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 3, 1); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 3, 1); break; case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 3, 1); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 3, 1); break; case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); break; diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp index 08ee6c77c7..013b6021d9 100644 --- a/engines/bladerunner/script/scene/ps01.cpp +++ b/engines/bladerunner/script/scene/ps01.cpp @@ -27,7 +27,7 @@ namespace BladeRunner { void SceneScriptPS01::InitializeScene() { Setup_Scene_Information(1872.0f, 16592.0f, -2975.0f, 200); Scene_Exit_Add_2D_Exit(0, 36, 194, 138, 326, 0); - if (Game_Flag_Query(kFlagSpinnerToPS01)) { + if (Game_Flag_Query(kFlagSpinnerAtPS01)) { Scene_Exit_Add_2D_Exit(1, 344, 288, 584, 384, 2); } Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); @@ -37,7 +37,7 @@ void SceneScriptPS01::InitializeScene() { Ambient_Sounds_Add_Sound(376, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0); if (Game_Flag_Query(kFlagPS02toPS01)) { - if (Game_Flag_Query(kFlagSpinnerToPS01)) { + if (Game_Flag_Query(kFlagSpinnerAtPS01)) { Scene_Loop_Set_Default(1); } else { Scene_Loop_Set_Default(5); @@ -53,7 +53,7 @@ void SceneScriptPS01::InitializeScene() { void SceneScriptPS01::SceneLoaded() { Obstacle_Object("TUBE81", true); - if (Game_Flag_Query(kFlagSpinnerToPS01)) { + if (Game_Flag_Query(kFlagSpinnerAtPS01)) { Unobstacle_Object("Barrier Obstacle", true); } Unobstacle_Object("BOX38", true); @@ -99,64 +99,64 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) { switch (spinnerDest) { case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 4, 1); break; case 5: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 4, 1); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToPS01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtPS01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 4, 1); break; diff --git a/engines/bladerunner/script/scene/ps03.cpp b/engines/bladerunner/script/scene/ps03.cpp index a5a42eda22..ea6f8d7de8 100644 --- a/engines/bladerunner/script/scene/ps03.cpp +++ b/engines/bladerunner/script/scene/ps03.cpp @@ -25,10 +25,10 @@ namespace BladeRunner { void SceneScriptPS03::InitializeScene() { - if (Game_Flag_Query(39)) { + if (Game_Flag_Query(kFlagPS04toPS03)) { Actor_Set_At_XYZ(kActorMcCoy, -674.0f, -354.0f, 550.0f, 900); Setup_Scene_Information(-674.0f, -354.62f, 550.0f, 900); - Game_Flag_Reset(39); + Game_Flag_Reset(kFlagPS04toPS03); } else if (Game_Flag_Query(135)) { Setup_Scene_Information(-875.0f, -354.62f, -1241.0f, 450); Game_Flag_Reset(135); @@ -76,10 +76,10 @@ bool SceneScriptPS03::ClickedOnItem(int itemId, bool a2) { bool SceneScriptPS03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -674.0f, -354.0f, 550.0f, 0, 1, false, 0)) { - Game_Flag_Set(42); + Game_Flag_Set(kFlagPS03toPS04); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(64, kScenePS04); + Set_Enter(kSetPS04, kScenePS04); } return true; } @@ -87,7 +87,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -569.54f, -354.62f, -1076.15f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(62, kScenePS02); + Set_Enter(kSetPS02, kScenePS02); Game_Flag_Reset(478); if (Global_Variable_Query(kVariableChapter) < 4) { Actor_Set_Goal_Number(kActorGuzza, 100); @@ -100,7 +100,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) { Game_Flag_Set(134); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(68, kScenePS14); + Set_Enter(kSetPS14, kScenePS14); } return true; } diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp index 86f40f39b7..394e006575 100644 --- a/engines/bladerunner/script/scene/ps04.cpp +++ b/engines/bladerunner/script/scene/ps04.cpp @@ -26,8 +26,8 @@ namespace BladeRunner { void SceneScriptPS04::InitializeScene() { AI_Movement_Track_Pause(kActorGuzza); - if (Game_Flag_Query(42)) { - Game_Flag_Reset(42); + if (Game_Flag_Query(kFlagPS03toPS04)) { + Game_Flag_Reset(kFlagPS03toPS04); } Setup_Scene_Information(-668.0f, -354.0f, 974.0f, 475); if (Global_Variable_Query(kVariableChapter) == 1) { @@ -74,7 +74,7 @@ bool SceneScriptPS04::ClickedOn3DObject(const char *objectName, bool a2) { } bool SceneScriptPS04::ClickedOnActor(int actorId) { - if (actorId == 4) { + if (actorId == kActorGuzza) { if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorGuzza, 36, 1, false)) { Actor_Face_Actor(kActorMcCoy, kActorGuzza, true); Actor_Face_Actor(kActorGuzza, kActorMcCoy, true); @@ -100,10 +100,10 @@ bool SceneScriptPS04::ClickedOnItem(int itemId, bool a2) { bool SceneScriptPS04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -668.0f, -350.85f, 962.0f, 0, 1, false, 0)) { - Game_Flag_Set(39); + Game_Flag_Set(kFlagPS04toPS03); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(63, kScenePS03); + Set_Enter(kSetPS03, kScenePS03); } return true; } @@ -145,7 +145,7 @@ void SceneScriptPS04::sub_4017E4() { DM_Add_To_List_Never_Repeat_Once_Selected(150, 7, 6, 5); } } - if (Game_Flag_Query(kFlagHomelessShot)) { + if (Game_Flag_Query(kFlagMcCoyKilledHomeless)) { DM_Add_To_List_Never_Repeat_Once_Selected(140, 3, -1, -1); } DM_Add_To_List(130, 1, 1, 1); @@ -197,7 +197,14 @@ void SceneScriptPS04::sub_4017E4() { Actor_Says(kActorGuzza, 310, 33); Actor_Says(kActorGuzza, 320, 34); Game_Flag_Set(kFlagGuzzaTalkZubenEscaped); - } else if ((Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) && Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) && Actor_Query_Friendliness_To_Other(kActorGuzza, kActorMcCoy) < 50 && !Game_Flag_Query(161)) { + } else if ( + ( Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) + || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) + ) + && Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) + && Actor_Query_Friendliness_To_Other(kActorGuzza, kActorMcCoy) < 50 + && !Game_Flag_Query(161) + ) { Actor_Says(kActorMcCoy, 3970, 18); Actor_Says(kActorGuzza, 330, 30); Actor_Says(kActorGuzza, 340, 32); @@ -212,9 +219,13 @@ void SceneScriptPS04::sub_4017E4() { Actor_Says(kActorGuzza, 400, 34); Actor_Says(kActorGuzza, 410, 31); Game_Flag_Set(161); - } else if ((Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) - && Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) - && !Game_Flag_Query(162)) { + } else if ( + ( Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) + || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) + ) + && Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) + && !Game_Flag_Query(162) + ) { Actor_Says(kActorMcCoy, 3920, 13); Actor_Says(kActorGuzza, 570, 32); Actor_Says(kActorMcCoy, 4070, 13); diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp index 64439c01af..91fda95aa2 100644 --- a/engines/bladerunner/script/scene/ps05.cpp +++ b/engines/bladerunner/script/scene/ps05.cpp @@ -174,7 +174,7 @@ void SceneScriptPS05::selectNextTvNews() { if (Global_Variable_Query(kVariableChapter) >= 2 && Global_Variable_Query(kVariableChapter) <= 4) { arr[i++] = 3; } - if (Game_Flag_Query(171) && Game_Flag_Query(170)) { + if (Game_Flag_Query(kFlagHomelessBodyFound) && Game_Flag_Query(kFlagHomelessBodyInDumpster)) { arr[i++] = 4; } Global_Variable_Set(kVariableNextTvNews, arr[Random_Query(0, i - 1)]); diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp index 3957ee1c7d..c9da4892d0 100644 --- a/engines/bladerunner/script/scene/ps10.cpp +++ b/engines/bladerunner/script/scene/ps10.cpp @@ -319,7 +319,7 @@ static const int *getPoliceMazePS10TrackData9() { void SceneScriptPS10::InitializeScene() { Police_Maze_Set_Pause_State(true); - if (Game_Flag_Query(15)) { + if (Game_Flag_Query(kFlagPS11toPS10)) { float x = World_Waypoint_Query_X(4); float y = World_Waypoint_Query_Y(4); float z = World_Waypoint_Query_Z(4); @@ -469,7 +469,7 @@ bool SceneScriptPS10::ClickedOnItem(int itemId, bool a2) { bool SceneScriptPS10::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 6, 12, true, false)) { - Game_Flag_Set(14); + Game_Flag_Set(kFlagPS10toPS11); removeTargets(); Global_Variable_Decrement(kVariablePoliceMazeScore, kPoliceMazePS10TargetCount - Global_Variable_Query(kVariablePoliceMazePS10TargetCounter)); Global_Variable_Set(kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount); @@ -492,10 +492,10 @@ void SceneScriptPS10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptPS10::PlayerWalkedIn() { - if (Game_Flag_Query(15)) { + if (Game_Flag_Query(kFlagPS11toPS10)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -352.09f, -9.23f, 267.95f, 0, false, true, 0); Police_Maze_Set_Pause_State(false); - Game_Flag_Reset(15); + Game_Flag_Reset(kFlagPS11toPS10); //return true; return; } else { diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp index e6311b3ca1..01ed9874c3 100644 --- a/engines/bladerunner/script/scene/ps11.cpp +++ b/engines/bladerunner/script/scene/ps11.cpp @@ -25,10 +25,10 @@ namespace BladeRunner { void SceneScriptPS11::InitializeScene() { - if (Game_Flag_Query(14)) { + if (Game_Flag_Query(kFlagPS10toPS11)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); - Game_Flag_Reset(14); + Game_Flag_Reset(kFlagPS10toPS11); Setup_Scene_Information(World_Waypoint_Query_X(6), World_Waypoint_Query_Y(6), World_Waypoint_Query_Z(6), 840); } else { Scene_Loop_Set_Default(1); @@ -224,19 +224,19 @@ bool SceneScriptPS11::ClickedOnItem(int itemId, bool a2) { bool SceneScriptPS11::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 6, 12, 1, false)) { - Game_Flag_Set(15); + Game_Flag_Set(kFlagPS11toPS10); sub_402744(); - Set_Enter(14, kScenePS10); + Set_Enter(kSetPS10_PS11_PS12_PS13, kScenePS10); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 8, 12, 1, false)) { - Game_Flag_Set(16); + Game_Flag_Set(kFlagPS11toPS12); sub_402744(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(11)); Global_Variable_Set(11, 20); - Set_Enter(14, kScenePS12); + Set_Enter(kSetPS10_PS11_PS12_PS13, kScenePS12); } return true; } diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp index d4d771a94f..7a13d1417d 100644 --- a/engines/bladerunner/script/scene/ps12.cpp +++ b/engines/bladerunner/script/scene/ps12.cpp @@ -26,7 +26,7 @@ namespace BladeRunner { void SceneScriptPS12::InitializeScene() { Police_Maze_Set_Pause_State(true); - if (Game_Flag_Query(16)) { + if (Game_Flag_Query(kFlagPS11toPS12)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); Setup_Scene_Information(World_Waypoint_Query_X(8), World_Waypoint_Query_Y(8), World_Waypoint_Query_Z(8), 512); @@ -233,9 +233,9 @@ bool SceneScriptPS12::ClickedOnItem(int itemId, bool a2) { bool SceneScriptPS12::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 8, 12, 1, false)) { - Game_Flag_Set(17); + Game_Flag_Set(kFlagPS12toPS11); sub_4028C4(); - Set_Enter(14, kScenePS11); + Set_Enter(kSetPS10_PS11_PS12_PS13, kScenePS11); } return true; } @@ -244,11 +244,11 @@ bool SceneScriptPS12::ClickedOnExit(int exitId) { Player_Loses_Control(); Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 10, 12, 0, false); Player_Gains_Control(); - Game_Flag_Set(18); + Game_Flag_Set(kFlagPS12toPS13); sub_4028C4(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(12)); Global_Variable_Set(12, 20); - Set_Enter(14, kScenePS13); + Set_Enter(kSetPS10_PS11_PS12_PS13, kScenePS13); } return true; } @@ -266,9 +266,9 @@ void SceneScriptPS12::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptPS12::PlayerWalkedIn() { - if (Game_Flag_Query(16)) { + if (Game_Flag_Query(kFlagPS11toPS12)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -546.0f, -9.06f, 570.0f, 0, 1, false, 0); - Game_Flag_Reset(16); + Game_Flag_Reset(kFlagPS11toPS12); } Police_Maze_Set_Pause_State(false); } diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp index f525d48137..fc6a9c1736 100644 --- a/engines/bladerunner/script/scene/ps13.cpp +++ b/engines/bladerunner/script/scene/ps13.cpp @@ -26,10 +26,10 @@ namespace BladeRunner { void SceneScriptPS13::InitializeScene() { Police_Maze_Set_Pause_State(true); - if (Game_Flag_Query(18)) { + if (Game_Flag_Query(kFlagPS12toPS13)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); - Game_Flag_Reset(18); + Game_Flag_Reset(kFlagPS12toPS13); Setup_Scene_Information(World_Waypoint_Query_X(10), World_Waypoint_Query_Y(10), World_Waypoint_Query_Z(10), 200); } else { Scene_Loop_Set_Default(1); diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp index c521960d29..9aeeb3fc38 100644 --- a/engines/bladerunner/script/scene/ps15.cpp +++ b/engines/bladerunner/script/scene/ps15.cpp @@ -138,7 +138,7 @@ void SceneScriptPS15::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptPS15::PlayerWalkedIn() { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -326.93f, -113.43f, 101.42f, 0, 0, false, 0); - if (!Game_Flag_Query(43)) { + if (!Game_Flag_Query(kFlagPS15Entered)) { Actor_Face_Actor(kActorMcCoy, kActorSergeantWalls, true); Actor_Face_Actor(kActorSergeantWalls, kActorMcCoy, true); Actor_Says(kActorSergeantWalls, 0, 12); @@ -155,7 +155,7 @@ void SceneScriptPS15::PlayerWalkedIn() { Actor_Says(kActorSergeantWalls, 110, 15); Actor_Says(kActorSergeantWalls, 120, 15); Actor_Says(kActorMcCoy, 4555, 14); - Game_Flag_Set(43); + Game_Flag_Set(kFlagPS15Entered); //return true; return; } else { diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp index b217d030f9..1239967c53 100644 --- a/engines/bladerunner/script/scene/rc01.cpp +++ b/engines/bladerunner/script/scene/rc01.cpp @@ -54,7 +54,7 @@ void SceneScriptRC01::InitializeScene() { // Game_Flag_Set(kFlagRC01PoliceDone); // Game_Flag_Set(kFlagKIAPrivacyAddon); // Game_Flag_Set(kFlagZubenRetired); - // Game_Flag_Set(kFlagSpinnerToMA01); + // Game_Flag_Set(kFlagSpinnerAtMA01); // Set_Enter(kSetMA02_MA04, kSceneMA04); Spinner_Set_Selectable_Destination_Flag(0, true); @@ -94,7 +94,7 @@ void SceneScriptRC01::InitializeScene() { Setup_Scene_Information(-10.98f, -0.30f, 318.15f, 616); } Scene_Exit_Add_2D_Exit(kRC01ExitRC02, 314, 145, 340, 255, 0); - if (Game_Flag_Query(kFlagSpinnerToRC01)) { + if (Game_Flag_Query(kFlagSpinnerAtRC01)) { Scene_Exit_Add_2D_Exit(kRC01ExitSpinner, 482, 226, 639, 280, 2); } if (Global_Variable_Query(kVariableChapter) > 1 && Game_Flag_Query(710)) { @@ -135,7 +135,7 @@ void SceneScriptRC01::InitializeScene() { if (!Game_Flag_Query(kFlagRC02toRC01) && !Game_Flag_Query(kFlagRC03toRC01)) { Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kRC01LoopInshotNoCrowd, false); } - if (Game_Flag_Query(kFlagSpinnerToRC01)) { + if (Game_Flag_Query(kFlagSpinnerAtRC01)) { Scene_Loop_Set_Default(kRC01LoopNoCrowd); } else { Scene_Loop_Set_Default(kRC01LoopNoCrowdNoSpinner); @@ -248,14 +248,15 @@ bool SceneScriptRC01::MouseClick(int x, int y) { bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) { if (Object_Query_Click("BARICADE01", objectName) - || Object_Query_Click("BARICADE03", objectName) - || Object_Query_Click("BARICADE04", objectName) - || Object_Query_Click("70_1", objectName) - || Object_Query_Click("70_2", objectName) - || Object_Query_Click("70_3", objectName) - || Object_Query_Click("70_5", objectName) - || Object_Query_Click("70_6", objectName)) { - investigateCrowd(); + || Object_Query_Click("BARICADE03", objectName) + || Object_Query_Click("BARICADE04", objectName) + || Object_Query_Click("70_1", objectName) + || Object_Query_Click("70_2", objectName) + || Object_Query_Click("70_3", objectName) + || Object_Query_Click("70_5", objectName) + || Object_Query_Click("70_6", objectName) + ) { + interrogateCrowd(); return true; } @@ -278,7 +279,7 @@ bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) { if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "DOOR LEFT", 48, true, false)) { Actor_Face_Object(kActorMcCoy, "DOOR LEFT", true); if (!Actor_Clue_Query(kActorMcCoy, kClueDoorForced2) && Actor_Query_In_Set(kActorOfficerLeary, kSetRC01) && Global_Variable_Query(kVariableChapter) > 0) { - Actor_Set_Goal_Number(kActorOfficerLeary, 0); + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault); Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); Actor_Says(kActorOfficerLeary, 0, 12); Actor_Says(kActorMcCoy, 4495, 13); @@ -308,8 +309,8 @@ bool SceneScriptRC01::ClickedOnActor(int actorId) { if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorOfficerLeary, 36, true, false)) { Actor_Face_Actor(kActorMcCoy, kActorOfficerLeary, true); Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); - if (Actor_Query_Goal_Number(kActorOfficerLeary) == 1) { - Actor_Set_Goal_Number(kActorOfficerLeary, 0); + if (Actor_Query_Goal_Number(kActorOfficerLeary) == kGoalOfficerLearyCrowdInterrogation) { + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault); } if (Game_Flag_Query(kFlagGotOfficersStatement)) { Actor_Says(kActorMcCoy, 4535, 13); @@ -366,7 +367,7 @@ bool SceneScriptRC01::ClickedOnActor(int actorId) { bool SceneScriptRC01::ClickedOnItem(int itemId, bool a2) { if (itemId == kItemChromeDebris) { - Actor_Set_Goal_Number(kActorOfficerLeary, 0); + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault); if (!Loop_Actor_Walk_To_Item(kActorMcCoy, kItemChromeDebris, 36, true, false)) { Actor_Face_Item(kActorMcCoy, kItemChromeDebris, true); Actor_Clue_Acquire(kActorMcCoy, kClueChromeDebris, true, -1); @@ -456,8 +457,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { switch (spinnerDest) { case kSpinnerDestinationPoliceStation: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(kSetPS01, kScenePS01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -467,8 +468,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationMcCoysApartment: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(kSetMA01, kSceneMA01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -478,8 +479,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationChinatown: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(kSetCT01_CT12, kSceneCT01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -489,8 +490,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationTyrellBuilding: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(kSetTB02_TB03, kSceneTB02); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -500,8 +501,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationAnimoidRow: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(kSetAR01_AR02, kSceneAR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -511,8 +512,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationDNARow: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(kSetDR01_DR02_DR04, kSceneDR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -522,8 +523,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationBradburyBuilding: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(kSetBB01, kSceneBB01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -533,8 +534,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationNightclubRow: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(kSetNR01, kSceneNR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -544,8 +545,8 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { break; case kSpinnerDestinationHysteriaHall: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToRC01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtRC01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(kSetHF01, kSceneHF01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kRC01LoopOutshotNoCrowd, true); @@ -572,22 +573,24 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { return false; } -void SceneScriptRC01::investigateCrowd() { - if (!Game_Flag_Query(kFlagRC01PoliceDone) && !Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BARICADE03", 36, true, false)) { - Actor_Set_Goal_Number(kActorOfficerLeary, 0); - Actor_Face_Object(kActorMcCoy, "BARICADE03", true); - Loop_Actor_Walk_To_Actor(kActorOfficerLeary, kActorMcCoy, 36, true, false); - Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); - Actor_Says(kActorMcCoy, 4500, 14); - I_Sez("MG: We don't want any of that abstract art oozing out onto the street."); - Actor_Says(kActorOfficerLeary, 10, 14); - Actor_Set_Goal_Number(kActorOfficerLeary, 1); +void SceneScriptRC01::interrogateCrowd() { + if (!Game_Flag_Query(kFlagRC01PoliceDone)) { + if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BARICADE03", 36, true, false)) { + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault); + Actor_Face_Object(kActorMcCoy, "BARICADE03", true); + Loop_Actor_Walk_To_Actor(kActorOfficerLeary, kActorMcCoy, 36, true, false); + Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); + Actor_Says(kActorMcCoy, 4500, 14); + I_Sez("MG: We don't want any of that abstract art oozing out onto the street."); + Actor_Says(kActorOfficerLeary, 10, 14); + Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyCrowdInterrogation); + } } } bool SceneScriptRC01::ClickedOn2DRegion(int region) { if (region == kRC01RegionCrowd) { - investigateCrowd(); + interrogateCrowd(); return true; } return false; @@ -621,7 +624,7 @@ void SceneScriptRC01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptRC01::PlayerWalkedIn() { - if (Game_Flag_Query(kFlagSpinnerToRC01) && !Game_Flag_Query(kFlagRC02toRC01) && !Game_Flag_Query(kFlagRC03toRC01)) { + if (Game_Flag_Query(kFlagSpinnerAtRC01) && !Game_Flag_Query(kFlagRC02toRC01) && !Game_Flag_Query(kFlagRC03toRC01)) { walkToCenter(); } diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 9305b797f4..5200c1e6ec 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -96,8 +96,12 @@ bool SceneScriptRC02::MouseClick(int x, int y) { } bool SceneScriptRC02::ClickedOn3DObject(const char *objectName, bool a2) { - if (Object_Query_Click("SCRTY CA03", objectName) && !Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo)) { - if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) && Actor_Query_Is_In_Current_Set(kActorRunciter)) { + if ( Object_Query_Click("SCRTY CA03", objectName) + && !Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo) + ) { + if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) + && Actor_Query_Is_In_Current_Set(kActorRunciter) + ) { AI_Movement_Track_Pause(kActorRunciter); Actor_Face_Actor(kActorMcCoy, kActorRunciter, true); Actor_Says(kActorMcCoy, 4545, 14); @@ -136,7 +140,9 @@ void SceneScriptRC02::dialogueWithRunciter() { Dialogue_Menu_Clear_List(); DM_Add_To_List_Never_Repeat_Once_Selected(0, 5, 6, 2); DM_Add_To_List_Never_Repeat_Once_Selected(10, 5, 4, 8); - if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB1) || (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB2))) { + if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB1) + || Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB2) + ) { DM_Add_To_List_Never_Repeat_Once_Selected(20, 6, 4, 5); } Dialogue_Menu_Add_DONE_To_List(30); @@ -152,7 +158,7 @@ void SceneScriptRC02::dialogueWithRunciter() { Actor_Says(kActorRunciter, 130, 19); Actor_Says(kActorMcCoy, 4605, 13); Actor_Says(kActorRunciter, 140, 16); - Game_Flag_Set(187); + Game_Flag_Set(kFlagRC02TalkedToRunciter); break; case 10: Actor_Says(kActorMcCoy, 4585, 13); @@ -248,7 +254,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { AI_Movement_Track_Pause(kActorRunciter); Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorRunciter, 48, 1, false); Actor_Face_Actor(kActorMcCoy, kActorRunciter, true); - if (!Game_Flag_Query(6)) { + if (!Game_Flag_Query(kFlagRunciterInterviewA)) { Actor_Says(kActorMcCoy, 4560, 13); Actor_Face_Actor(kActorRunciter, kActorMcCoy, true); Actor_Says(kActorRunciter, 40, 16); @@ -257,13 +263,13 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { Actor_Says(kActorRunciter, 60, 14); Actor_Says(kActorMcCoy, 4570, 18); Actor_Says(kActorRunciter, 70, 13); - Game_Flag_Set(6); + Game_Flag_Set(kFlagRunciterInterviewA); Actor_Clue_Acquire(kActorMcCoy, kClueRunciterInterviewA, 1, kActorRunciter); AI_Movement_Track_Unpause(kActorRunciter); return true; } - if (Game_Flag_Query(187)) { - if (Player_Query_Agenda() == 0) { + if (Game_Flag_Query(kFlagRC02TalkedToRunciter)) { + if (Player_Query_Agenda() == kPlayerAgendaPolite) { Game_Flag_Reset(0); dialogueWithRunciter(); AI_Movement_Track_Unpause(kActorRunciter); @@ -278,7 +284,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { Actor_Says(kActorRunciter, 170, 15); Actor_Says(kActorRunciter, 180, 13); - if (Player_Query_Agenda() == 2) { + if (Player_Query_Agenda() == kPlayerAgendaSurly) { Actor_Says(kActorMcCoy, 4620, 19); Actor_Says(kActorRunciter, 190, 14); Actor_Says(kActorMcCoy, 4625, 13); @@ -290,7 +296,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { Actor_Says(kActorRunciter, 240, 16); Actor_Says(kActorMcCoy, 4640, 17); } - Game_Flag_Reset(187); + Game_Flag_Reset(kFlagRC02TalkedToRunciter); AI_Movement_Track_Unpause(kActorRunciter); return true; } diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp index e4e81fc336..9581f72c42 100644 --- a/engines/bladerunner/script/scene/rc03.cpp +++ b/engines/bladerunner/script/scene/rc03.cpp @@ -30,23 +30,23 @@ void SceneScriptRC03::InitializeScene() { if (Game_Flag_Query(kFlagRC01toRC03)) { Setup_Scene_Information(298.0f, -4.0f, 405.0f, 800); Game_Flag_Reset(kFlagRC01toRC03); - } else if (Game_Flag_Query(117) ) { + } else if (Game_Flag_Query(kFlagAR02toRC03)) { Setup_Scene_Information(-469.0f, -4.0f, 279.0f, 250); - } else if (Game_Flag_Query(119) ) { + } else if (Game_Flag_Query(kFlagUG01toRC03)) { Setup_Scene_Information(147.51f, -4.0f, 166.48f, 500); - if (!Game_Flag_Query(151)) { - Game_Flag_Set(151); + if (!Game_Flag_Query(kFlagRC03UnlockedToUG01)) { + Game_Flag_Set(kFlagRC03UnlockedToUG01); } - } else if (Game_Flag_Query(107) ) { + } else if (Game_Flag_Query(kFlagHC04toRC03)) { Setup_Scene_Information(-487.0f, 1.0f, 116.0f, 400); - } else if (Game_Flag_Query(121) ) { + } else if (Game_Flag_Query(kFlagRC04toRC03)) { Setup_Scene_Information(-22.0f, 1.0f, -63.0f, 400); } else { Setup_Scene_Information(0.0f, 0.0f, 0.0f, 0); } Scene_Exit_Add_2D_Exit(0, 610, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); - if (Game_Flag_Query(151) ) { + if (Game_Flag_Query(kFlagRC03UnlockedToUG01)) { Scene_Exit_Add_2D_Exit(2, 524, 350, 573, 359, 2); } Scene_Exit_Add_2D_Exit(3, 85, 255, 112, 315, 0); @@ -78,7 +78,7 @@ void SceneScriptRC03::InitializeScene() { Ambient_Sounds_Add_Sound(193, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(194, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(195, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); - if (Game_Flag_Query(107) && Actor_Query_Goal_Number(kActorIzo) != 102) { + if (Game_Flag_Query(kFlagHC04toRC03) && Actor_Query_Goal_Number(kActorIzo) != 102) { Scene_Loop_Start_Special(kSceneLoopModeLoseControl, 0, false); } Scene_Loop_Set_Default(1); @@ -153,7 +153,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { if (Game_Flag_Query(289)) { Game_Flag_Set(702); } - Game_Flag_Set(116); + Game_Flag_Set(kFlagRC03toAR02); Game_Flag_Reset(182); Game_Flag_Set(180); Set_Enter(kSetAR01_AR02, kSceneAR02); @@ -162,7 +162,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 147.51f, -4.0f, 166.48f, 0, 1, false, 0)) { - Game_Flag_Set(118); + Game_Flag_Set(kFlagRC03toUG01); Game_Flag_Reset(182); Game_Flag_Set(259); if (Game_Flag_Query(289)) { @@ -175,7 +175,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { } if (exitId == 3) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -487.0f, 1.0f, 116.0f, 0, 1, false, 0)) { - Game_Flag_Set(108); + Game_Flag_Set(kFlagRC03toHC04); Game_Flag_Reset(182); Game_Flag_Set(479); if (Game_Flag_Query(289)) { @@ -191,7 +191,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { if (Global_Variable_Query(kVariableChapter) == 3 || Global_Variable_Query(kVariableChapter) == 5 || Game_Flag_Query(702)) { Actor_Says(kActorMcCoy, 8522, 14); } else { - Game_Flag_Set(120); + Game_Flag_Set(kFlagRC03toRC04); Set_Enter(kSetRC04, kSceneRC04); } } @@ -237,7 +237,7 @@ void SceneScriptRC03::sub_402834() { void SceneScriptRC03::PlayerWalkedIn() { if (Actor_Query_Goal_Number(kActorIzo) == 102) { Scene_Exits_Disable(); - if (Game_Flag_Query(119) ) { + if (Game_Flag_Query(kFlagUG01toRC03) ) { Player_Set_Combat_Mode(false); Player_Loses_Control(); Actor_Set_At_XYZ(kActorMcCoy, 147.51f, -4.0f, 166.48f, 500); @@ -270,7 +270,9 @@ void SceneScriptRC03::PlayerWalkedIn() { Player_Loses_Control(); Actor_Set_Goal_Number(kActorSteele, 200); Actor_Put_In_Set(kActorSteele, 70); - if (Game_Flag_Query(119) || Game_Flag_Query(121) ) { + if (Game_Flag_Query(kFlagUG01toRC03) + || Game_Flag_Query(kFlagRC04toRC03) + ) { Actor_Set_At_Waypoint(kActorSteele, 175, 0); } else { Actor_Set_At_Waypoint(kActorSteele, 203, 0); @@ -280,11 +282,13 @@ void SceneScriptRC03::PlayerWalkedIn() { Actor_Set_Goal_Number(kActorIzo, 200); Player_Gains_Control(); } - Game_Flag_Reset(119); - Game_Flag_Reset(117); - Game_Flag_Reset(107); - Game_Flag_Reset(121); - if (Global_Variable_Query(kVariableChapter) == 1 || Global_Variable_Query(kVariableChapter) == 2) { + Game_Flag_Reset(kFlagUG01toRC03); + Game_Flag_Reset(kFlagAR02toRC03); + Game_Flag_Reset(kFlagHC04toRC03); + Game_Flag_Reset(kFlagRC04toRC03); + if (Global_Variable_Query(kVariableChapter) == 1 + || Global_Variable_Query(kVariableChapter) == 2 + ) { Actor_Set_Goal_Number(kActorDektora, 103); } } diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp index c0fe729935..6aa15f698e 100644 --- a/engines/bladerunner/script/scene/rc04.cpp +++ b/engines/bladerunner/script/scene/rc04.cpp @@ -26,7 +26,7 @@ namespace BladeRunner { void SceneScriptRC04::InitializeScene() { Setup_Scene_Information(45.0f, 0.15f, 68.0f, 1018); - Game_Flag_Reset(120); + Game_Flag_Reset(kFlagRC03toRC04); Scene_Exit_Add_2D_Exit(0, 225, 47, 359, 248, 0); if (!Game_Flag_Query(289)) { Actor_Put_In_Set(kActorBulletBob, 71); @@ -371,8 +371,8 @@ bool SceneScriptRC04::ClickedOnItem(int itemId, bool a2) { bool SceneScriptRC04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 45.0f, 0.15f, 68.0f, 0, 1, false, 0)) { - Game_Flag_Set(121); - Set_Enter(70, kSceneRC03); + Game_Flag_Set(kFlagRC04toRC03); + Set_Enter(kSetRC03, kSceneRC03); } return true; } diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp index 1d305912cf..5e4cf0f0db 100644 --- a/engines/bladerunner/script/scene/tb02.cpp +++ b/engines/bladerunner/script/scene/tb02.cpp @@ -25,9 +25,9 @@ namespace BladeRunner { void SceneScriptTB02::InitializeScene() { - if (Game_Flag_Query(155)) { + if (Game_Flag_Query(kFlagTB03toTB02)) { Setup_Scene_Information(-152.0f, 0.0f, 1774.0f, 999); - } else if (Game_Flag_Query(95)) { + } else if (Game_Flag_Query(kFlagTB05toTB02)) { Setup_Scene_Information(-32.0f, 0.0f, 1578.0f, 639); } else if (Game_Flag_Query(608)) { Setup_Scene_Information(-32.0f, 0.0f, 1578.0f, 639); @@ -63,10 +63,10 @@ void SceneScriptTB02::InitializeScene() { Ambient_Sounds_Add_Sound(194, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(195, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); } - if (Game_Flag_Query(kFlagSpinnerToTB02) && Global_Variable_Query(kVariableChapter) < 4) { + if (Game_Flag_Query(kFlagSpinnerAtTB02) && Global_Variable_Query(kVariableChapter) < 4) { Scene_Exit_Add_2D_Exit(2, 67, 0, 233, 362, 3); } - if (Game_Flag_Query(155)) { + if (Game_Flag_Query(kFlagTB03toTB02)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); } else { @@ -156,9 +156,9 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(154); + Game_Flag_Set(kFlagTB02toTB03); Game_Flag_Reset(450); - Set_Enter(17, kSceneTB03); + Set_Enter(kSetTB02_TB03, kSceneTB03); Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1890.0f, 0, false); } return true; @@ -169,10 +169,10 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); if (Global_Variable_Query(kVariableChapter) < 4) { Game_Flag_Set(451); - Game_Flag_Set(96); - Set_Enter(72, kSceneTB05); + Game_Flag_Set(kFlagTB02toTB05); + Set_Enter(kSetTB05, kSceneTB05); } else { - Set_Enter(18, kSceneTB07); + Set_Enter(kSetTB07, kSceneTB07); } } return true; @@ -195,56 +195,56 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { switch (Spinner_Interface_Choose_Dest(-1, 0)) { case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); break; case 8: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(54, kSceneNR01); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); break; case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); break; default: @@ -274,11 +274,11 @@ void SceneScriptTB02::PlayerWalkedIn() { //return true; return; } - if (Game_Flag_Query(155)) { + if (Game_Flag_Query(kFlagTB03toTB02)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1702.0f, 0, false); - Game_Flag_Reset(155); - } else if (Game_Flag_Query(95)) { - Game_Flag_Reset(95); + Game_Flag_Reset(kFlagTB03toTB02); + } else if (Game_Flag_Query(kFlagTB05toTB02)) { + Game_Flag_Reset(kFlagTB05toTB02); } else if (Game_Flag_Query(608)) { Game_Flag_Reset(608); if (Actor_Query_Goal_Number(kActorTyrellGuard) == 300) { diff --git a/engines/bladerunner/script/scene/tb03.cpp b/engines/bladerunner/script/scene/tb03.cpp index 274ea10cfa..611c76e225 100644 --- a/engines/bladerunner/script/scene/tb03.cpp +++ b/engines/bladerunner/script/scene/tb03.cpp @@ -116,8 +116,8 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(155); - Set_Enter(17, kSceneTB02); + Game_Flag_Set(kFlagTB03toTB02); + Set_Enter(kSetTB02_TB03, kSceneTB02); Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1702.0f, 0, false); } return true; diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp index a7797414d6..0489b34399 100644 --- a/engines/bladerunner/script/scene/tb05.cpp +++ b/engines/bladerunner/script/scene/tb05.cpp @@ -25,10 +25,10 @@ namespace BladeRunner { void SceneScriptTB05::InitializeScene() { - if (Game_Flag_Query(98)) { + if (Game_Flag_Query(kFlagTB06toTB05)) { Setup_Scene_Information(23.0f, 151.53f, -205.0f, 450); Game_Flag_Set(102); - Game_Flag_Reset(98); + Game_Flag_Reset(kFlagTB06toTB05); } else { Setup_Scene_Information(14.0f, 151.53f, -77.0f, 6); } @@ -150,16 +150,16 @@ bool SceneScriptTB05::ClickedOnItem(int itemId, bool a2) { bool SceneScriptTB05::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.0f, 151.53f, -205.0f, 12, 1, false, 0)) { - Game_Flag_Set(97); - Set_Enter(73, kSceneTB06); + Game_Flag_Set(kFlagTB05toTB06); + Set_Enter(kSetTB06, kSceneTB06); Scene_Loop_Start_Special(1, 2, 1); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 14.0f, 147.12f, 123.0f, 0, 1, false, 0)) { - Game_Flag_Set(95); - Set_Enter(17, kSceneTB02); + Game_Flag_Set(kFlagTB05toTB02); + Set_Enter(kSetTB02_TB03, kSceneTB02); } return true; } diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp index 2970446ca3..e69394ccff 100644 --- a/engines/bladerunner/script/scene/tb06.cpp +++ b/engines/bladerunner/script/scene/tb06.cpp @@ -127,8 +127,8 @@ bool SceneScriptTB06::ClickedOnItem(int itemId, bool a2) { bool SceneScriptTB06::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -16.0f, 149.0f, -427.0f, 12, 1, false, 0)) { - Game_Flag_Set(98); - Set_Enter(72, kSceneTB05); + Game_Flag_Set(kFlagTB06toTB05); + Set_Enter(kSetTB05, kSceneTB05); Scene_Loop_Start_Special(1, 2, 1); } return true; diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp index b45bc1e794..9f14d4c370 100644 --- a/engines/bladerunner/script/scene/tb07.cpp +++ b/engines/bladerunner/script/scene/tb07.cpp @@ -96,56 +96,56 @@ bool SceneScriptTB07::ClickedOnExit(int exitId) { switch (Spinner_Interface_Choose_Dest(-1, 0)) { case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); break; case 8: Game_Flag_Set(181); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(54, kSceneNR01); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); break; case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToTB02); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Reset(kFlagSpinnerAtTB02); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); break; default: diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp index 138f962cfc..820821c696 100644 --- a/engines/bladerunner/script/scene/ug01.cpp +++ b/engines/bladerunner/script/scene/ug01.cpp @@ -28,7 +28,7 @@ void SceneScriptUG01::InitializeScene() { if (Game_Flag_Query(317)) { Setup_Scene_Information(34.47f, -50.13f, -924.11f, 500); Game_Flag_Reset(317); - } else if (Game_Flag_Query(118)) { + } else if (Game_Flag_Query(kFlagRC03toUG01)) { Setup_Scene_Information(-68.0f, -50.13f, -504.0f, 377); } else { Setup_Scene_Information(-126.0f, -50.13f, -286.0f, 0); @@ -101,7 +101,7 @@ bool SceneScriptUG01::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, -50.13f, -1350.0f, 12, 1, false, 0)) { Game_Flag_Set(316); - Set_Enter(83, kSceneUG10); + Set_Enter(kSetUG10, kSceneUG10); } return true; } @@ -109,17 +109,17 @@ bool SceneScriptUG01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -70.0f, -50.13f, -500.0f, 0, 1, false, 0)) { Actor_Face_Heading(kActorMcCoy, 768, false); Loop_Actor_Travel_Ladder(kActorMcCoy, 12, 1, 0); - Game_Flag_Set(119); + Game_Flag_Set(kFlagUG01toRC03); Game_Flag_Reset(259); Game_Flag_Set(182); - Set_Enter(70, kSceneRC03); + Set_Enter(kSetRC03, kSceneRC03); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -126.0f, -50.13f, -286.0f, 0, 1, false, 0)) { Game_Flag_Set(314); - Set_Enter(75, kSceneUG02); + Set_Enter(kSetUG02, kSceneUG02); } return true; } @@ -154,11 +154,11 @@ void SceneScriptUG01::PlayerWalkedIn() { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -55.0f, -50.13f, -288.0f, 12, 0, false, 0); Game_Flag_Reset(315); } - if (Game_Flag_Query(118)) { + if (Game_Flag_Query(kFlagRC03toUG01)) { Actor_Set_At_XYZ(kActorMcCoy, -70.0f, 93.87f, -500.0f, 768); Loop_Actor_Travel_Ladder(kActorMcCoy, 12, 0, 0); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -58.0f, -50.13f, -488.0f, 0, 0, false, 0); - Game_Flag_Reset(118); + Game_Flag_Reset(kFlagRC03toUG01); } if (Actor_Query_Goal_Number(kActorLucy) == 310) { Music_Play(21, 35, 0, 3, -1, 0, 0); diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp index bca6765e8f..9239881bb2 100644 --- a/engines/bladerunner/script/scene/ug10.cpp +++ b/engines/bladerunner/script/scene/ug10.cpp @@ -72,7 +72,7 @@ void SceneScriptUG10::InitializeScene() { void SceneScriptUG10::SceneLoaded() { Obstacle_Object("SLUICEGATE_LEVER", true); - if (Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(474) && Game_Flag_Query(172) && !Game_Flag_Query(693)) { + if (Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(474) && Game_Flag_Query(kFlagDumpsterEmptied) && !Game_Flag_Query(693)) { Scene_Loop_Set_Default(1); Scene_Loop_Start_Special(kSceneLoopModeOnce, 6, true); Game_Flag_Set(693); diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp index d2ae3b69d6..3a0fd02425 100644 --- a/engines/bladerunner/script/scene/ug13.cpp +++ b/engines/bladerunner/script/scene/ug13.cpp @@ -46,7 +46,7 @@ void SceneScriptUG13::InitializeScene() { Ambient_Sounds_Add_Sound(369, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(397, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(398, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); - if (Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(kFlagHomelessShot)) { + if (Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(kFlagMcCoyKilledHomeless)) { Actor_Set_Goal_Number(kActorTransient, 390); } if (Actor_Query_Goal_Number(kActorTransient) == 599) { @@ -72,7 +72,7 @@ void SceneScriptUG13::SceneLoaded() { Clickable_Object("BASKET"); Clickable_Object("BOLLARD"); Unclickable_Object("BASKET"); - if (Global_Variable_Query(kVariableChapter) >= 3 && !Actor_Clue_Query(kActorMcCoy, kClueOriginalRequisitionForm) && Game_Flag_Query(kFlagHomelessShot) && (Actor_Clue_Query(kActorMcCoy, kClueShippingForm) || Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm))) { + if (Global_Variable_Query(kVariableChapter) >= 3 && !Actor_Clue_Query(kActorMcCoy, kClueOriginalRequisitionForm) && Game_Flag_Query(kFlagMcCoyKilledHomeless) && (Actor_Clue_Query(kActorMcCoy, kClueShippingForm) || Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm))) { Item_Add_To_World(111, 958, 85, -209.01f, 70.76f, -351.79f, 0, 16, 12, false, true, false, true); } } @@ -234,7 +234,7 @@ void SceneScriptUG13::PlayerWalkedIn() { Game_Flag_Reset(429); Player_Gains_Control(); } - if (Actor_Query_Goal_Number(kActorTransient) >= 390 && !Game_Flag_Query(kFlagHomelessShot)) { + if (Actor_Query_Goal_Number(kActorTransient) >= 390 && !Game_Flag_Query(kFlagMcCoyKilledHomeless)) { if (Game_Flag_Query(553)) { if (Random_Query(1, 3) == 1) { Actor_Set_Goal_Number(kActorTransient, 395); diff --git a/engines/bladerunner/script/scene/ug14.cpp b/engines/bladerunner/script/scene/ug14.cpp index eb2e59ddfc..bb25791992 100644 --- a/engines/bladerunner/script/scene/ug14.cpp +++ b/engines/bladerunner/script/scene/ug14.cpp @@ -171,7 +171,7 @@ void SceneScriptUG14::PlayerWalkedIn() { Actor_Face_Heading(kActorMcCoy, 807, false); Game_Flag_Reset(347); } - if (Global_Variable_Query(kVariableChapter) == 4 && Game_Flag_Query(172) && !Game_Flag_Query(694)) { + if (Global_Variable_Query(kVariableChapter) == 4 && Game_Flag_Query(kFlagDumpsterEmptied) && !Game_Flag_Query(694)) { Overlay_Play("UG14OVER", 0, 0, 1, 0); Delay(1000); Actor_Face_Heading(kActorMcCoy, 609, false); diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp index 3503992457..09153094da 100644 --- a/engines/bladerunner/script/scene/ug15.cpp +++ b/engines/bladerunner/script/scene/ug15.cpp @@ -27,7 +27,7 @@ namespace BladeRunner { void SceneScriptUG15::InitializeScene() { if (Game_Flag_Query(353)) { Setup_Scene_Information(-25.0f, 26.31f, -434.0f, 520); - } else if (Game_Flag_Query(153)) { + } else if (Game_Flag_Query(kFlagUG16toUG15)) { Setup_Scene_Information(-17.0f, 26.31f, -346.0f, 711); } else if (Game_Flag_Query(355)) { Setup_Scene_Information(-18.0f, 48.07f, 62.0f, 650); @@ -40,11 +40,11 @@ void SceneScriptUG15::InitializeScene() { if (Game_Flag_Query(682)) { Scene_Loop_Set_Default(3); } - if (Game_Flag_Query(353) || Game_Flag_Query(153)) { + if (Game_Flag_Query(353) || Game_Flag_Query(kFlagUG16toUG15)) { Scene_Exit_Add_2D_Exit(0, 260, 0, 307, 298, 0); Scene_Exit_Add_2D_Exit(1, 301, 147, 337, 304, 1); Game_Flag_Reset(353); - Game_Flag_Reset(153); + Game_Flag_Reset(kFlagUG16toUG15); } else { Scene_Exit_Add_2D_Exit(2, 406, 128, 480, 316, 1); Scene_Exit_Add_2D_Exit(3, 0, 0, 30, 479, 3); @@ -116,8 +116,8 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -17.0f, 26.31f, -346.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(152); - Set_Enter(19, kSceneUG16); + Game_Flag_Set(kFlagUG15toUG16); + Set_Enter(kSetUG16, kSceneUG16); } return true; } diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp index 6e37cb6b4d..70a892c0b4 100644 --- a/engines/bladerunner/script/scene/ug16.cpp +++ b/engines/bladerunner/script/scene/ug16.cpp @@ -28,9 +28,9 @@ void SceneScriptUG16::InitializeScene() { if (Game_Flag_Query(552)) { Setup_Scene_Information(-270.76f, -34.88f, -504.02f, 404); Game_Flag_Reset(552); - } else if (Game_Flag_Query(152)) { + } else if (Game_Flag_Query(kFlagUG15toUG16)) { Setup_Scene_Information(-322.0f, -34.0f, -404.0f, 345); - Game_Flag_Reset(152); + Game_Flag_Reset(kFlagUG15toUG16); } else { Setup_Scene_Information(-318.0f, -34.0f, -216.0f, 340); Game_Flag_Reset(354); @@ -133,7 +133,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(355); - Set_Enter(87, kSceneUG15); + Set_Enter(kSetUG15, kSceneUG15); } return true; } @@ -141,8 +141,8 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -322.0f, -34.0f, -404.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(153); - Set_Enter(87, kSceneUG15); + Game_Flag_Set(kFlagUG16toUG15); + Set_Enter(kSetUG15, kSceneUG15); } return true; } diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp index 05ef4559fb..38ea0896aa 100644 --- a/engines/bladerunner/script/scene/ug18.cpp +++ b/engines/bladerunner/script/scene/ug18.cpp @@ -323,8 +323,8 @@ void SceneScriptUG18::sub_402734() { } void SceneScriptUG18::sub_402DE8() { - if (Player_Query_Agenda()) { - if (Global_Variable_Query(kVariableAffectionTowards) > 1 || Player_Query_Agenda() == 2) { + if (Player_Query_Agenda() != kPlayerAgendaPolite) { + if (Global_Variable_Query(kVariableAffectionTowards) > 1 || Player_Query_Agenda() == kPlayerAgendaSurly) { sub_403114(); } else { sub_402F8C(); diff --git a/engines/bladerunner/script/scene_script.h b/engines/bladerunner/script/scene_script.h index c6ac0fe2ef..b0b6d151ca 100644 --- a/engines/bladerunner/script/scene_script.h +++ b/engines/bladerunner/script/scene_script.h @@ -407,7 +407,7 @@ DECLARE_SCRIPT(PS15) END_SCRIPT DECLARE_SCRIPT(RC01) - void investigateCrowd(); + void interrogateCrowd(); void walkToCenter(); END_SCRIPT diff --git a/engines/bladerunner/settings.h b/engines/bladerunner/settings.h index 3c7048f02b..393c11d053 100644 --- a/engines/bladerunner/settings.h +++ b/engines/bladerunner/settings.h @@ -29,14 +29,6 @@ class BladeRunnerEngine; class SaveFileReadStream; class SaveFileWriteStream; -enum PlayerAgenda { - kPlayerAgendaPolite = 0, - kPlayerAgendaNormal = 1, - kPlayerAgendaSurly = 2, - kPlayerAgendaErratic = 3, - kPlayerAgendaUserChoice = 4 -}; - class Settings { BladeRunnerEngine *_vm; |