diff options
| author | Peter Kohaut | 2018-02-05 18:46:09 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2018-02-05 20:17:55 +0100 |
| commit | 59eeadc6ac88f19879804e88979d156eb825ee7d (patch) | |
| tree | 2510a16a99a44f49c3844b625599fff206724e5f /engines/bladerunner/script | |
| parent | 5322606abe2bdcfc85f5d90036ad09610e29ca6f (diff) | |
| download | scummvm-rg350-59eeadc6ac88f19879804e88979d156eb825ee7d.tar.gz scummvm-rg350-59eeadc6ac88f19879804e88979d156eb825ee7d.tar.bz2 scummvm-rg350-59eeadc6ac88f19879804e88979d156eb825ee7d.zip | |
BLADERUNNER: Added more game constants
Code formatting
Diffstat (limited to 'engines/bladerunner/script')
118 files changed, 1926 insertions, 1927 deletions
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp index fb670af304..366361e365 100644 --- a/engines/bladerunner/script/ai/mccoy.cpp +++ b/engines/bladerunner/script/ai/mccoy.cpp @@ -276,7 +276,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) { case 231: Player_Set_Combat_Mode(false); Preload(18); - Set_Enter(59, 63); + Set_Enter(59, kSceneNR10); Player_Loses_Control(); Actor_Force_Stop_Walking(kActorMcCoy); Actor_Put_In_Set(kActorMcCoy, 59); @@ -427,7 +427,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Global_Variable_Set(1, 5); - Outtake_Play(10, 0, -1); + Outtake_Play(kOuttakeMovieD, false, -1); if (Game_Flag_Query(666)) { Chapter_Enter(5, 53, 53); } else { @@ -442,7 +442,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) { dword_45A0D0_animation_state = 0; dword_45A0D4_animation_frame = 0; Game_Flag_Set(465); - Set_Enter(67, 72); + Set_Enter(67, kScenePS09); return true; } return false; diff --git a/engines/bladerunner/script/kia.cpp b/engines/bladerunner/script/kia.cpp index e0c875469d..e2db62f463 100644 --- a/engines/bladerunner/script/kia.cpp +++ b/engines/bladerunner/script/kia.cpp @@ -30,931 +30,932 @@ namespace BladeRunner { KIAScript::KIAScript(BladeRunnerEngine *vm) : ScriptBase(vm) {} -void KIAScript::playClueAssetScript(int a1, int clueId) { +void KIAScript::playClueAssetScript(int notUsed, int clueId) { _vm->_kia->playerReset(); _vm->_mouse->disable(); - SCRIPT_KIA_DLL_Play_Clue_Asset_Script(a1, clueId); + SCRIPT_KIA_DLL_Play_Clue_Asset_Script(notUsed, clueId); _vm->_mouse->enable(); } -void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int a1, int clueId) { - int v1; +void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) { switch (clueId) { - case 0: - KIA_Play_Actor_Dialogue(23, 40); + case kClueOfficersStatement: + KIA_Play_Actor_Dialogue(kActorOfficerLeary, 40); break; - case 2: - KIA_Play_Actor_Dialogue(23, 0); + case kClueDoorForced2: + KIA_Play_Actor_Dialogue(kActorOfficerLeary, 0); break; - case 3: - KIA_Play_Actor_Dialogue(99, 1970); - KIA_Play_Actor_Dialogue(99, 1980); - KIA_Play_Actor_Dialogue(99, 1990); + case kClueLimpingFootprints: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1970); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1980); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1990); break; - case 4: - KIA_Play_Actor_Dialogue(99, 1970); - KIA_Play_Actor_Dialogue(99, 1980); - KIA_Play_Actor_Dialogue(99, 1990); + case kClueGracefulFootprints: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1970); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1980); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1990); break; - case 5: + case kClueShellCasings: KIA_Play_Slice_Model(966); - KIA_Play_Actor_Dialogue(99, 1960); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1960); break; - case 6: + case kClueCandy: KIA_Play_Slice_Model(933); break; - case 7: + case kClueToyDog: KIA_Play_Slice_Model(971); break; - case 8: + case kClueChopstickWrapper: KIA_Play_Slice_Model(937); - KIA_Play_Actor_Dialogue(99, 2010); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2010); break; - case 9: + case kClueSushiMenu: KIA_Play_Photograph(6); - KIA_Play_Actor_Dialogue(99, 2020); - KIA_Play_Actor_Dialogue(99, 2030); - KIA_Play_Actor_Dialogue(99, 2040); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2020); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2030); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2040); break; - case 10: - KIA_Play_Actor_Dialogue(30, 140); + case kClueLabCorpses: + KIA_Play_Actor_Dialogue(kActorKlein, 140); break; - case 11: - KIA_Play_Actor_Dialogue(30, 50); - KIA_Play_Actor_Dialogue(30, 60); - KIA_Play_Actor_Dialogue(30, 70); - KIA_Play_Actor_Dialogue(30, 80); - KIA_Play_Actor_Dialogue(30, 90); + case kClueLabShellCasings: + KIA_Play_Actor_Dialogue(kActorKlein, 50); + KIA_Play_Actor_Dialogue(kActorKlein, 60); + KIA_Play_Actor_Dialogue(kActorKlein, 70); + KIA_Play_Actor_Dialogue(kActorKlein, 80); + KIA_Play_Actor_Dialogue(kActorKlein, 90); break; - case 12: + case kClueRuncitersVideo: KIA_Play_Slice_Model(975); break; - case 13: + case kClueLucy: KIA_Play_Photograph(5); break; - case 14: + case kClueDragonflyAnklet: KIA_Play_Photograph(4); - KIA_Play_Actor_Dialogue(99, 4050); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4050); break; - case 15: + case kClueReferenceLetter: KIA_Play_Slice_Model(964); - KIA_Play_Actor_Dialogue(15, 280); - KIA_Play_Actor_Dialogue(15, 290); + KIA_Play_Actor_Dialogue(kActorRunciter, 280); + KIA_Play_Actor_Dialogue(kActorRunciter, 290); break; - case 16: - KIA_Play_Actor_Dialogue(23, 100); + case kClueCrowdInterviewA: + KIA_Play_Actor_Dialogue(kActorOfficerLeary, 100); break; - case 17: - KIA_Play_Actor_Dialogue(23, 120); - KIA_Play_Actor_Dialogue(23, 130); + case kClueCrowdInterviewB: + KIA_Play_Actor_Dialogue(kActorOfficerLeary, 120); + KIA_Play_Actor_Dialogue(kActorOfficerLeary, 130); break; - case 19: - KIA_Play_Actor_Dialogue(0, 380); - KIA_Play_Actor_Dialogue(19, 30); - KIA_Play_Actor_Dialogue(19, 40); - KIA_Play_Actor_Dialogue(0, 410); - KIA_Play_Actor_Dialogue(19, 50); + case kClueZubenInterview: + KIA_Play_Actor_Dialogue(kActorMcCoy, 380); + KIA_Play_Actor_Dialogue(kActorZuben, 30); + KIA_Play_Actor_Dialogue(kActorZuben, 40); + KIA_Play_Actor_Dialogue(kActorMcCoy, 410); + KIA_Play_Actor_Dialogue(kActorZuben, 50); break; - case 20: + case kClueZuben: KIA_Play_Photograph(33); - KIA_Play_Actor_Dialogue(99, 350); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 350); break; - case 21: - KIA_Play_Actor_Dialogue(12, 10); + case kClueBigManLimping: + KIA_Play_Actor_Dialogue(kActorTransient, 10); break; - case 22: - KIA_Play_Actor_Dialogue(15, 40); - KIA_Play_Actor_Dialogue(15, 50); - KIA_Play_Actor_Dialogue(0, 4565); - KIA_Play_Actor_Dialogue(15, 60); + case kClueRunciterInterviewA: + KIA_Play_Actor_Dialogue(kActorRunciter, 40); + KIA_Play_Actor_Dialogue(kActorRunciter, 50); + KIA_Play_Actor_Dialogue(kActorMcCoy, 4565); + KIA_Play_Actor_Dialogue(kActorRunciter, 60); break; - case 23: - KIA_Play_Actor_Dialogue(15, 250); - KIA_Play_Actor_Dialogue(15, 270); + case kClueRunciterInterviewB1: + KIA_Play_Actor_Dialogue(kActorRunciter, 250); + KIA_Play_Actor_Dialogue(kActorRunciter, 270); break; - case 24: - KIA_Play_Actor_Dialogue(15, 260); - KIA_Play_Actor_Dialogue(15, 270); + case kClueRunciterInterviewB2: + KIA_Play_Actor_Dialogue(kActorRunciter, 260); + KIA_Play_Actor_Dialogue(kActorRunciter, 270); break; - case 25: - KIA_Play_Actor_Dialogue(0, 295); - KIA_Play_Actor_Dialogue(28, 90); - KIA_Play_Actor_Dialogue(28, 100); + case kClueHowieLeeInterview: + KIA_Play_Actor_Dialogue(kActorMcCoy, 295); + KIA_Play_Actor_Dialogue(kActorHowieLee, 90); + KIA_Play_Actor_Dialogue(kActorHowieLee, 100); break; - case 26: - KIA_Play_Actor_Dialogue(99, 1880); - KIA_Play_Actor_Dialogue(99, 1890); + case kCluePaintTransfer: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1880); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1890); break; - case 27: + case kClueChromeDebris: KIA_Play_Slice_Model(938); break; - case 28: + case kClueRuncitersViewA: KIA_Play_Photograph(11); break; - case 29: + case kClueRuncitersViewB: KIA_Play_Photograph(12); break; - case 30: + case kClueCarColorAndMake: KIA_Play_Photograph(10); break; - case 31: + case kCluePartialLicenseNumber: KIA_Play_Photograph(9); break; - case 32: + case kClueBriefcase: KIA_Play_Slice_Model(987); - KIA_Play_Actor_Dialogue(0, 5870); - KIA_Play_Actor_Dialogue(4, 810); - KIA_Play_Actor_Dialogue(4, 820); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5870); + KIA_Play_Actor_Dialogue(kActorGuzza, 810); + KIA_Play_Actor_Dialogue(kActorGuzza, 820); break; - case 33: - KIA_Play_Actor_Dialogue(53, 20); - KIA_Play_Actor_Dialogue(0, 680); - KIA_Play_Actor_Dialogue(53, 30); + case kClueGaffsInformation: + KIA_Play_Actor_Dialogue(kActorGaff, 20); + KIA_Play_Actor_Dialogue(kActorMcCoy, 680); + KIA_Play_Actor_Dialogue(kActorGaff, 30); break; - case 37: + case kClueLicensePlate: KIA_Play_Slice_Model(952); break; - case 39: - KIA_Play_Actor_Dialogue(30, 170); - KIA_Play_Actor_Dialogue(30, 180); - KIA_Play_Actor_Dialogue(30, 190); - KIA_Play_Actor_Dialogue(30, 200); - break; - case 40: - KIA_Play_Actor_Dialogue(38, 90); - KIA_Play_Actor_Dialogue(38, 100); - KIA_Play_Actor_Dialogue(38, 110); - KIA_Play_Actor_Dialogue(38, 120); - KIA_Play_Actor_Dialogue(38, 130); - KIA_Play_Actor_Dialogue(38, 140); - KIA_Play_Actor_Dialogue(38, 150); - break; - case 43: - KIA_Play_Actor_Dialogue(4, 30); - KIA_Play_Actor_Dialogue(4, 50); - KIA_Play_Actor_Dialogue(4, 70); - break; - case 44: + case kClueLabPaintTransfer: + KIA_Play_Actor_Dialogue(kActorKlein, 170); + KIA_Play_Actor_Dialogue(kActorKlein, 180); + KIA_Play_Actor_Dialogue(kActorKlein, 190); + KIA_Play_Actor_Dialogue(kActorKlein, 200); + break; + case kClueDispatchHitAndRun: + KIA_Play_Actor_Dialogue(kActorDispatcher, 90); + KIA_Play_Actor_Dialogue(kActorDispatcher, 100); + KIA_Play_Actor_Dialogue(kActorDispatcher, 110); + KIA_Play_Actor_Dialogue(kActorDispatcher, 120); + KIA_Play_Actor_Dialogue(kActorDispatcher, 130); + KIA_Play_Actor_Dialogue(kActorDispatcher, 140); + KIA_Play_Actor_Dialogue(kActorDispatcher, 150); + break; + case kCluePhoneCallGuzza: + KIA_Play_Actor_Dialogue(kActorGuzza, 30); + KIA_Play_Actor_Dialogue(kActorGuzza, 50); + KIA_Play_Actor_Dialogue(kActorGuzza, 70); + break; + case kClueDragonflyEarring: KIA_Play_Slice_Model(940); - KIA_Play_Actor_Dialogue(99, 2140); - KIA_Play_Actor_Dialogue(99, 2150); - KIA_Play_Actor_Dialogue(99, 2160); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2140); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2150); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2160); break; - case 45: + case kClueTyrellSecurity: KIA_Play_Slice_Model(975); break; - case 46: - KIA_Play_Actor_Dialogue(0, 5140); - KIA_Play_Actor_Dialogue(17, 30); - KIA_Play_Actor_Dialogue(17, 40); + case kClueTyrellGuardInterview: + KIA_Play_Actor_Dialogue(kActorMcCoy, 5140); + KIA_Play_Actor_Dialogue(kActorTyrellGuard, 30); + KIA_Play_Actor_Dialogue(kActorTyrellGuard, 40); break; - case 47: + case kClueBombingSuspect: KIA_Play_Photograph(31); - KIA_Play_Actor_Dialogue(99, 2140); - KIA_Play_Actor_Dialogue(99, 2150); - KIA_Play_Actor_Dialogue(99, 2160); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2140); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2150); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2160); break; - case 49: + case kClueDetonatorWire: KIA_Play_Slice_Model(974); - KIA_Play_Actor_Dialogue(99, 2320); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2320); if (Game_Flag_Query(48)) { - KIA_Play_Actor_Dialogue(99, 2330); - KIA_Play_Actor_Dialogue(99, 2340); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2330); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2340); } - KIA_Play_Actor_Dialogue(99, 2350); - break; - case 50: - KIA_Play_Actor_Dialogue(17, 100); - KIA_Play_Actor_Dialogue(17, 110); - KIA_Play_Actor_Dialogue(17, 120); - KIA_Play_Actor_Dialogue(17, 130); - break; - case 51: - KIA_Play_Actor_Dialogue(99, 2170); - KIA_Play_Actor_Dialogue(99, 2180); - KIA_Play_Actor_Dialogue(99, 2190); - KIA_Play_Actor_Dialogue(99, 2200); - break; - case 52: - KIA_Play_Actor_Dialogue(1, 2230); - KIA_Play_Actor_Dialogue(1, 2260); - KIA_Play_Actor_Dialogue(1, 2270); - KIA_Play_Actor_Dialogue(1, 2280); - break; - case 53: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2350); + break; + case kClueVictimInformation: + KIA_Play_Actor_Dialogue(kActorTyrellGuard, 100); + KIA_Play_Actor_Dialogue(kActorTyrellGuard, 110); + KIA_Play_Actor_Dialogue(kActorTyrellGuard, 120); + KIA_Play_Actor_Dialogue(kActorTyrellGuard, 130); + break; + case kClueAttemptedFileAccess: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2170); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2180); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2190); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2200); + break; + case kClueCrystalsCase: + KIA_Play_Actor_Dialogue(kActorSteele, 2230); + KIA_Play_Actor_Dialogue(kActorSteele, 2260); + KIA_Play_Actor_Dialogue(kActorSteele, 2270); + KIA_Play_Actor_Dialogue(kActorSteele, 2280); + break; + case kClueKingstonKitchenBox1: KIA_Play_Slice_Model(955); if (Query_Difficulty_Level() == 0) { - KIA_Play_Actor_Dialogue(99, 4140); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4140); } else { - KIA_Play_Actor_Dialogue(99, 4150); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4150); } break; - case 54: + case kClueTyrellSalesPamphlet1: KIA_Play_Slice_Model(973); - KIA_Play_Actor_Dialogue(99, 4280); - KIA_Play_Actor_Dialogue(99, 4290); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4280); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4290); break; - case 55: + case kClueTyrellSalesPamphlet2: KIA_Play_Slice_Model(973); - KIA_Play_Actor_Dialogue(99, 4280); - KIA_Play_Actor_Dialogue(99, 4300); - break; - case 56: - KIA_Play_Actor_Dialogue(16, 90); - KIA_Play_Actor_Dialogue(16, 100); - KIA_Play_Actor_Dialogue(16, 110); - KIA_Play_Actor_Dialogue(16, 120); - KIA_Play_Actor_Dialogue(16, 130); - break; - case 57: - KIA_Play_Actor_Dialogue(20, 90); - KIA_Play_Actor_Dialogue(20, 100); - break; - case 58: - KIA_Play_Actor_Dialogue(14, 320); - KIA_Play_Actor_Dialogue(14, 330); - KIA_Play_Actor_Dialogue(14, 340); - KIA_Play_Actor_Dialogue(14, 380); - KIA_Play_Actor_Dialogue(14, 390); - KIA_Play_Actor_Dialogue(14, 400); - break; - case 59: - KIA_Play_Actor_Dialogue(14, 320); - KIA_Play_Actor_Dialogue(14, 330); - KIA_Play_Actor_Dialogue(14, 410); - KIA_Play_Actor_Dialogue(14, 420); - KIA_Play_Actor_Dialogue(14, 440); - KIA_Play_Actor_Dialogue(14, 450); - break; - case 60: - KIA_Play_Actor_Dialogue(7, 210); - KIA_Play_Actor_Dialogue(7, 220); - KIA_Play_Actor_Dialogue(7, 240); - KIA_Play_Actor_Dialogue(7, 250); - break; - case 61: - KIA_Play_Actor_Dialogue(7, 750); - KIA_Play_Actor_Dialogue(7, 760); - KIA_Play_Actor_Dialogue(0, 5500); - KIA_Play_Actor_Dialogue(7, 780); - KIA_Play_Actor_Dialogue(7, 790); - break; - case 62: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4280); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4300); + break; + case kCluePeruvianLadyInterview: + KIA_Play_Actor_Dialogue(kActorInsectDealer, 90); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 100); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 110); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 120); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 130); + break; + case kClueHasanInterview: + KIA_Play_Actor_Dialogue(kActorHasan, 90); + KIA_Play_Actor_Dialogue(kActorHasan, 100); + break; + case kClueBobInterview1: + KIA_Play_Actor_Dialogue(kActorBulletBob, 320); + KIA_Play_Actor_Dialogue(kActorBulletBob, 330); + KIA_Play_Actor_Dialogue(kActorBulletBob, 340); + KIA_Play_Actor_Dialogue(kActorBulletBob, 380); + KIA_Play_Actor_Dialogue(kActorBulletBob, 390); + KIA_Play_Actor_Dialogue(kActorBulletBob, 400); + break; + case kClueBobInterview2: + KIA_Play_Actor_Dialogue(kActorBulletBob, 320); + KIA_Play_Actor_Dialogue(kActorBulletBob, 330); + KIA_Play_Actor_Dialogue(kActorBulletBob, 410); + KIA_Play_Actor_Dialogue(kActorBulletBob, 420); + KIA_Play_Actor_Dialogue(kActorBulletBob, 440); + KIA_Play_Actor_Dialogue(kActorBulletBob, 450); + break; + case kClueIzoInterview: + KIA_Play_Actor_Dialogue(kActorIzo, 210); + KIA_Play_Actor_Dialogue(kActorIzo, 220); + KIA_Play_Actor_Dialogue(kActorIzo, 240); + KIA_Play_Actor_Dialogue(kActorIzo, 250); + break; + case kClueIzosWarning: + KIA_Play_Actor_Dialogue(kActorIzo, 750); + KIA_Play_Actor_Dialogue(kActorIzo, 760); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5500); + KIA_Play_Actor_Dialogue(kActorIzo, 780); + KIA_Play_Actor_Dialogue(kActorIzo, 790); + break; + case kClueRadiationGoggles: KIA_Play_Slice_Model(963); break; - case 63: - KIA_Play_Actor_Dialogue(14, 560); - KIA_Play_Actor_Dialogue(14, 570); - KIA_Play_Actor_Dialogue(14, 580); + case kClueGogglesReplicantIssue: + KIA_Play_Actor_Dialogue(kActorBulletBob, 560); + KIA_Play_Actor_Dialogue(kActorBulletBob, 570); + KIA_Play_Actor_Dialogue(kActorBulletBob, 580); break; - case 64: - KIA_Play_Actor_Dialogue(29, 120); - KIA_Play_Actor_Dialogue(29, 130); + case kClueFishLadyInterview: + KIA_Play_Actor_Dialogue(kActorFishDealer, 120); + KIA_Play_Actor_Dialogue(kActorFishDealer, 130); break; - case 65: + case kClueDogCollar1: KIA_Play_Slice_Model(942); - KIA_Play_Actor_Dialogue(99, 4160); - break; - case 66: - KIA_Play_Actor_Dialogue(99, 2430); - KIA_Play_Actor_Dialogue(99, 2440); - KIA_Play_Actor_Dialogue(99, 2450); - break; - case 67: - KIA_Play_Actor_Dialogue(52, 140); - KIA_Play_Actor_Dialogue(52, 150); - KIA_Play_Actor_Dialogue(52, 170); - KIA_Play_Actor_Dialogue(52, 180); - KIA_Play_Actor_Dialogue(52, 190); - break; - case 68: - KIA_Play_Actor_Dialogue(35, 20); - KIA_Play_Actor_Dialogue(35, 30); - KIA_Play_Actor_Dialogue(35, 40); - KIA_Play_Actor_Dialogue(35, 50); - break; - case 69: - KIA_Play_Actor_Dialogue(2, 1010); - KIA_Play_Actor_Dialogue(0, 6495); - KIA_Play_Actor_Dialogue(2, 1020); - KIA_Play_Actor_Dialogue(0, 6500); - KIA_Play_Actor_Dialogue(2, 1030); - break; - case 70: - KIA_Play_Actor_Dialogue(2, 1040); - KIA_Play_Actor_Dialogue(2, 1050); - KIA_Play_Actor_Dialogue(0, 6505); - KIA_Play_Actor_Dialogue(2, 1060); - KIA_Play_Actor_Dialogue(2, 1070); - KIA_Play_Actor_Dialogue(0, 6510); - KIA_Play_Actor_Dialogue(2, 1080); - break; - case 71: - KIA_Play_Actor_Dialogue(56, 0); - KIA_Play_Actor_Dialogue(56, 10); - KIA_Play_Actor_Dialogue(56, 20); - KIA_Play_Actor_Dialogue(56, 30); - KIA_Play_Actor_Dialogue(56, 40); - KIA_Play_Actor_Dialogue(56, 50); - break; - case 72: - KIA_Play_Actor_Dialogue(99, 80); - KIA_Play_Actor_Dialogue(99, 90); - break; - case 74: - KIA_Play_Actor_Dialogue(99, 4370); - KIA_Play_Actor_Dialogue(99, 4380); - KIA_Play_Actor_Dialogue(99, 4390); - KIA_Play_Actor_Dialogue(99, 4400); - break; - case 75: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4160); + break; + case kClueWeaponsCache: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2430); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2440); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2450); + break; + case kClueChewInterview: + KIA_Play_Actor_Dialogue(kActorChew, 140); + KIA_Play_Actor_Dialogue(kActorChew, 150); + KIA_Play_Actor_Dialogue(kActorChew, 170); + KIA_Play_Actor_Dialogue(kActorChew, 180); + KIA_Play_Actor_Dialogue(kActorChew, 190); + break; + case kClueMorajiInterview: + KIA_Play_Actor_Dialogue(kActorMoraji, 20); + KIA_Play_Actor_Dialogue(kActorMoraji, 30); + KIA_Play_Actor_Dialogue(kActorMoraji, 40); + KIA_Play_Actor_Dialogue(kActorMoraji, 50); + break; + case kClueGordoInterview1: + KIA_Play_Actor_Dialogue(kActorGordo, 1010); + KIA_Play_Actor_Dialogue(kActorMcCoy, 6495); + KIA_Play_Actor_Dialogue(kActorGordo, 1020); + KIA_Play_Actor_Dialogue(kActorMcCoy, 6500); + KIA_Play_Actor_Dialogue(kActorGordo, 1030); + break; + case kClueGordoInterview2: + KIA_Play_Actor_Dialogue(kActorGordo, 1040); + KIA_Play_Actor_Dialogue(kActorGordo, 1050); + KIA_Play_Actor_Dialogue(kActorMcCoy, 6505); + KIA_Play_Actor_Dialogue(kActorGordo, 1060); + KIA_Play_Actor_Dialogue(kActorGordo, 1070); + KIA_Play_Actor_Dialogue(kActorMcCoy, 6510); + KIA_Play_Actor_Dialogue(kActorGordo, 1080); + break; + case kClueAnsweringMachineMessage: + KIA_Play_Actor_Dialogue(kActorSebastian, 0); + KIA_Play_Actor_Dialogue(kActorSebastian, 10); + KIA_Play_Actor_Dialogue(kActorSebastian, 20); + KIA_Play_Actor_Dialogue(kActorSebastian, 30); + KIA_Play_Actor_Dialogue(kActorSebastian, 40); + KIA_Play_Actor_Dialogue(kActorSebastian, 50); + break; + case kClueChessTable: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 80); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 90); + break; + case kClueStaggeredbyPunches: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4370); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4380); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4390); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4400); + break; + case kClueMaggieBracelet: KIA_Play_Slice_Model(956); break; - case 76: + case kClueEnvelope: KIA_Play_Slice_Model(944); - KIA_Play_Actor_Dialogue(99, 850); - KIA_Play_Actor_Dialogue(99, 860); - KIA_Play_Actor_Dialogue(99, 870); - KIA_Play_Actor_Dialogue(99, 880); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 850); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 860); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 870); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 880); break; - case 77: + case kClueIzosFriend: KIA_Play_Photograph(25); break; - case 78: + case kClueChinaBarSecurityPhoto: KIA_Play_Photograph(20); break; - case 79: - KIA_Play_Actor_Dialogue(0, 220); - KIA_Play_Actor_Dialogue(16, 320); - KIA_Play_Actor_Dialogue(0, 225); - KIA_Play_Actor_Dialogue(16, 330); - KIA_Play_Actor_Dialogue(0, 230); - KIA_Play_Actor_Dialogue(16, 340); + case kCluePurchasedScorpions: + KIA_Play_Actor_Dialogue(kActorMcCoy, 220); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 320); + KIA_Play_Actor_Dialogue(kActorMcCoy, 225); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 330); + KIA_Play_Actor_Dialogue(kActorMcCoy, 230); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 340); break; - case 80: + case kClueWeaponsOrderForm: KIA_Play_Slice_Model(965); break; - case 81: + case kClueShippingForm: KIA_Play_Slice_Model(965); break; - case 82: - KIA_Play_Actor_Dialogue(4, 520); - KIA_Play_Actor_Dialogue(4, 530); - KIA_Play_Actor_Dialogue(4, 540); - KIA_Play_Actor_Dialogue(4, 550); + case kClueGuzzasCash: + KIA_Play_Actor_Dialogue(kActorGuzza, 520); + KIA_Play_Actor_Dialogue(kActorGuzza, 530); + KIA_Play_Actor_Dialogue(kActorGuzza, 540); + KIA_Play_Actor_Dialogue(kActorGuzza, 550); break; - case 84: + case kClueHysteriaToken: KIA_Play_Slice_Model(970); break; - case 85: + case kClueRagDoll: KIA_Play_Slice_Model(943); break; - case 86: + case kClueMoonbus1: KIA_Play_Photograph(34); break; - case 87: + case kClueCheese: KIA_Play_Slice_Model(936); break; - case 88: + case kClueDektorasDressingRoom: KIA_Play_Photograph(16); break; - case 89: + case kClueEarlyQsClub: KIA_Play_Slice_Model(975); break; - case 90: - KIA_Play_Actor_Dialogue(16, 290); - KIA_Play_Actor_Dialogue(16, 300); + case kClueDragonflyCollection: + KIA_Play_Actor_Dialogue(kActorInsectDealer, 290); + KIA_Play_Actor_Dialogue(kActorInsectDealer, 300); break; - case 91: + case kClueDragonflyBelt: KIA_Play_Slice_Model(939); - KIA_Play_Actor_Dialogue(99, 4050); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4050); break; - case 92: - KIA_Play_Actor_Dialogue(18, 140); - KIA_Play_Actor_Dialogue(18, 150); + case kClueEarlyQInterview: + KIA_Play_Actor_Dialogue(kActorEarlyQ, 140); + KIA_Play_Actor_Dialogue(kActorEarlyQ, 150); break; - case 93: + case kClueStrangeScale1: KIA_Play_Slice_Model(969); break; - case 94: - KIA_Play_Actor_Dialogue(3, 650); - KIA_Play_Actor_Dialogue(3, 660); - KIA_Play_Actor_Dialogue(0, 3665); - KIA_Play_Actor_Dialogue(3, 670); - KIA_Play_Actor_Dialogue(3, 680); - KIA_Play_Actor_Dialogue(3, 690); + case kClueDektoraInterview1: + KIA_Play_Actor_Dialogue(kActorDektora, 650); + KIA_Play_Actor_Dialogue(kActorDektora, 660); + KIA_Play_Actor_Dialogue(kActorMcCoy, 3665); + KIA_Play_Actor_Dialogue(kActorDektora, 670); + KIA_Play_Actor_Dialogue(kActorDektora, 680); + KIA_Play_Actor_Dialogue(kActorDektora, 690); break; - case 96: - KIA_Play_Actor_Dialogue(3, 580); + case kClueDektoraInterview2: + KIA_Play_Actor_Dialogue(kActorDektora, 580); break; - case 97: - KIA_Play_Actor_Dialogue(0, 3600); - KIA_Play_Actor_Dialogue(3, 550); + case kClueDektoraInterview3: + KIA_Play_Actor_Dialogue(kActorMcCoy, 3600); + KIA_Play_Actor_Dialogue(kActorDektora, 550); break; - case 98: + case kClueDektorasCard: KIA_Play_Slice_Model(935); break; - case 99: + case kClueGrigoriansNote: KIA_Play_Slice_Model(957); break; - case 100: + case kClueCollectionReceipt: KIA_Play_Slice_Model(961); break; - case 101: - KIA_Play_Actor_Dialogue(31, 210); - KIA_Play_Actor_Dialogue(31, 220); - KIA_Play_Actor_Dialogue(22, 140); - KIA_Play_Actor_Dialogue(31, 230); + case kClueSpecialIngredient: + KIA_Play_Actor_Dialogue(kActorMurray, 210); + KIA_Play_Actor_Dialogue(kActorMurray, 220); + KIA_Play_Actor_Dialogue(kActorMia, 140); + KIA_Play_Actor_Dialogue(kActorMurray, 230); break; - case 102: - KIA_Play_Actor_Dialogue(59, 210); - KIA_Play_Actor_Dialogue(59, 260); - KIA_Play_Actor_Dialogue(0, 1390); - KIA_Play_Actor_Dialogue(59, 300); + case kClueStolenCheese: + KIA_Play_Actor_Dialogue(kActorIsabella, 210); + KIA_Play_Actor_Dialogue(kActorIsabella, 260); + KIA_Play_Actor_Dialogue(kActorMcCoy, 1390); + KIA_Play_Actor_Dialogue(kActorIsabella, 300); break; - case 103: - KIA_Play_Actor_Dialogue(2, 450); - KIA_Play_Actor_Dialogue(0, 3280); + case kClueGordoInterview3: + KIA_Play_Actor_Dialogue(kActorGordo, 450); + KIA_Play_Actor_Dialogue(kActorMcCoy, 3280); break; - case 104: - KIA_Play_Actor_Dialogue(0, 3250); - KIA_Play_Actor_Dialogue(2, 540); - KIA_Play_Actor_Dialogue(2, 550); + case kClueGordoConfession: + KIA_Play_Actor_Dialogue(kActorMcCoy, 3250); + KIA_Play_Actor_Dialogue(kActorGordo, 540); + KIA_Play_Actor_Dialogue(kActorGordo, 550); break; - case 105: + case kClueGordosLighter1: KIA_Play_Slice_Model(953); - KIA_Play_Actor_Dialogue(99, 350); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 350); break; - case 106: + case kClueGordosLighter2: KIA_Play_Slice_Model(954); break; - case 107: - KIA_Play_Actor_Dialogue(0, 3860); - KIA_Play_Actor_Dialogue(3, 1030); - KIA_Play_Actor_Dialogue(3, 1040); - KIA_Play_Actor_Dialogue(0, 3865); - KIA_Play_Actor_Dialogue(3, 1050); - KIA_Play_Actor_Dialogue(3, 1060); + case kClueDektoraInterview4: + KIA_Play_Actor_Dialogue(kActorMcCoy, 3860); + KIA_Play_Actor_Dialogue(kActorDektora, 1030); + KIA_Play_Actor_Dialogue(kActorDektora, 1040); + KIA_Play_Actor_Dialogue(kActorMcCoy, 3865); + KIA_Play_Actor_Dialogue(kActorDektora, 1050); + KIA_Play_Actor_Dialogue(kActorDektora, 1060); break; - case 108: - KIA_Play_Actor_Dialogue(33, 0); - KIA_Play_Actor_Dialogue(33, 10); + case kClueHollowayInterview: + KIA_Play_Actor_Dialogue(kActorHolloway, 0); + KIA_Play_Actor_Dialogue(kActorHolloway, 10); break; - case 109: + case kClueBakersBadge: KIA_Play_Slice_Model(931); break; - case 110: + case kClueHoldensBadge: KIA_Play_Slice_Model(931); - KIA_Play_Actor_Dialogue(99, 4420); - break; - case 112: - KIA_Play_Actor_Dialogue(99, 3780); - KIA_Play_Actor_Dialogue(99, 3790); - break; - case 113: - KIA_Play_Actor_Dialogue(99, 3800); - KIA_Play_Actor_Dialogue(99, 3810); - KIA_Play_Actor_Dialogue(99, 3820); - KIA_Play_Actor_Dialogue(99, 3830); - break; - case 114: - KIA_Play_Actor_Dialogue(99, 3840); - KIA_Play_Actor_Dialogue(99, 3850); - KIA_Play_Actor_Dialogue(99, 3860); - KIA_Play_Actor_Dialogue(99, 3870); - break; - case 115: - KIA_Play_Actor_Dialogue(99, 3880); - KIA_Play_Actor_Dialogue(99, 3890); - KIA_Play_Actor_Dialogue(99, 3900); - break; - case 116: - KIA_Play_Actor_Dialogue(9, 830); - KIA_Play_Actor_Dialogue(9, 840); - KIA_Play_Actor_Dialogue(9, 850); - break; - case 118: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4420); + break; + case kClueCarIdentified: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3780); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3790); + break; + case kClueCarRegistration1: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3800); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3810); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3820); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3830); + break; + case kClueCarRegistration2: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3840); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3850); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3860); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3870); + break; + case kClueCarRegistration3: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3880); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3890); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3900); + break; + case kClueCrazylegsInterview1: + KIA_Play_Actor_Dialogue(kActorCrazylegs, 830); + KIA_Play_Actor_Dialogue(kActorCrazylegs, 840); + KIA_Play_Actor_Dialogue(kActorCrazylegs, 850); + break; + case kClueLichenDogWrapper: KIA_Play_Slice_Model(951); break; - case 119: + case kClueRequisitionForm: KIA_Play_Slice_Model(962); - KIA_Play_Actor_Dialogue(99, 3930); - KIA_Play_Actor_Dialogue(99, 3940); - break; - case 120: - KIA_Play_Actor_Dialogue(99, 2550); - KIA_Play_Actor_Dialogue(99, 2560); - KIA_Play_Actor_Dialogue(99, 2570); - KIA_Play_Actor_Dialogue(99, 2580); - KIA_Play_Actor_Dialogue(99, 2590); - break; - case 121: - KIA_Play_Actor_Dialogue(99, 2470); - KIA_Play_Actor_Dialogue(99, 2480); - KIA_Play_Actor_Dialogue(99, 2490); - KIA_Play_Actor_Dialogue(99, 2500); - break; - case 122: - KIA_Play_Actor_Dialogue(0, 5615); - KIA_Play_Actor_Dialogue(12, 170); - KIA_Play_Actor_Dialogue(0, 5625); - KIA_Play_Actor_Dialogue(12, 180); - KIA_Play_Actor_Dialogue(0, 5630); - KIA_Play_Actor_Dialogue(12, 190); - KIA_Play_Actor_Dialogue(0, 5635); - KIA_Play_Actor_Dialogue(12, 200); - break; - case 123: - KIA_Play_Actor_Dialogue(0, 5640); - KIA_Play_Actor_Dialogue(12, 230); - KIA_Play_Actor_Dialogue(0, 5645); - KIA_Play_Actor_Dialogue(12, 240); - KIA_Play_Actor_Dialogue(12, 250); - KIA_Play_Actor_Dialogue(0, 5650); - KIA_Play_Actor_Dialogue(12, 260); - break; - case 124: - KIA_Play_Actor_Dialogue(12, 340); - KIA_Play_Actor_Dialogue(12, 350); - KIA_Play_Actor_Dialogue(12, 360); - KIA_Play_Actor_Dialogue(99, 2710); - KIA_Play_Actor_Dialogue(99, 2730); - break; - case 125: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3930); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3940); + break; + case kClueScaryChair: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2550); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2560); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2570); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2580); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2590); + break; + case kClueIzosStashRaided: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2470); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2480); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2490); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2500); + break; + case kClueHomelessManInterview1: + KIA_Play_Actor_Dialogue(kActorMcCoy, 5615); + KIA_Play_Actor_Dialogue(kActorTransient, 170); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5625); + KIA_Play_Actor_Dialogue(kActorTransient, 180); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5630); + KIA_Play_Actor_Dialogue(kActorTransient, 190); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5635); + KIA_Play_Actor_Dialogue(kActorTransient, 200); + break; + case kClueHomelessManInterview2: + KIA_Play_Actor_Dialogue(kActorMcCoy, 5640); + KIA_Play_Actor_Dialogue(kActorTransient, 230); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5645); + KIA_Play_Actor_Dialogue(kActorTransient, 240); + KIA_Play_Actor_Dialogue(kActorTransient, 250); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5650); + KIA_Play_Actor_Dialogue(kActorTransient, 260); + break; + case kClueHomelessManKid: + KIA_Play_Actor_Dialogue(kActorTransient, 340); + KIA_Play_Actor_Dialogue(kActorTransient, 350); + KIA_Play_Actor_Dialogue(kActorTransient, 360); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2710); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2730); + break; + case kClueFolder: KIA_Play_Slice_Model(946); - KIA_Play_Actor_Dialogue(99, 2740); - KIA_Play_Actor_Dialogue(99, 2750); - KIA_Play_Actor_Dialogue(99, 2760); - KIA_Play_Actor_Dialogue(99, 2770); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2740); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2750); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2760); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 2770); break; - case 126: - KIA_Play_Actor_Dialogue(99, 3320); + case kClueGuzzaFramedMcCoy: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 3320); break; - case 127: + case kClueOriginalShippingForm: KIA_Play_Slice_Model(959); break; - case 128: + case kClueOriginalRequisitionForm: KIA_Play_Slice_Model(958); break; - case 129: + case kClueCandyWrapper: KIA_Play_Slice_Model(934); break; - case 131: + case kClueFlaskOfAbsinthe: KIA_Play_Slice_Model(945); break; - case 136: - KIA_Play_Actor_Dialogue(10, 240); - KIA_Play_Actor_Dialogue(13, 200); - KIA_Play_Actor_Dialogue(13, 210); - KIA_Play_Actor_Dialogue(10, 260); - KIA_Play_Actor_Dialogue(10, 270); - break; - case 139: - KIA_Play_Actor_Dialogue(3, 360); - KIA_Play_Actor_Dialogue(3, 380); - break; - case 140: - KIA_Play_Actor_Dialogue(0, 2505); - KIA_Play_Actor_Dialogue(3, 430); - KIA_Play_Actor_Dialogue(3, 440); - KIA_Play_Actor_Dialogue(0, 2530); - KIA_Play_Actor_Dialogue(3, 450); - KIA_Play_Actor_Dialogue(0, 2535); - KIA_Play_Actor_Dialogue(3, 460); - KIA_Play_Actor_Dialogue(3, 470); - break; - case 141: - KIA_Play_Actor_Dialogue(6, 590); - KIA_Play_Actor_Dialogue(6, 630); - break; - case 142: - KIA_Play_Actor_Dialogue(6, 540); - KIA_Play_Actor_Dialogue(6, 550); - KIA_Play_Actor_Dialogue(0, 2550); - KIA_Play_Actor_Dialogue(6, 560); - break; - case 143: - KIA_Play_Actor_Dialogue(5, 530); - KIA_Play_Actor_Dialogue(5, 540); - break; - case 144: - KIA_Play_Actor_Dialogue(1, 700); - KIA_Play_Actor_Dialogue(1, 750); - KIA_Play_Actor_Dialogue(1, 760); - break; - case 145: + case kClueLutherLanceInterview: + KIA_Play_Actor_Dialogue(kActorLuther, 240); + KIA_Play_Actor_Dialogue(kActorLance, 200); + KIA_Play_Actor_Dialogue(kActorLance, 210); + KIA_Play_Actor_Dialogue(kActorLuther, 260); + KIA_Play_Actor_Dialogue(kActorLuther, 270); + break; + case kCluePhoneCallDektora1: + KIA_Play_Actor_Dialogue(kActorDektora, 360); + KIA_Play_Actor_Dialogue(kActorDektora, 380); + break; + case kCluePhoneCallDektora2: + KIA_Play_Actor_Dialogue(kActorMcCoy, 2505); + KIA_Play_Actor_Dialogue(kActorDektora, 430); + KIA_Play_Actor_Dialogue(kActorDektora, 440); + KIA_Play_Actor_Dialogue(kActorMcCoy, 2530); + KIA_Play_Actor_Dialogue(kActorDektora, 450); + KIA_Play_Actor_Dialogue(kActorMcCoy, 2535); + KIA_Play_Actor_Dialogue(kActorDektora, 460); + KIA_Play_Actor_Dialogue(kActorDektora, 470); + break; + case kCluePhoneCallLucy1: + KIA_Play_Actor_Dialogue(kActorLucy, 590); + KIA_Play_Actor_Dialogue(kActorLucy, 630); + break; + case kCluePhoneCallLucy2: + KIA_Play_Actor_Dialogue(kActorLucy, 540); + KIA_Play_Actor_Dialogue(kActorLucy, 550); + KIA_Play_Actor_Dialogue(kActorMcCoy, 2550); + KIA_Play_Actor_Dialogue(kActorLucy, 560); + break; + case kCluePhoneCallClovis: + KIA_Play_Actor_Dialogue(kActorClovis, 530); + KIA_Play_Actor_Dialogue(kActorClovis, 540); + break; + case kCluePhoneCallCrystal: + KIA_Play_Actor_Dialogue(kActorSteele, 700); + KIA_Play_Actor_Dialogue(kActorSteele, 750); + KIA_Play_Actor_Dialogue(kActorSteele, 760); + break; + case kCluePowerSource: KIA_Play_Slice_Model(960); break; - case 146: + case kClueBomb: KIA_Play_Slice_Model(932); break; - case 147: - case 148: - case 149: - case 150: - case 151: - case 152: - v1 = Global_Variable_Query(48) - 1; - if (v1 == 1) { - KIA_Play_Slice_Model(988); - } else if (v1 == 2) { - KIA_Play_Slice_Model(990); - } else if (v1 == 3) { - KIA_Play_Slice_Model(991); - } else if (v1 == 4) { - KIA_Play_Slice_Model(993); + case kClueDNATyrell: + case kClueDNASebastian: + case kClueDNAChew: + case kClueDNAMoraji: + case kClueDNALutherLance: + case kClueDNAMarcus: + { + int v1 = Global_Variable_Query(48) - 1; + if (v1 == 1) { + KIA_Play_Slice_Model(988); + } else if (v1 == 2) { + KIA_Play_Slice_Model(990); + } else if (v1 == 3) { + KIA_Play_Slice_Model(991); + } else if (v1 == 4) { + KIA_Play_Slice_Model(993); + } } break; - case 153: + case kClueGarterSnake: KIA_Play_Slice_Model(950); break; - case 154: + case kClueSlug: KIA_Play_Slice_Model(967); break; - case 155: + case kClueGoldfish: KIA_Play_Slice_Model(947); break; - case 156: - KIA_Play_Actor_Dialogue(19, 230); - KIA_Play_Actor_Dialogue(19, 240); - break; - case 157: - KIA_Play_Actor_Dialogue(19, 250); - KIA_Play_Actor_Dialogue(19, 260); - break; - case 158: - KIA_Play_Actor_Dialogue(19, 280); - KIA_Play_Actor_Dialogue(0, 7350); - KIA_Play_Actor_Dialogue(19, 290); - KIA_Play_Actor_Dialogue(19, 300); - KIA_Play_Actor_Dialogue(19, 310); - break; - case 162: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 163: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 164: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 165: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 166: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 167: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 168: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 169: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 170: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 171: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 172: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 173: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 174: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 175: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 176: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 177: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 178: - KIA_Play_Actor_Dialogue(1, 3310); - KIA_Play_Actor_Dialogue(1, 3320); - KIA_Play_Actor_Dialogue(1, 3330); - KIA_Play_Actor_Dialogue(1, 3350); - KIA_Play_Actor_Dialogue(1, 3360); - KIA_Play_Actor_Dialogue(1, 3370); - KIA_Play_Actor_Dialogue(1, 3380); - break; - case 179: - KIA_Play_Actor_Dialogue(1, 3390); - KIA_Play_Actor_Dialogue(1, 3400); - KIA_Play_Actor_Dialogue(1, 3410); - KIA_Play_Actor_Dialogue(11, 1260); - KIA_Play_Actor_Dialogue(1, 3420); - KIA_Play_Actor_Dialogue(1, 3430); - KIA_Play_Actor_Dialogue(1, 3440); - KIA_Play_Actor_Dialogue(11, 1270); - KIA_Play_Actor_Dialogue(1, 3450); - KIA_Play_Actor_Dialogue(1, 3460); - KIA_Play_Actor_Dialogue(11, 1280); - KIA_Play_Actor_Dialogue(1, 3470); - KIA_Play_Actor_Dialogue(11, 1300); - KIA_Play_Actor_Dialogue(11, 1310); - KIA_Play_Actor_Dialogue(1, 3480); - KIA_Play_Actor_Dialogue(1, 3500); - KIA_Play_Actor_Dialogue(11, 1320); - KIA_Play_Actor_Dialogue(11, 1330); - KIA_Play_Actor_Dialogue(1, 3510); - KIA_Play_Actor_Dialogue(11, 1340); - KIA_Play_Actor_Dialogue(1, 3520); - KIA_Play_Actor_Dialogue(11, 1350); - KIA_Play_Actor_Dialogue(1, 3530); - KIA_Play_Actor_Dialogue(1, 3540); - break; - case 180: - KIA_Play_Actor_Dialogue(1, 3550); - KIA_Play_Actor_Dialogue(11, 1360); - KIA_Play_Actor_Dialogue(11, 1370); - KIA_Play_Actor_Dialogue(1, 3560); - KIA_Play_Actor_Dialogue(1, 3570); - break; - case 181: - KIA_Play_Actor_Dialogue(1, 3580); - KIA_Play_Actor_Dialogue(11, 1400); - KIA_Play_Actor_Dialogue(1, 3590); - KIA_Play_Actor_Dialogue(11, 1410); - KIA_Play_Actor_Dialogue(1, 3600); - KIA_Play_Actor_Dialogue(11, 1420); - KIA_Play_Actor_Dialogue(11, 1430); - KIA_Play_Actor_Dialogue(1, 3610); - KIA_Play_Actor_Dialogue(11, 1440); - KIA_Play_Actor_Dialogue(1, 3620); - KIA_Play_Actor_Dialogue(1, 3630); - KIA_Play_Actor_Dialogue(11, 1450); - KIA_Play_Actor_Dialogue(1, 3640); - KIA_Play_Actor_Dialogue(11, 1460); - KIA_Play_Actor_Dialogue(1, 3650); - break; - case 243: + case kClueZubenTalksAboutLucy1: + KIA_Play_Actor_Dialogue(kActorZuben, 230); + KIA_Play_Actor_Dialogue(kActorZuben, 240); + break; + case kClueZubenTalksAboutLucy2: + KIA_Play_Actor_Dialogue(kActorZuben, 250); + KIA_Play_Actor_Dialogue(kActorZuben, 260); + break; + case kClueZubensMotive: + KIA_Play_Actor_Dialogue(kActorZuben, 280); + KIA_Play_Actor_Dialogue(kActorMcCoy, 7350); + KIA_Play_Actor_Dialogue(kActorZuben, 290); + KIA_Play_Actor_Dialogue(kActorZuben, 300); + KIA_Play_Actor_Dialogue(kActorZuben, 310); + break; + case kClueVKDektoraReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKDektoraHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueVKBobGorskyReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKBobGorskyHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueVKLutherLanceReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKLutherLanceHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueVKGrigorianReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKGrigorianHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueVKIzoReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKIzoHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueVKCrazylegsReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKCrazylegsHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueVKRunciterReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKRunciterHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueVKEarlyQReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKEarlyQHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueCrimeSceneNotes: + KIA_Play_Actor_Dialogue(kActorSteele, 3310); + KIA_Play_Actor_Dialogue(kActorSteele, 3320); + KIA_Play_Actor_Dialogue(kActorSteele, 3330); + KIA_Play_Actor_Dialogue(kActorSteele, 3350); + KIA_Play_Actor_Dialogue(kActorSteele, 3360); + KIA_Play_Actor_Dialogue(kActorSteele, 3370); + KIA_Play_Actor_Dialogue(kActorSteele, 3380); + break; + case kClueGrigorianInterviewA: + KIA_Play_Actor_Dialogue(kActorSteele, 3390); + KIA_Play_Actor_Dialogue(kActorSteele, 3400); + KIA_Play_Actor_Dialogue(kActorSteele, 3410); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1260); + KIA_Play_Actor_Dialogue(kActorSteele, 3420); + KIA_Play_Actor_Dialogue(kActorSteele, 3430); + KIA_Play_Actor_Dialogue(kActorSteele, 3440); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1270); + KIA_Play_Actor_Dialogue(kActorSteele, 3450); + KIA_Play_Actor_Dialogue(kActorSteele, 3460); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1280); + KIA_Play_Actor_Dialogue(kActorSteele, 3470); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1300); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1310); + KIA_Play_Actor_Dialogue(kActorSteele, 3480); + KIA_Play_Actor_Dialogue(kActorSteele, 3500); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1320); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1330); + KIA_Play_Actor_Dialogue(kActorSteele, 3510); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1340); + KIA_Play_Actor_Dialogue(kActorSteele, 3520); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1350); + KIA_Play_Actor_Dialogue(kActorSteele, 3530); + KIA_Play_Actor_Dialogue(kActorSteele, 3540); + break; + case kClueGrigorianInterviewB1: + KIA_Play_Actor_Dialogue(kActorSteele, 3550); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1360); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1370); + KIA_Play_Actor_Dialogue(kActorSteele, 3560); + KIA_Play_Actor_Dialogue(kActorSteele, 3570); + break; + case kClueGrigorianInterviewB2: + KIA_Play_Actor_Dialogue(kActorSteele, 3580); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1400); + KIA_Play_Actor_Dialogue(kActorSteele, 3590); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1410); + KIA_Play_Actor_Dialogue(kActorSteele, 3600); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1420); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1430); + KIA_Play_Actor_Dialogue(kActorSteele, 3610); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1440); + KIA_Play_Actor_Dialogue(kActorSteele, 3620); + KIA_Play_Actor_Dialogue(kActorSteele, 3630); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1450); + KIA_Play_Actor_Dialogue(kActorSteele, 3640); + KIA_Play_Actor_Dialogue(kActorGrigorian, 1460); + KIA_Play_Actor_Dialogue(kActorSteele, 3650); + break; + case kClueAnimalMurderSuspect: KIA_Play_Photograph(7); break; - case 244: + case kClueMilitaryBoots: KIA_Play_Photograph(8); - KIA_Play_Actor_Dialogue(99, 4110); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4110); break; - case 245: + case kClueOuterDressingRoom: KIA_Play_Photograph(15); break; - case 246: + case kCluePhotoOfMcCoy1: KIA_Play_Photograph(17); break; - case 247: + case kCluePhotoOfMcCoy2: KIA_Play_Photograph(18); break; - case 248: + case kClueEarlyQAndLucy: KIA_Play_Photograph(1); - KIA_Play_Actor_Dialogue(99, 4260); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4260); break; - case 249: + case kClueClovisflowers: KIA_Play_Photograph(3); - KIA_Play_Actor_Dialogue(99, 4230); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4230); break; - case 250: + case kClueLucyWithDektora: KIA_Play_Photograph(2); - KIA_Play_Actor_Dialogue(99, 4040); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4040); break; - case 251: + case kClueWomanInAnimoidRow: KIA_Play_Photograph(21); break; - case 252: + case kClueScorpions: KIA_Play_Photograph(22); - KIA_Play_Actor_Dialogue(99, 4180); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4180); break; - case 253: + case kClueStrangeScale2: KIA_Play_Photograph(23); break; - case 254: + case kClueChinaBarSecurityCamera: KIA_Play_Photograph(24); break; - case 255: + case kClueIzo: KIA_Play_Photograph(26); break; - case 256: + case kClueGuzza: KIA_Play_Photograph(27); break; - case 257: + case kClueChinaBarSecurityDisc: KIA_Play_Slice_Model(975); break; - case 258: + case kClueScorpionbox: KIA_Play_Photograph(0); break; - case 259: + case kClueTyrellSecurityPhoto: KIA_Play_Photograph(28); break; - case 260: + case kClueChinaBar: KIA_Play_Photograph(19); break; - case 261: + case kCluePlasticExplosive: KIA_Play_Photograph(32); break; - case 262: + case kClueDogCollar2: KIA_Play_Photograph(30); - KIA_Play_Actor_Dialogue(99, 4160); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4160); break; - case 263: + case kClueKingstonKitchenBox2: KIA_Play_Photograph(29); if (Query_Difficulty_Level() == 0) { - KIA_Play_Actor_Dialogue(99, 4140); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4140); } else { - KIA_Play_Actor_Dialogue(99, 4150); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4150); } break; - case 264: + case kClueCrystalsCigarette: KIA_Play_Slice_Model(985); - KIA_Play_Actor_Dialogue(99, 1770); - KIA_Play_Actor_Dialogue(99, 1150); - KIA_Play_Actor_Dialogue(99, 1180); - KIA_Play_Actor_Dialogue(99, 1190); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1770); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1150); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1180); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 1190); break; - case 265: + case kClueSpinnerKeys: KIA_Play_Slice_Model(986); break; - case 269: - KIA_Play_Actor_Dialogue(99, 730); - KIA_Play_Actor_Dialogue(99, 740); - KIA_Play_Actor_Dialogue(99, 750); - KIA_Play_Actor_Dialogue(99, 760); - break; - case 270: - KIA_Play_Actor_Dialogue(99, 670); - KIA_Play_Actor_Dialogue(99, 680); - KIA_Play_Actor_Dialogue(99, 700); - KIA_Play_Actor_Dialogue(99, 710); - KIA_Play_Actor_Dialogue(99, 720); - break; - case 271: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 430); - break; - case 272: - KIA_Play_Actor_Dialogue(39, 420); - KIA_Play_Actor_Dialogue(39, 440); - break; - case 273: - KIA_Play_Actor_Dialogue(0, 1645); - KIA_Play_Actor_Dialogue(6, 240); - KIA_Play_Actor_Dialogue(6, 250); - KIA_Play_Actor_Dialogue(0, 1675); - KIA_Play_Actor_Dialogue(6, 260); - KIA_Play_Actor_Dialogue(6, 270); - break; - case 274: + case kClueExpertBomber: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 730); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 740); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 750); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 760); + break; + case kClueAmateurBomber: + KIA_Play_Actor_Dialogue(kActorVoiceOver, 670); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 680); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 700); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 710); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 720); + break; + case kClueVKLucyReplicant: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 430); + break; + case kClueVKLucyHuman: + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 420); + KIA_Play_Actor_Dialogue(kActorAnsweringMachine, 440); + break; + case kClueLucyInterview: + KIA_Play_Actor_Dialogue(kActorMcCoy, 1645); + KIA_Play_Actor_Dialogue(kActorLucy, 240); + KIA_Play_Actor_Dialogue(kActorLucy, 250); + KIA_Play_Actor_Dialogue(kActorMcCoy, 1675); + KIA_Play_Actor_Dialogue(kActorLucy, 260); + KIA_Play_Actor_Dialogue(kActorLucy, 270); + break; + case kClueMoonbusReflection: KIA_Play_Photograph(35); break; - case 275: + case kClueMcCoyAtMoonbus: KIA_Play_Photograph(36); - KIA_Play_Actor_Dialogue(99, 4240); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4240); break; - case 276: + case kClueClovisAtMoonbus: KIA_Play_Photograph(37); - KIA_Play_Actor_Dialogue(99, 4220); + KIA_Play_Actor_Dialogue(kActorVoiceOver, 4220); break; - case 277: + case kClueSadikAtMoonbus: KIA_Play_Photograph(38); break; - case 278: - KIA_Play_Actor_Dialogue(0, 5365); - KIA_Play_Actor_Dialogue(57, 600); - KIA_Play_Actor_Dialogue(0, 5370); - KIA_Play_Actor_Dialogue(57, 610); - break; - case 279: - KIA_Play_Actor_Dialogue(51, 0); - KIA_Play_Actor_Dialogue(51, 10); - KIA_Play_Actor_Dialogue(51, 20); - KIA_Play_Actor_Dialogue(51, 30); - break; - case 280: - KIA_Play_Actor_Dialogue(15, 630); - KIA_Play_Actor_Dialogue(15, 640); - KIA_Play_Actor_Dialogue(15, 650); + case kClueRachaelInterview: + KIA_Play_Actor_Dialogue(kActorMcCoy, 5365); + KIA_Play_Actor_Dialogue(kActorRachael, 600); + KIA_Play_Actor_Dialogue(kActorMcCoy, 5370); + KIA_Play_Actor_Dialogue(kActorRachael, 610); + break; + case kClueTyrellInterview: + KIA_Play_Actor_Dialogue(kActorTyrell, 0); + KIA_Play_Actor_Dialogue(kActorTyrell, 10); + KIA_Play_Actor_Dialogue(kActorTyrell, 20); + KIA_Play_Actor_Dialogue(kActorTyrell, 30); + break; + case kClueRuncitersConfession1: + KIA_Play_Actor_Dialogue(kActorRunciter, 630); + KIA_Play_Actor_Dialogue(kActorRunciter, 640); + KIA_Play_Actor_Dialogue(kActorRunciter, 650); break; } } diff --git a/engines/bladerunner/script/kia.h b/engines/bladerunner/script/kia.h index 9ad815b37b..f134f8cdff 100644 --- a/engines/bladerunner/script/kia.h +++ b/engines/bladerunner/script/kia.h @@ -33,10 +33,10 @@ class KIAScript : ScriptBase { public: KIAScript(BladeRunnerEngine *vm); - void playClueAssetScript(int a1, int clueId); + void playClueAssetScript(int notUsed, int clueId); private: - void SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int a1, int clueId); + void SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId); }; } // End of namespace BladeRunner diff --git a/engines/bladerunner/script/scene.h b/engines/bladerunner/script/scene.h index b65f5f19b2..9afe69669b 100644 --- a/engines/bladerunner/script/scene.h +++ b/engines/bladerunner/script/scene.h @@ -409,12 +409,12 @@ DECLARE_SCRIPT(PS15) END_SCRIPT DECLARE_SCRIPT(RC01) - void sub_403850(); + void investigateCrowd(); void walkToCenter(); END_SCRIPT DECLARE_SCRIPT(RC02) - void sub_402A7C(); + void dialogueWithRunciter(); END_SCRIPT DECLARE_SCRIPT(RC03) diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp index d63679b093..080f67a5e4 100644 --- a/engines/bladerunner/script/scene/ar01.cpp +++ b/engines/bladerunner/script/scene/ar01.cpp @@ -172,7 +172,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) { Game_Flag_Set(464); Game_Flag_Reset(180); Game_Flag_Set(479); - Set_Enter(8, 31); + Set_Enter(8, kSceneHC01); Actor_Set_Goal_Number(kActorFishDealer, 3); } return true; @@ -181,7 +181,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0, 0.0, -551.0, 0, 1, false, 0)) { Game_Flag_Set(320); Async_Actor_Walk_To_XYZ(kActorMcCoy, -222.0, 0.0, -690.0, 0, false); - Set_Enter(0, 1); + Set_Enter(0, kSceneAR02); Actor_Set_Goal_Number(kActorFishDealer, 3); } return true; @@ -229,63 +229,63 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(252); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 5, 1); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(252); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 5, 1); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(252); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 5, 1); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(252); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 5, 1); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(252); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 5, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(252); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 5, 1); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(252); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 5, 1); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(252); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 5, 1); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(252); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 5, 1); break; default: @@ -351,7 +351,7 @@ void SceneScriptAR01::PlayerWalkedOut() { if (!Game_Flag_Query(322) && !Game_Flag_Query(320)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } } diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp index 0d81c31b8b..614f345076 100644 --- a/engines/bladerunner/script/scene/ar02.cpp +++ b/engines/bladerunner/script/scene/ar02.cpp @@ -201,7 +201,7 @@ 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, 0); + Set_Enter(0, kSceneAR01); } return true; } @@ -212,7 +212,7 @@ bool SceneScriptAR02::ClickedOnExit(int exitId) { Game_Flag_Reset(180); Game_Flag_Set(182); Music_Stop(3); - Set_Enter(70, 80); + Set_Enter(70, kSceneRC03); } return true; } diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp index b5728430da..2c746a769c 100644 --- a/engines/bladerunner/script/scene/bb01.cpp +++ b/engines/bladerunner/script/scene/bb01.cpp @@ -90,14 +90,14 @@ bool SceneScriptBB01::ClickedOnExit(int exitId) { Game_Flag_Set(264); Game_Flag_Reset(258); Game_Flag_Set(177); - Set_Enter(7, 26); + Set_Enter(7, kSceneDR02); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -125.39f, 9.0f, 372.45f, 0, 1, false, 0)) { Game_Flag_Set(262); - Set_Enter(1, 3); + Set_Enter(1, kSceneBB02); } return true; } @@ -114,63 +114,63 @@ bool SceneScriptBB01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(254); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(254); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(254); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(254); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 4, 1); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(254); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 4, 1); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(254); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(254); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(254); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(254); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 4, 1); break; default: diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp index d238617a33..cd182003aa 100644 --- a/engines/bladerunner/script/scene/bb02.cpp +++ b/engines/bladerunner/script/scene/bb02.cpp @@ -92,7 +92,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(263); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); } return true; } @@ -104,7 +104,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) { } Game_Flag_Set(332); Game_Flag_Reset(493); - Set_Enter(1, 5); + Set_Enter(1, kSceneBB04); Scene_Loop_Start_Special(1, 3, false); } return true; @@ -114,7 +114,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, -415.06f, 274.0f, 0, 0, false, 0); Game_Flag_Set(282); Game_Flag_Reset(493); - Set_Enter(21, 4); + Set_Enter(21, kSceneBB03); } return true; } diff --git a/engines/bladerunner/script/scene/bb03.cpp b/engines/bladerunner/script/scene/bb03.cpp index de538c4523..dccbfe0dab 100644 --- a/engines/bladerunner/script/scene/bb03.cpp +++ b/engines/bladerunner/script/scene/bb03.cpp @@ -89,7 +89,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) { Game_Flag_Set(283); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(1, 5); + Set_Enter(1, kSceneBB04); } return true; } @@ -98,7 +98,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) { Game_Flag_Set(281); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(1, 3); + Set_Enter(1, kSceneBB02); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) { Game_Flag_Set(285); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } else { Actor_Says(kActorMcCoy, 8522, 3); } diff --git a/engines/bladerunner/script/scene/bb04.cpp b/engines/bladerunner/script/scene/bb04.cpp index 793f786b5c..7f770a50e5 100644 --- a/engines/bladerunner/script/scene/bb04.cpp +++ b/engines/bladerunner/script/scene/bb04.cpp @@ -87,7 +87,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(333); Game_Flag_Set(493); - Set_Enter(1, 3); + Set_Enter(1, kSceneBB02); } return true; } @@ -96,7 +96,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(284); - Set_Enter(21, 4); + Set_Enter(21, kSceneBB03); } return true; } diff --git a/engines/bladerunner/script/scene/bb05.cpp b/engines/bladerunner/script/scene/bb05.cpp index a1047ccf50..82957b28a5 100644 --- a/engines/bladerunner/script/scene/bb05.cpp +++ b/engines/bladerunner/script/scene/bb05.cpp @@ -101,7 +101,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(286); - Set_Enter(21, 4); + Set_Enter(21, kSceneBB03); } return true; } @@ -110,7 +110,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(297); - Set_Enter(2, 7); + Set_Enter(2, kSceneBB06); } return true; } @@ -119,7 +119,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(299); - Set_Enter(3, 8); + Set_Enter(3, kSceneBB07); } return true; } @@ -128,7 +128,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(301); - Set_Enter(102, 120); + Set_Enter(102, kSceneBB12); } return true; } diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp index 6cdf9076eb..50cdb37f8a 100644 --- a/engines/bladerunner/script/scene/bb06.cpp +++ b/engines/bladerunner/script/scene/bb06.cpp @@ -111,7 +111,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(298); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } return true; } @@ -120,7 +120,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(393); - Set_Enter(1, 104); + Set_Enter(1, kSceneBB51); } return true; } @@ -129,7 +129,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(363); - Set_Enter(2, 8); + Set_Enter(2, kSceneBB07); } return true; } diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp index b53db970eb..351448fa6c 100644 --- a/engines/bladerunner/script/scene/bb07.cpp +++ b/engines/bladerunner/script/scene/bb07.cpp @@ -111,7 +111,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Overlay_Remove("BB07OVER"); Game_Flag_Set(300); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Overlay_Remove("BB07OVER"); Game_Flag_Set(364); - Set_Enter(102, 120); + Set_Enter(102, kSceneBB12); } return true; } @@ -131,7 +131,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Overlay_Remove("BB07OVER"); Game_Flag_Set(362); - Set_Enter(2, 7); + Set_Enter(2, kSceneBB06); } return true; } diff --git a/engines/bladerunner/script/scene/bb08.cpp b/engines/bladerunner/script/scene/bb08.cpp index 6f8eab33c3..298f53a9bc 100644 --- a/engines/bladerunner/script/scene/bb08.cpp +++ b/engines/bladerunner/script/scene/bb08.cpp @@ -88,7 +88,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(218); - Set_Enter(24, 10); + Set_Enter(24, kSceneBB09); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(506); - Set_Enter(102, 120); + Set_Enter(102, kSceneBB12); } return true; } diff --git a/engines/bladerunner/script/scene/bb09.cpp b/engines/bladerunner/script/scene/bb09.cpp index 886b3738e5..bcea82f29b 100644 --- a/engines/bladerunner/script/scene/bb09.cpp +++ b/engines/bladerunner/script/scene/bb09.cpp @@ -86,7 +86,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(216); Game_Flag_Set(220); - Set_Enter(25, 11); + Set_Enter(25, kSceneBB10); } return true; } @@ -95,7 +95,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(219); - Set_Enter(23, 9); + Set_Enter(23, kSceneBB08); } return true; } diff --git a/engines/bladerunner/script/scene/bb10.cpp b/engines/bladerunner/script/scene/bb10.cpp index 281f141689..aec9161c4b 100644 --- a/engines/bladerunner/script/scene/bb10.cpp +++ b/engines/bladerunner/script/scene/bb10.cpp @@ -111,7 +111,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(222); - Set_Enter(26, 12); + Set_Enter(26, kSceneBB11); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Reset(216); Game_Flag_Set(221); - Set_Enter(24, 10); + Set_Enter(24, kSceneBB09); } return true; } diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp index 0216c7b015..3e9aec34b4 100644 --- a/engines/bladerunner/script/scene/bb11.cpp +++ b/engines/bladerunner/script/scene/bb11.cpp @@ -87,7 +87,7 @@ bool SceneScriptBB11::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(223); - Set_Enter(25, 11); + Set_Enter(25, kSceneBB10); } return true; } diff --git a/engines/bladerunner/script/scene/bb12.cpp b/engines/bladerunner/script/scene/bb12.cpp index 289bd3fe4c..8d49377875 100644 --- a/engines/bladerunner/script/scene/bb12.cpp +++ b/engines/bladerunner/script/scene/bb12.cpp @@ -84,7 +84,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(507); - Set_Enter(23, 9); + Set_Enter(23, kSceneBB08); } return true; } @@ -93,7 +93,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(365); - Set_Enter(3, 8); + Set_Enter(3, kSceneBB07); } return true; } @@ -102,7 +102,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(302); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } return true; } diff --git a/engines/bladerunner/script/scene/bb51.cpp b/engines/bladerunner/script/scene/bb51.cpp index ac9f13db47..45eeab4774 100644 --- a/engines/bladerunner/script/scene/bb51.cpp +++ b/engines/bladerunner/script/scene/bb51.cpp @@ -85,7 +85,7 @@ bool SceneScriptBB51::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(394); - Set_Enter(1, 7); + Set_Enter(1, kSceneBB06); } return true; } @@ -94,7 +94,7 @@ bool SceneScriptBB51::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(395); - Set_Enter(1, 7); + Set_Enter(1, kSceneBB06); } return true; } diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp index 6a4d1e4c87..0fe5bf9831 100644 --- a/engines/bladerunner/script/scene/ct01.cpp +++ b/engines/bladerunner/script/scene/ct01.cpp @@ -206,14 +206,14 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 106, 0, 0, false); Player_Gains_Control(); Game_Flag_Reset(247); - Set_Enter(27, 14); + Set_Enter(27, kSceneCT02); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -259.0f, -6.5f, 710.0f, 0, 1, false, 0)) { Game_Flag_Reset(247); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } @@ -221,7 +221,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.0f, -6.5f, 696.0f, 0, 1, false, 0)) { Game_Flag_Set(123); Game_Flag_Reset(247); - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -245,7 +245,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 5, 1); break; case 1: @@ -253,7 +253,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 5, 1); break; case 2: @@ -261,7 +261,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 5, 1); break; case 4: @@ -269,7 +269,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 5, 1); break; case 5: @@ -277,7 +277,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(248); Game_Flag_Reset(247); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 5, 1); break; case 6: @@ -285,7 +285,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 5, 1); break; case 7: @@ -293,7 +293,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 5, 1); break; case 8: @@ -301,7 +301,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 5, 1); break; case 9: @@ -309,7 +309,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 5, 1); break; default: @@ -406,7 +406,7 @@ void SceneScriptCT01::PlayerWalkedOut() { if (!Game_Flag_Query(176) && Global_Variable_Query(1)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } } diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp index 47293d5b2a..85c8fcb818 100644 --- a/engines/bladerunner/script/scene/ct02.cpp +++ b/engines/bladerunner/script/scene/ct02.cpp @@ -227,7 +227,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(234); Game_Flag_Set(68); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); } return true; } @@ -242,7 +242,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(69); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } diff --git a/engines/bladerunner/script/scene/ct03.cpp b/engines/bladerunner/script/scene/ct03.cpp index df8f45e323..a43cdace98 100644 --- a/engines/bladerunner/script/scene/ct03.cpp +++ b/engines/bladerunner/script/scene/ct03.cpp @@ -83,14 +83,14 @@ bool SceneScriptCT03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -745.09f, -619.09f, 293.36f, 0, 1, false, 0)) { Game_Flag_Set(71); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -604.38f, -616.15f, 221.6f, 0, 1, false, 0)) { Game_Flag_Set(70); - Set_Enter(27, 14); + Set_Enter(27, kSceneCT02); } return true; } @@ -98,7 +98,7 @@ bool SceneScriptCT03::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -150.0f, -621.3f, 357.0f, 0, 1, false, 0)) { Game_Flag_Set(72); Async_Actor_Walk_To_XYZ(kActorMcCoy, -67.0f, -621.3f, 477.0f, 0, false); - Set_Enter(5, 16); + Set_Enter(5, kSceneCT04); } return true; } diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp index 17faf0a269..598be6c1b2 100644 --- a/engines/bladerunner/script/scene/ct04.cpp +++ b/engines/bladerunner/script/scene/ct04.cpp @@ -195,7 +195,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) { Actor_Set_Goal_Number(kActorTransient, 2); } Game_Flag_Set(74); - Set_Enter(28, 17); + Set_Enter(28, kSceneCT05); } return true; } @@ -204,7 +204,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(73); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } diff --git a/engines/bladerunner/script/scene/ct05.cpp b/engines/bladerunner/script/scene/ct05.cpp index 992a69dfe2..2522b1d100 100644 --- a/engines/bladerunner/script/scene/ct05.cpp +++ b/engines/bladerunner/script/scene/ct05.cpp @@ -142,7 +142,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) { if (Actor_Query_Goal_Number(kActorGaff) == 1) { Overlay_Remove("ct05over"); } - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -154,7 +154,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) { Actor_Set_Goal_Number(kActorGaff, 5); Game_Flag_Set(409); } - Set_Enter(5, 16); + Set_Enter(5, kSceneCT04); } return true; } @@ -170,7 +170,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) { if (Actor_Query_Goal_Number(kActorGaff) == 1) { Overlay_Remove("ct05over"); } - Set_Enter(29, 18); + Set_Enter(29, kSceneCT06); } return true; } diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp index cebf9d1eef..d04dccf5ed 100644 --- a/engines/bladerunner/script/scene/ct06.cpp +++ b/engines/bladerunner/script/scene/ct06.cpp @@ -121,7 +121,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(78); - Set_Enter(28, 17); + Set_Enter(28, kSceneCT05); Game_Flag_Reset(212); } return true; @@ -147,7 +147,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(79); - Set_Enter(6, 20); + Set_Enter(6, kSceneCT08); Game_Flag_Reset(212); } } diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp index afbe8deea6..e2e6203a0b 100644 --- a/engines/bladerunner/script/scene/ct08.cpp +++ b/engines/bladerunner/script/scene/ct08.cpp @@ -28,15 +28,15 @@ void SceneScriptCT08::InitializeScene() { if (Game_Flag_Query(679)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(2, 0, -1); + Outtake_Play(kOuttakeMovieB1, false, -1); if (Game_Flag_Query(46)) { - Outtake_Play(3, 0, -1); + Outtake_Play(kOuttakeMovieB2, false, -1); } else if (Game_Flag_Query(47)) { - Outtake_Play(4, 0, -1); + Outtake_Play(kOuttakeMovieB3, false, -1); } else { - Outtake_Play(5, 0, -1); + Outtake_Play(kOuttakeMovieB4, false, -1); } - Outtake_Play(6, 0, -1); + Outtake_Play(kOuttakeMovieB5, false, -1); Game_Flag_Reset(679); } Actor_Force_Stop_Walking(kActorMcCoy); @@ -116,7 +116,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(81); - Set_Enter(31, 21); + Set_Enter(31, kSceneCT09); } return true; } @@ -126,7 +126,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(379); - Set_Enter(6, 105); + Set_Enter(6, kSceneCT51); } return true; } @@ -135,7 +135,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(80); - Set_Enter(29, 18); + Set_Enter(29, kSceneCT06); } return true; } diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp index 3c883f4aca..10b0a77f9c 100644 --- a/engines/bladerunner/script/scene/ct09.cpp +++ b/engines/bladerunner/script/scene/ct09.cpp @@ -112,7 +112,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(84); - Set_Enter(6, 20); + Set_Enter(6, kSceneCT08); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(83); - Set_Enter(33, 23); + Set_Enter(33, kSceneCT11); } return true; } @@ -130,7 +130,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(82); - Set_Enter(32, 22); + Set_Enter(32, kSceneCT10); } return true; } diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp index 032f3fb763..186b7678ff 100644 --- a/engines/bladerunner/script/scene/ct10.cpp +++ b/engines/bladerunner/script/scene/ct10.cpp @@ -121,7 +121,7 @@ bool SceneScriptCT10::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(85); - Set_Enter(31, 21); + Set_Enter(31, kSceneCT09); } } return false; diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp index 1aad413d60..3942a89b42 100644 --- a/engines/bladerunner/script/scene/ct11.cpp +++ b/engines/bladerunner/script/scene/ct11.cpp @@ -101,7 +101,7 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 121.0f, 9.6800003f, -42.0f, 0, 1, false, 0)) { Game_Flag_Set(304); - Set_Enter(31, 21); + Set_Enter(31, kSceneCT09); } return true; } @@ -109,7 +109,7 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -300.0f, 9.6800003f, 66.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -400.0f, 9.6800003f, -70.0f, 0, 1, false, 0); Game_Flag_Set(86); - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -118,7 +118,7 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) { Game_Flag_Set(531); Game_Flag_Reset(176); Game_Flag_Set(177); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); } return true; } diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp index 41ebdec25e..826d0945fe 100644 --- a/engines/bladerunner/script/scene/ct12.cpp +++ b/engines/bladerunner/script/scene/ct12.cpp @@ -141,7 +141,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.14999f, -6.5f, 696.94f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Game_Flag_Set(88); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); } return true; } @@ -150,7 +150,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(89); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } @@ -159,7 +159,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(90); - Set_Enter(28, 17); + Set_Enter(28, kSceneCT05); } return true; } @@ -168,7 +168,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(91); - Set_Enter(33, 23); + Set_Enter(33, kSceneCT11); } return true; } @@ -180,7 +180,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(433); - Set_Enter(82, 94); + Set_Enter(82, kSceneUG09); } return true; } diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp index b25a8fd790..73d6d92d7a 100644 --- a/engines/bladerunner/script/scene/ct51.cpp +++ b/engines/bladerunner/script/scene/ct51.cpp @@ -96,7 +96,7 @@ bool SceneScriptCT51::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(380); - Set_Enter(6, 20); + Set_Enter(6, kSceneCT08); } return true; } diff --git a/engines/bladerunner/script/scene/dr01.cpp b/engines/bladerunner/script/scene/dr01.cpp index dd3303ab16..cc6eb640ae 100644 --- a/engines/bladerunner/script/scene/dr01.cpp +++ b/engines/bladerunner/script/scene/dr01.cpp @@ -110,7 +110,7 @@ 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, 26); + Set_Enter(7, kSceneDR02); } return true; } @@ -118,7 +118,7 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { 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, 28); + Set_Enter(7, kSceneDR04); } return true; } @@ -138,55 +138,55 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { Game_Flag_Set(182); Game_Flag_Reset(253); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(253); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(253); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); Game_Flag_Reset(253); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(253); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(253); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(253); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(253); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(253); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); break; default: Player_Loses_Control(); @@ -210,7 +210,7 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { Game_Flag_Set(558); Game_Flag_Set(176); Game_Flag_Reset(177); - Set_Enter(33, 23); + Set_Enter(33, kSceneCT11); } return true; } @@ -252,7 +252,7 @@ void SceneScriptDR01::PlayerWalkedOut() { if (!Game_Flag_Query(10) && !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(35, 1, -1); + Outtake_Play(kOuttakeInside2, true, -1); } } diff --git a/engines/bladerunner/script/scene/dr02.cpp b/engines/bladerunner/script/scene/dr02.cpp index 874a829473..78987dcdc9 100644 --- a/engines/bladerunner/script/scene/dr02.cpp +++ b/engines/bladerunner/script/scene/dr02.cpp @@ -120,7 +120,7 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -835.0f, -0.04f, -118.0f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -727.0f, -0.04f, -118.0f, 0, false); Game_Flag_Set(225); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); } Ambient_Sounds_Adjust_Looping_Sound(219, 12, -101, 1); Ambient_Sounds_Adjust_Looping_Sound(98, 14, -101, 1); @@ -132,7 +132,7 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) { Actor_Says(kActorMcCoy, 8522, 15); } else { Game_Flag_Set(226); - Set_Enter(34, 27); + Set_Enter(34, kSceneDR03); } } return true; @@ -142,7 +142,7 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) { Game_Flag_Set(265); Game_Flag_Reset(177); Game_Flag_Set(258); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); } return true; } diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp index 3fe1a91f64..077eb39eea 100644 --- a/engines/bladerunner/script/scene/dr03.cpp +++ b/engines/bladerunner/script/scene/dr03.cpp @@ -128,7 +128,7 @@ bool SceneScriptDR03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 330.31f, 4.27f, -910.91f, 24, 1, false, 0)) { Game_Flag_Set(227); - Set_Enter(7, 26); + Set_Enter(7, kSceneDR02); } return true; } diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp index b0e6e3bcb7..fe8032997a 100644 --- a/engines/bladerunner/script/scene/dr04.cpp +++ b/engines/bladerunner/script/scene/dr04.cpp @@ -138,7 +138,7 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) { 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, 25); + Set_Enter(7, kSceneDR01); } return true; } @@ -146,7 +146,7 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1067.0f, 7.18f, 421.0f, 0, 1, false, 0)) { Game_Flag_Set(232); Game_Flag_Set(228); - Set_Enter(35, 29); + Set_Enter(35, kSceneDR05); } return true; } @@ -162,7 +162,7 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) { Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false); Footstep_Sound_Override_Off(); Game_Flag_Set(230); - Set_Enter(36, 30); + Set_Enter(36, kSceneDR06); } return true; } diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp index a1c831199b..0793d8bbcc 100644 --- a/engines/bladerunner/script/scene/dr05.cpp +++ b/engines/bladerunner/script/scene/dr05.cpp @@ -108,7 +108,7 @@ bool SceneScriptDR05::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -22.0f, 0.3f, 221.0f, 0, 1, false, 0)) { Game_Flag_Reset(232); Game_Flag_Set(229); - Set_Enter(7, 28); + Set_Enter(7, kSceneDR04); } return true; } diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp index e17a436e33..6f3947c6fb 100644 --- a/engines/bladerunner/script/scene/dr06.cpp +++ b/engines/bladerunner/script/scene/dr06.cpp @@ -180,14 +180,14 @@ bool SceneScriptDR06::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -733.0f, 136.6f, -980.0f, 0, 1, false, 0)) { Game_Flag_Set(231); - Set_Enter(7, 28); + Set_Enter(7, kSceneDR04); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -707.57f, 136.6f, -1132.64f, 0, 1, false, 0)) { Game_Flag_Set(552); - Set_Enter(19, 100); + Set_Enter(19, kSceneUG16); } return true; } diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp index 1505339e68..2169986b9e 100644 --- a/engines/bladerunner/script/scene/hc01.cpp +++ b/engines/bladerunner/script/scene/hc01.cpp @@ -146,7 +146,7 @@ bool SceneScriptHC01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 814.0f, 0.14f, 153.0f, 0, 1, false, 0)) { Music_Adjust(12, 0, 2); Game_Flag_Set(323); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Game_Flag_Reset(479); Game_Flag_Set(180); } @@ -155,7 +155,7 @@ bool SceneScriptHC01::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) { Game_Flag_Set(386); - Set_Enter(8, 33); + Set_Enter(8, kSceneHC03); } return true; } @@ -163,7 +163,7 @@ bool SceneScriptHC01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 105.0f, 0.14f, 103.0f, 0, 1, false, 0)) { Game_Flag_Set(384); Async_Actor_Walk_To_XYZ(kActorMcCoy, -57.0f, 0.14f, 83.0f, 0, false); - Set_Enter(8, 32); + Set_Enter(8, kSceneHC02); } return true; } diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp index a7fe69440b..746a0f487c 100644 --- a/engines/bladerunner/script/scene/hc02.cpp +++ b/engines/bladerunner/script/scene/hc02.cpp @@ -164,7 +164,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(385); - Set_Enter(8, 31); + Set_Enter(8, kSceneHC01); } return true; } @@ -174,7 +174,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(110); Async_Actor_Walk_To_XYZ(kActorMcCoy, -88.0f, 0.14f, -463.0f, 0, false); - Set_Enter(8, 106); + Set_Enter(8, kSceneHC04); } return true; } diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp index 02e88bb3fa..93fea0ac9a 100644 --- a/engines/bladerunner/script/scene/hc03.cpp +++ b/engines/bladerunner/script/scene/hc03.cpp @@ -131,7 +131,7 @@ bool SceneScriptHC03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) { Game_Flag_Set(387); - Set_Enter(8, 31); + Set_Enter(8, kSceneHC01); } return true; } @@ -143,7 +143,7 @@ bool SceneScriptHC03::ClickedOnExit(int exitId) { Game_Flag_Set(259); Game_Flag_Set(388); Music_Stop(2); - Set_Enter(75, 87); + Set_Enter(75, kSceneUG02); } else { Scene_Loop_Set_Default(6); Scene_Loop_Start_Special(kSceneLoopMode2, 5, true); diff --git a/engines/bladerunner/script/scene/hc04.cpp b/engines/bladerunner/script/scene/hc04.cpp index 126d5c3c4f..d83dfc4cf0 100644 --- a/engines/bladerunner/script/scene/hc04.cpp +++ b/engines/bladerunner/script/scene/hc04.cpp @@ -113,14 +113,14 @@ bool SceneScriptHC04::ClickedOnExit(int exitId) { Game_Flag_Set(107); Game_Flag_Reset(479); Game_Flag_Set(182); - Set_Enter(70, 80); + Set_Enter(70, 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, 32); + Set_Enter(8, kSceneHC02); } return true; } diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp index a1560f1944..764a4d536f 100644 --- a/engines/bladerunner/script/scene/hf01.cpp +++ b/engines/bladerunner/script/scene/hf01.cpp @@ -143,7 +143,7 @@ bool SceneScriptHF01::ClickedOnActor(int actorId) { Async_Actor_Walk_To_XYZ(v1, -175.0f, 8.0f, -617.0f, 0, false); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -137.0f, 8.0f, -577.0f, 0, 0, false, 1); Game_Flag_Set(312); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } } } @@ -158,7 +158,7 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -202.0f, 8.0f, -619.0f, 0, 1, false, 0)) { Game_Flag_Set(312); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } return true; } @@ -166,7 +166,7 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 8.0f, -724.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 8.0f, -880.0f, 0, 0, false, 0); Game_Flag_Set(310); - Set_Enter(39, 36); + Set_Enter(39, kSceneHF03); } return true; } @@ -174,7 +174,7 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 406.0f, 8.0f, -717.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 406.0f, 8.0f, -813.0f, 0, 0, false, 0); Game_Flag_Set(308); - Set_Enter(38, 35); + Set_Enter(38, kSceneHF02); } return true; } @@ -192,63 +192,63 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(256); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(256); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(256); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(256); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 4, 1); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(256); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 4, 1); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(256); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(256); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(256); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(256); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; default: @@ -353,8 +353,8 @@ void SceneScriptHF01::PlayerWalkedOut() { if (!Game_Flag_Query(312) && !Game_Flag_Query(308) && !Game_Flag_Query(310) && !Game_Flag_Query(722)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(35, 1, -1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeInside2, true, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } Game_Flag_Reset(722); if (Actor_Query_Goal_Number(kActorLucy) == 450) { diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp index ffa32a8ca4..258b942f3f 100644 --- a/engines/bladerunner/script/scene/hf02.cpp +++ b/engines/bladerunner/script/scene/hf02.cpp @@ -88,7 +88,7 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(309); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(527); - Set_Enter(39, 36); + Set_Enter(39, kSceneHF03); } return true; } diff --git a/engines/bladerunner/script/scene/hf03.cpp b/engines/bladerunner/script/scene/hf03.cpp index f957a29daa..1117f222da 100644 --- a/engines/bladerunner/script/scene/hf03.cpp +++ b/engines/bladerunner/script/scene/hf03.cpp @@ -190,21 +190,21 @@ bool SceneScriptHF03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, 46.76f, -824.0f, 0, 1, false, 0)) { Game_Flag_Set(311); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 479.0f, 47.76f, -524.0f, 0, 1, false, 0)) { Game_Flag_Set(528); - Set_Enter(38, 35); + Set_Enter(38, kSceneHF02); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 942.0f, 47.76f, -847.0f, 0, 1, false, 0)) { Game_Flag_Set(566); - Set_Enter(40, 37); + Set_Enter(40, kSceneHF04); } return true; } diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp index aaa3e8f25e..f96053a773 100644 --- a/engines/bladerunner/script/scene/hf04.cpp +++ b/engines/bladerunner/script/scene/hf04.cpp @@ -84,7 +84,7 @@ bool SceneScriptHF04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(567); - Set_Enter(38, 35); + Set_Enter(38, kSceneHF02); } return true; } diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp index 8106f71242..ea1fe7f28d 100644 --- a/engines/bladerunner/script/scene/hf05.cpp +++ b/engines/bladerunner/script/scene/hf05.cpp @@ -146,7 +146,7 @@ bool SceneScriptHF05::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 483.0f, 40.63f, -189.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) { Game_Flag_Set(313); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } return true; } @@ -158,14 +158,14 @@ bool SceneScriptHF05::ClickedOnExit(int exitId) { Actor_Says(kActorMcCoy, 1810, 16); } Game_Flag_Set(359); - Set_Enter(43, 40); + Set_Enter(43, kSceneHF07); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 277.0f, 40.631f, 410.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) { Game_Flag_Set(529); - Set_Enter(42, 39); + Set_Enter(42, kSceneHF06); } return true; } @@ -469,10 +469,10 @@ void SceneScriptHF05::sub_403738() { Actor_Set_Goal_Number(kActorCrazylegs, 699); Game_Flag_Set(652); if (Game_Flag_Query(255)) { - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } else { Game_Flag_Set(313); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } } else if (answer == 1260) { Actor_Says(kActorMcCoy, 1965, 12); @@ -588,7 +588,7 @@ void SceneScriptHF05::sub_403A34(int actorId) { Async_Actor_Walk_To_XYZ(actorId, 309.0f, 40.63f, 402.0f, 0, false); Loop_Actor_Walk_To_XYZ(kActorMcCoy, 277.0f, 40.63f, 410.0f, 0, 0, false, 0); Game_Flag_Set(529); - Set_Enter(42, 39); + Set_Enter(42, kSceneHF06); } } diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp index cd5651af0f..406e4e5a92 100644 --- a/engines/bladerunner/script/scene/hf06.cpp +++ b/engines/bladerunner/script/scene/hf06.cpp @@ -126,7 +126,7 @@ bool SceneScriptHF06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(530); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } return true; } diff --git a/engines/bladerunner/script/scene/hf07.cpp b/engines/bladerunner/script/scene/hf07.cpp index 1669afb104..bdd748fdf0 100644 --- a/engines/bladerunner/script/scene/hf07.cpp +++ b/engines/bladerunner/script/scene/hf07.cpp @@ -83,7 +83,7 @@ bool SceneScriptHF07::ClickedOnExit(int exitId) { } Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptHF07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(360); - Set_Enter(78, 90); + Set_Enter(78, kSceneUG05); } return true; } diff --git a/engines/bladerunner/script/scene/kp01.cpp b/engines/bladerunner/script/scene/kp01.cpp index e70a8d5375..af6f57f759 100644 --- a/engines/bladerunner/script/scene/kp01.cpp +++ b/engines/bladerunner/script/scene/kp01.cpp @@ -83,7 +83,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(415); - Set_Enter(47, 44); + Set_Enter(47, kSceneKP04); } return true; } @@ -92,7 +92,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(417); - Set_Enter(46, 43); + Set_Enter(46, kSceneKP03); } return true; } @@ -101,7 +101,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(414); - Set_Enter(45, 42); + Set_Enter(45, kSceneKP02); } return true; } @@ -136,7 +136,7 @@ void SceneScriptKP01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(417); - Set_Enter(46, 43); + Set_Enter(46, kSceneKP03); //return true; } } diff --git a/engines/bladerunner/script/scene/kp02.cpp b/engines/bladerunner/script/scene/kp02.cpp index e4e47da83a..1e83d1e310 100644 --- a/engines/bladerunner/script/scene/kp02.cpp +++ b/engines/bladerunner/script/scene/kp02.cpp @@ -84,12 +84,12 @@ bool SceneScriptKP02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(411); - Set_Enter(84, 96); + Set_Enter(84, kSceneUG12); } else { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(411); - Set_Enter(84, 96); + Set_Enter(84, kSceneUG12); } } return true; @@ -104,12 +104,12 @@ bool SceneScriptKP02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(413); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } else { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(413); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } } return true; diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp index 4071fd6a15..27f1ee2583 100644 --- a/engines/bladerunner/script/scene/kp03.cpp +++ b/engines/bladerunner/script/scene/kp03.cpp @@ -127,7 +127,7 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) { Game_Flag_Reset(417); Game_Flag_Reset(420); Game_Flag_Set(419); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); } return true; } @@ -139,7 +139,7 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) { Game_Flag_Reset(417); Game_Flag_Reset(420); Game_Flag_Set(418); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } return true; } @@ -255,7 +255,7 @@ void SceneScriptKP03::sub_401E54() { Game_Flag_Reset(417); Game_Flag_Reset(420); Game_Flag_Set(419); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); Player_Gains_Control(); } diff --git a/engines/bladerunner/script/scene/kp04.cpp b/engines/bladerunner/script/scene/kp04.cpp index 5da5050dd3..daa95f866a 100644 --- a/engines/bladerunner/script/scene/kp04.cpp +++ b/engines/bladerunner/script/scene/kp04.cpp @@ -74,7 +74,7 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(416); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } return true; } @@ -83,7 +83,7 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(574); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); } return true; } diff --git a/engines/bladerunner/script/scene/kp05.cpp b/engines/bladerunner/script/scene/kp05.cpp index d957c70693..11a246b301 100644 --- a/engines/bladerunner/script/scene/kp05.cpp +++ b/engines/bladerunner/script/scene/kp05.cpp @@ -88,7 +88,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(420); - Set_Enter(46, 43); + Set_Enter(46, kSceneKP03); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(575); - Set_Enter(47, 44); + Set_Enter(47, kSceneKP04); } return true; } @@ -107,7 +107,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(576); Async_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -216.0f, 0, false); - Set_Enter(9, 46); + Set_Enter(9, kSceneKP06); } return true; } diff --git a/engines/bladerunner/script/scene/kp06.cpp b/engines/bladerunner/script/scene/kp06.cpp index e9fab6dae9..e237bfaf5d 100644 --- a/engines/bladerunner/script/scene/kp06.cpp +++ b/engines/bladerunner/script/scene/kp06.cpp @@ -101,7 +101,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(577); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); } return true; } @@ -120,7 +120,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(578); - Set_Enter(48, 47); + Set_Enter(48, kSceneKP07); } } else if (Actor_Clue_Query(kActorMcCoy, kCluePowerSource) ) { Actor_Says(kActorSadik, 280, 3); @@ -131,7 +131,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(578); - Set_Enter(48, 47); + Set_Enter(48, kSceneKP07); } else { Actor_Set_Goal_Number(kActorSadik, 417); } @@ -175,7 +175,7 @@ void SceneScriptKP06::PlayerWalkedIn() { Delay(3000); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(25, 0, -1); + Outtake_Play(kOuttakeEnd6, false, -1); Game_Over(); //return true; return; @@ -206,7 +206,7 @@ void SceneScriptKP06::PlayerWalkedIn() { Async_Actor_Walk_To_Waypoint(kActorGaff, 551, 0, 0); Actor_Says(kActorGaff, 310, -1); Delay(3000); - Outtake_Play(26, 0, -1); + Outtake_Play(kOuttakeEnd7, false, -1); Game_Over(); //return true; return; diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp index 9ebb9967df..0b6558ef81 100644 --- a/engines/bladerunner/script/scene/kp07.cpp +++ b/engines/bladerunner/script/scene/kp07.cpp @@ -122,7 +122,7 @@ bool SceneScriptKP07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(579); - Set_Enter(9, 46); + Set_Enter(9, kSceneKP06); } return true; } diff --git a/engines/bladerunner/script/scene/ma01.cpp b/engines/bladerunner/script/scene/ma01.cpp index f4963143e5..289f5b0203 100644 --- a/engines/bladerunner/script/scene/ma01.cpp +++ b/engines/bladerunner/script/scene/ma01.cpp @@ -98,7 +98,7 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagMA01toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); } return true; } @@ -121,63 +121,63 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationRuncitersAnimals: Game_Flag_Set(182); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationChinatown: Game_Flag_Set(176); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationTyrellBuilding: Game_Flag_Set(261); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationAnimoidRow: Game_Flag_Set(180); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationDNARow: Game_Flag_Set(177); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationBradburyBuilding: Game_Flag_Set(258); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationNightclubRow: Game_Flag_Set(181); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationHysteriaHall: Game_Flag_Set(257); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; default: @@ -245,9 +245,9 @@ void SceneScriptMA01::PlayerWalkedOut() { if (!Game_Flag_Query(37) && Global_Variable_Query(1) == 1) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(37, 1, -1); - Outtake_Play(34, 1, -1); - Outtake_Play(36, 1, -1); + Outtake_Play(kOuttakeTowards2, true, -1); + Outtake_Play(kOuttakeInside1, true, -1); + Outtake_Play(kOuttakeTowards1, true, -1); } } diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp index 62b5d68cf9..0bdb0d2f2c 100644 --- a/engines/bladerunner/script/scene/ma02.cpp +++ b/engines/bladerunner/script/scene/ma02.cpp @@ -120,14 +120,14 @@ bool SceneScriptMA02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, 1, false, 0)) { Music_Stop(10); Game_Flag_Set(kFlagMA02toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -168.0f, -144.13f, 10.27f, 0, 1, false, 0)) { Game_Flag_Set(kFlagMA02ToMA04); - Set_Enter(50, 50); + Set_Enter(50, kSceneMA04); } return true; } @@ -157,7 +157,7 @@ void SceneScriptMA02::PlayerWalkedIn() { sub_401E4C(); Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, 0, false, 0); Game_Flag_Set(kFlagMA02toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); // return true; return; } diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp index 4b2e65ef98..13ca308227 100644 --- a/engines/bladerunner/script/scene/ma04.cpp +++ b/engines/bladerunner/script/scene/ma04.cpp @@ -109,7 +109,7 @@ bool SceneScriptMA04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7099.0f, 954.0f, 1866.0f, 0, 1, false, 0)) { Game_Flag_Set(kFlagMA04ToMA02); - Set_Enter(10, 49); + Set_Enter(10, kSceneMA02); } return true; } @@ -125,7 +125,7 @@ bool SceneScriptMA04::ClickedOnExit(int exitId) { if (Global_Variable_Query(1) != 2 && Global_Variable_Query(1) != 3) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 956.17f, 1568.0f, 0, false); } - Set_Enter(51, 51); + Set_Enter(51, kSceneMA05); } return true; } @@ -290,7 +290,7 @@ void SceneScriptMA04::PlayerWalkedIn() { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1675.0f, 0, 1, false, 0); Game_Flag_Set(146); Async_Actor_Walk_To_XYZ(kActorMcCoy, -7204.0f, 956.17f, 1568.0f, 0, false); - Set_Enter(51, 51); + Set_Enter(51, kSceneMA05); } } @@ -300,7 +300,7 @@ void SceneScriptMA04::PlayerWalkedOut() { if (Game_Flag_Query(678)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(1, 0, -1); + Outtake_Play(kOuttakeMovieA, false, -1); Game_Flag_Reset(678); } } @@ -556,7 +556,7 @@ void SceneScriptMA04::sleep() { } } } else { - Set_Enter(10, 50); + Set_Enter(10, kSceneMA04); } Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, false); } diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp index a1f3288b0e..a086a25c87 100644 --- a/engines/bladerunner/script/scene/ma05.cpp +++ b/engines/bladerunner/script/scene/ma05.cpp @@ -82,7 +82,7 @@ bool SceneScriptMA05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 953.97f, 1685.0f, 0, false); - Set_Enter(50, 50); + Set_Enter(50, kSceneMA04); } return true; } diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp index e545e291b3..df325fece7 100644 --- a/engines/bladerunner/script/scene/ma06.cpp +++ b/engines/bladerunner/script/scene/ma06.cpp @@ -83,11 +83,11 @@ void SceneScriptMA06::PlayerWalkedIn() { Game_Flag_Reset(kFlagMA07toMA06); if (Game_Flag_Query(kFlagMA06toMA01)) { - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); } else if (Game_Flag_Query(kFlagMA06ToMA02)) { - Set_Enter(10, 49); + Set_Enter(10, kSceneMA02); } else { // kFlagMA06ToMA07 - Set_Enter(53, 53); + Set_Enter(53, kSceneMA07); } Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, true); Sound_Play(208, 100, 50, 50, 50); diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp index aa87a37721..bdba1a0371 100644 --- a/engines/bladerunner/script/scene/ma07.cpp +++ b/engines/bladerunner/script/scene/ma07.cpp @@ -79,7 +79,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagMA07toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); } } return true; @@ -91,7 +91,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) { Game_Flag_Set(672); Game_Flag_Reset(179); Game_Flag_Set(178); - Set_Enter(68, 77); + Set_Enter(68, kScenePS14); } return true; } @@ -100,7 +100,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(357); - Set_Enter(90, 103); + Set_Enter(90, kSceneUG19); } return true; } @@ -144,7 +144,7 @@ void SceneScriptMA07::PlayerWalkedIn() { Delay(1000); Game_Flag_Reset(666); Game_Flag_Set(kFlagMA06ToMA02); - Set_Enter(10, 49); + Set_Enter(10, kSceneMA02); } //return false; diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp index 3a5ef197d6..da71325115 100644 --- a/engines/bladerunner/script/scene/nr01.cpp +++ b/engines/bladerunner/script/scene/nr01.cpp @@ -116,7 +116,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(535); - Set_Enter(55, 56); + Set_Enter(55, kSceneNR03); } } return true; @@ -128,7 +128,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(343); - Set_Enter(79, 91); + Set_Enter(79, kSceneUG06); } return true; } @@ -137,7 +137,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(532); - Set_Enter(11, 55); + Set_Enter(11, kSceneNR02); } return true; } @@ -156,7 +156,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(255); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 3, 1); break; case 7: @@ -164,7 +164,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 3, 1); break; case 6: @@ -172,7 +172,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 3, 1); break; case 5: @@ -180,7 +180,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 3, 1); break; case 4: @@ -188,7 +188,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 3, 1); break; case 3: @@ -196,7 +196,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 3, 1); break; case 2: @@ -204,7 +204,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 3, 1); break; case 1: @@ -212,7 +212,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 3, 1); break; case 0: @@ -220,7 +220,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); break; default: @@ -303,7 +303,7 @@ void SceneScriptNR01::PlayerWalkedIn() { } if (Game_Flag_Query(632)) { Delay(3500); - Set_Enter(60, 64); + Set_Enter(60, kSceneNR11); //return true; return; } @@ -421,8 +421,8 @@ void SceneScriptNR01::PlayerWalkedOut() { if (!Game_Flag_Query(343) && !Game_Flag_Query(532) && !Game_Flag_Query(535) && !Game_Flag_Query(632) && !Game_Flag_Query(722)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(30, 1, -1); - Outtake_Play(35, 1, -1); + Outtake_Play(kOuttakeAway1, true, -1); + Outtake_Play(kOuttakeInside2, true, -1); } Game_Flag_Reset(722); } diff --git a/engines/bladerunner/script/scene/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp index a6ccb5c40b..adb15ffce8 100644 --- a/engines/bladerunner/script/scene/nr02.cpp +++ b/engines/bladerunner/script/scene/nr02.cpp @@ -129,7 +129,7 @@ bool SceneScriptNR02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(533); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } return true; } diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp index 0ceb8e548e..dfeacb16f4 100644 --- a/engines/bladerunner/script/scene/nr03.cpp +++ b/engines/bladerunner/script/scene/nr03.cpp @@ -131,7 +131,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(534); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } return true; } @@ -157,7 +157,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(438); - Set_Enter(12, 57); + Set_Enter(12, kSceneNR04); } return true; @@ -173,7 +173,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(536); - Set_Enter(13, 58); + Set_Enter(13, kSceneNR05); Scene_Loop_Start_Special(1, 2, 0); return true; } diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp index 1d8446f41f..1f5ee4727d 100644 --- a/engines/bladerunner/script/scene/nr04.cpp +++ b/engines/bladerunner/script/scene/nr04.cpp @@ -137,7 +137,7 @@ bool SceneScriptNR04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(437); - Set_Enter(55, 56); + Set_Enter(55, kSceneNR03); } return true; } diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp index 2fa72c2fcd..ac58901f1f 100644 --- a/engines/bladerunner/script/scene/nr05.cpp +++ b/engines/bladerunner/script/scene/nr05.cpp @@ -119,7 +119,7 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 1021, false); Actor_Change_Animation_Mode(kActorMcCoy, 53); Game_Flag_Set(537); - Set_Enter(55, 56); + Set_Enter(55, kSceneNR03); Scene_Loop_Start_Special(1, 3, 0); } return true; @@ -127,7 +127,7 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -777.56f, 0.0f, -166.86f, 0, 1, false, 0)) { Game_Flag_Set(546); - Set_Enter(13, 61); + Set_Enter(13, kSceneNR08); } return true; } diff --git a/engines/bladerunner/script/scene/nr06.cpp b/engines/bladerunner/script/scene/nr06.cpp index 6e3dc354d1..25d1148189 100644 --- a/engines/bladerunner/script/scene/nr06.cpp +++ b/engines/bladerunner/script/scene/nr06.cpp @@ -84,7 +84,7 @@ bool SceneScriptNR06::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 48.0f, -71.88f, -26.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Game_Flag_Set(441); - Set_Enter(57, 60); + Set_Enter(57, kSceneNR07); } return true; } @@ -96,7 +96,7 @@ bool SceneScriptNR06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(439); - Set_Enter(13, 61); + Set_Enter(13, kSceneNR08); } return true; } diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp index 8e9c7847dc..dde74478b8 100644 --- a/engines/bladerunner/script/scene/nr07.cpp +++ b/engines/bladerunner/script/scene/nr07.cpp @@ -121,7 +121,7 @@ bool SceneScriptNR07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(442); - Set_Enter(56, 59); + Set_Enter(56, kSceneNR06); } return true; } @@ -307,7 +307,7 @@ void SceneScriptNR07::sub_402284() { Actor_Says(kActorDektora, 720, 30); Actor_Says(kActorDektora, 730, 30); Actor_Says(kActorMcCoy, 3685, 13); - Voight_Kampff_Activate(3, 40); + Voight_Kampff_Activate(kActorDektora, 40); if (Game_Flag_Query(47)) { sub_401A10(); } else { diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp index b00daff531..346d71a7fe 100644 --- a/engines/bladerunner/script/scene/nr08.cpp +++ b/engines/bladerunner/script/scene/nr08.cpp @@ -97,7 +97,7 @@ bool SceneScriptNR08::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1102.88f, 0.0f, 107.43f, 0, 1, false, 0)) { Game_Flag_Set(547); - Set_Enter(13, 58); + Set_Enter(13, kSceneNR05); } return true; } @@ -106,7 +106,7 @@ bool SceneScriptNR08::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 505, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 1, 0); Game_Flag_Set(440); - Set_Enter(56, 59); + Set_Enter(56, kSceneNR06); } return true; } @@ -117,7 +117,7 @@ bool SceneScriptNR08::ClickedOnExit(int exitId) { Loop_Actor_Travel_Stairs(kActorMcCoy, 6, 1, 0); Footstep_Sound_Override_Off(); Game_Flag_Set(614); - Set_Enter(58, 62); + Set_Enter(58, kSceneNR09); } } return false; @@ -175,7 +175,7 @@ void SceneScriptNR08::PlayerWalkedIn() { } else { Game_Flag_Set(729); Ambient_Sounds_Play_Sound(566, 27, 0, 99, 0); - Outtake_Play(40, 1, -1); + Outtake_Play(kOuttakeDektora, true, -1); } if (Actor_Query_Goal_Number(kActorDektora) == 245) { Actor_Face_Heading(kActorDektora, 790, false); diff --git a/engines/bladerunner/script/scene/nr09.cpp b/engines/bladerunner/script/scene/nr09.cpp index a10f252492..0fda348f12 100644 --- a/engines/bladerunner/script/scene/nr09.cpp +++ b/engines/bladerunner/script/scene/nr09.cpp @@ -75,7 +75,7 @@ bool SceneScriptNR09::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -564.07f, 0.35f, 399.04f, 0, 1, false, 0)) { Game_Flag_Set(475); - Set_Enter(59, 63); + Set_Enter(59, kSceneNR10); return true; } } @@ -85,7 +85,7 @@ bool SceneScriptNR09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); if (!v1) { Game_Flag_Set(615); - Set_Enter(13, 61); + Set_Enter(13, kSceneNR08); return true; } } diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp index 8c07ac47a1..a898daa7d2 100644 --- a/engines/bladerunner/script/scene/nr10.cpp +++ b/engines/bladerunner/script/scene/nr10.cpp @@ -91,7 +91,7 @@ bool SceneScriptNR10::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.78f, 2.84f, -238.43f, 0, 1, false, 0)) { Game_Flag_Set(476); - Set_Enter(58, 62); + Set_Enter(58, kSceneNR09); return true; } } @@ -100,7 +100,7 @@ bool SceneScriptNR10::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 55, false); Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 1, 0); Game_Flag_Set(641); - Set_Enter(60, 64); + Set_Enter(60, kSceneNR11); return true; } } diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp index 8c282d3387..915c5a9738 100644 --- a/engines/bladerunner/script/scene/nr11.cpp +++ b/engines/bladerunner/script/scene/nr11.cpp @@ -208,7 +208,7 @@ bool SceneScriptNR11::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 100.0f, 1.75f, -8.0f, 0, 1, false, 0)) { Game_Flag_Set(477); - Set_Enter(59, 63); + Set_Enter(59, kSceneNR10); return true; } } diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp index ba9015823d..5e31057dde 100644 --- a/engines/bladerunner/script/scene/ps01.cpp +++ b/engines/bladerunner/script/scene/ps01.cpp @@ -80,7 +80,7 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1920.0f, 16581.0f, -2653.0f, 12, 1, false, 0)) { Game_Flag_Set(718); - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); } return true; } @@ -101,63 +101,63 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) { Game_Flag_Set(182); Game_Flag_Reset(251); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(251); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(251); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 4, 1); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(251); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 4, 1); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(251); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(251); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(251); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(251); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(251); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 4, 1); break; default: @@ -267,7 +267,7 @@ void SceneScriptPS01::PlayerWalkedOut() { if (!Game_Flag_Query(718) && Global_Variable_Query(1) == 1) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } } diff --git a/engines/bladerunner/script/scene/ps02.cpp b/engines/bladerunner/script/scene/ps02.cpp index 0fe062b099..16e23b0dba 100644 --- a/engines/bladerunner/script/scene/ps02.cpp +++ b/engines/bladerunner/script/scene/ps02.cpp @@ -53,34 +53,34 @@ bool SceneScriptPS02::ClickedOn3DObject(const char *objectName, bool a2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(22) ) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(131) ) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(66, 71); + Set_Enter(66, kScenePS07); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(132) ) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(133) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(67, 72); + Set_Enter(67, kScenePS09); Scene_Loop_Start_Special(1, 3, 1); } } @@ -123,19 +123,19 @@ void SceneScriptPS02::PlayerWalkedIn() { sub_4018BC(); Player_Loses_Control(); if (Game_Flag_Query(130) ) { - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(22) ) { - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(131) ) { - Set_Enter(66, 71); + Set_Enter(66, kScenePS07); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(132) ) { - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(133) ) { - Set_Enter(67, 72); + Set_Enter(67, kScenePS09); Scene_Loop_Start_Special(1, 3, 1); } //return true; diff --git a/engines/bladerunner/script/scene/ps03.cpp b/engines/bladerunner/script/scene/ps03.cpp index d56e0aa943..cad54b7768 100644 --- a/engines/bladerunner/script/scene/ps03.cpp +++ b/engines/bladerunner/script/scene/ps03.cpp @@ -79,7 +79,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) { Game_Flag_Set(42); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(64, 68); + Set_Enter(64, 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, 66); + Set_Enter(62, kScenePS02); Game_Flag_Reset(478); if (Global_Variable_Query(1) < 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, 77); + Set_Enter(68, kScenePS14); } return true; } diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp index a6b855ed2f..ef0b2d64c5 100644 --- a/engines/bladerunner/script/scene/ps04.cpp +++ b/engines/bladerunner/script/scene/ps04.cpp @@ -103,7 +103,7 @@ bool SceneScriptPS04::ClickedOnExit(int exitId) { Game_Flag_Set(39); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); } return true; } diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp index 32eb5d5b46..c93db0b22f 100644 --- a/engines/bladerunner/script/scene/ps05.cpp +++ b/engines/bladerunner/script/scene/ps05.cpp @@ -99,7 +99,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 2, 24, 1, false)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(101, 119); + Set_Enter(101, kScenePS15); } return true; } @@ -107,7 +107,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 635.0f, 0.0f, -598.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); } return true; } @@ -116,7 +116,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) { Game_Flag_Set(136); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(65, 70); + Set_Enter(65, kScenePS06); } return true; } diff --git a/engines/bladerunner/script/scene/ps06.cpp b/engines/bladerunner/script/scene/ps06.cpp index f51ee7cf01..bf25f799ce 100644 --- a/engines/bladerunner/script/scene/ps06.cpp +++ b/engines/bladerunner/script/scene/ps06.cpp @@ -106,7 +106,7 @@ bool SceneScriptPS06::ClickedOnExit(int exitId) { Game_Flag_Set(23); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); return true; } return false; diff --git a/engines/bladerunner/script/scene/ps07.cpp b/engines/bladerunner/script/scene/ps07.cpp index ffe51c2f63..01285f5280 100644 --- a/engines/bladerunner/script/scene/ps07.cpp +++ b/engines/bladerunner/script/scene/ps07.cpp @@ -137,7 +137,7 @@ bool SceneScriptPS07::ClickedOnItem(int itemId, bool a2) { bool SceneScriptPS07::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 609.07f, 0.22f, -598.67f, 0, 0, false, 0)) { - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); } return true; } diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp index 848999063e..8b21415564 100644 --- a/engines/bladerunner/script/scene/ps09.cpp +++ b/engines/bladerunner/script/scene/ps09.cpp @@ -179,7 +179,7 @@ bool SceneScriptPS09::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -559.15f, 0.0f, -85.06f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); Game_Flag_Reset(211); } return true; @@ -340,7 +340,7 @@ void SceneScriptPS09::sub_402090() { Actor_Says(kActorGrigorian, 410, 16); Actor_Says(kActorMcCoy, 4405, 14); Actor_Says(kActorMcCoy, 4410, 15); - Voight_Kampff_Activate(11, 20); + Voight_Kampff_Activate(kActorGrigorian, 20); Actor_Modify_Friendliness_To_Other(kActorGrigorian, kActorMcCoy, -10); break; case 210: diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp index 5811bdcc7a..059f802fa0 100644 --- a/engines/bladerunner/script/scene/ps10.cpp +++ b/engines/bladerunner/script/scene/ps10.cpp @@ -190,7 +190,7 @@ bool SceneScriptPS10::ClickedOnExit(int exitId) { sub_402238(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(10)); Global_Variable_Set(10, 20); - Set_Enter(14, 74); + Set_Enter(14, kScenePS11); } return true; } diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp index dba7f1abd5..f3dd32b322 100644 --- a/engines/bladerunner/script/scene/ps11.cpp +++ b/engines/bladerunner/script/scene/ps11.cpp @@ -226,7 +226,7 @@ bool SceneScriptPS11::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 6, 12, 1, false)) { Game_Flag_Set(15); sub_402744(); - Set_Enter(14, 73); + Set_Enter(14, kScenePS10); } return true; } @@ -236,7 +236,7 @@ bool SceneScriptPS11::ClickedOnExit(int exitId) { sub_402744(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(11)); Global_Variable_Set(11, 20); - Set_Enter(14, 75); + Set_Enter(14, kScenePS12); } return true; } diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp index f93af346b7..04322f28dd 100644 --- a/engines/bladerunner/script/scene/ps12.cpp +++ b/engines/bladerunner/script/scene/ps12.cpp @@ -235,7 +235,7 @@ bool SceneScriptPS12::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 8, 12, 1, false)) { Game_Flag_Set(17); sub_4028C4(); - Set_Enter(14, 74); + Set_Enter(14, kScenePS11); } return true; } @@ -248,7 +248,7 @@ bool SceneScriptPS12::ClickedOnExit(int exitId) { sub_4028C4(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(12)); Global_Variable_Set(12, 20); - Set_Enter(14, 76); + Set_Enter(14, kScenePS13); } return true; } diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp index c2c46335a3..ac0509dfde 100644 --- a/engines/bladerunner/script/scene/ps13.cpp +++ b/engines/bladerunner/script/scene/ps13.cpp @@ -219,7 +219,7 @@ bool SceneScriptPS13::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 10, 12, 1, false)) { Game_Flag_Set(19); sub_40267C(); - Set_Enter(14, 75); + Set_Enter(14, kScenePS12); } return true; } @@ -237,7 +237,7 @@ bool SceneScriptPS13::ClickedOnExit(int exitId) { Global_Variable_Reset(12); Global_Variable_Reset(13); Global_Variable_Reset(9); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); } return true; } diff --git a/engines/bladerunner/script/scene/ps14.cpp b/engines/bladerunner/script/scene/ps14.cpp index f7e538ebd1..f68936ee99 100644 --- a/engines/bladerunner/script/scene/ps14.cpp +++ b/engines/bladerunner/script/scene/ps14.cpp @@ -83,7 +83,7 @@ bool SceneScriptPS14::ClickedOnExit(int exitId) { Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 0, 0); } else { Game_Flag_Set(135); - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); } } return true; @@ -93,7 +93,7 @@ bool SceneScriptPS14::ClickedOnExit(int exitId) { Game_Flag_Set(673); Game_Flag_Reset(178); Game_Flag_Set(179); - Set_Enter(53, 53); + Set_Enter(53, kSceneMA07); } return true; } diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp index bb1c451223..4d0a350818 100644 --- a/engines/bladerunner/script/scene/ps15.cpp +++ b/engines/bladerunner/script/scene/ps15.cpp @@ -108,7 +108,7 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(204); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); } return true; } @@ -119,7 +119,7 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) { Sound_Play(155, 90, 0, 0, 50); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(14, 73); + Set_Enter(14, kScenePS10); } return true; } diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp index 347f0e8dcb..fd1304d5df 100644 --- a/engines/bladerunner/script/scene/rc01.cpp +++ b/engines/bladerunner/script/scene/rc01.cpp @@ -27,7 +27,7 @@ namespace BladeRunner { void SceneScriptRC01::InitializeScene() { #if BLADERUNNER_DEBUG_GAME //TODO: not part of game, remove - Game_Flag_Set(kFlagIntroPlayed); // force skip intro + // Game_Flag_Set(kFlagIntroPlayed); // force skip intro Game_Flag_Set(kFlagRC02toRC01); // no landing // Game_Flag_Set(kFlagRC01PoliceDone); // Game_Flag_Set(kFlagKIAPrivacyAddon); @@ -212,7 +212,7 @@ bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) { || Object_Query_Click("70_3", objectName) || Object_Query_Click("70_5", objectName) || Object_Query_Click("70_6", objectName)) { - sub_403850(); + investigateCrowd(); return true; } @@ -345,7 +345,6 @@ bool SceneScriptRC01::ClickedOnItem(int itemId, bool a2) { return true; } return false; - } void SceneScriptRC01::walkToCenter() { @@ -367,7 +366,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { case 1: case 4: Game_Flag_Set(8); - Set_Enter(16, 79); + Set_Enter(16, kSceneRC02); break; case 2: case 3: @@ -416,7 +415,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(249); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -427,7 +426,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(179); Game_Flag_Reset(249); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -438,7 +437,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(176); Game_Flag_Reset(249); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -449,7 +448,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(261); Game_Flag_Reset(249); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -460,7 +459,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(180); Game_Flag_Reset(249); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -471,7 +470,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(177); Game_Flag_Reset(249); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -482,7 +481,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(258); Game_Flag_Reset(249); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -493,7 +492,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(181); Game_Flag_Reset(249); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -504,7 +503,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(249); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -523,14 +522,14 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(115); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(70, 80); + Set_Enter(70, kSceneRC03); } return true; } return false; } -void SceneScriptRC01::sub_403850() { +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); @@ -545,7 +544,7 @@ void SceneScriptRC01::sub_403850() { bool SceneScriptRC01::ClickedOn2DRegion(int region) { if (region == 0) { - sub_403850(); + investigateCrowd(); return true; } return false; @@ -613,7 +612,7 @@ void SceneScriptRC01::PlayerWalkedOut() { if (!Game_Flag_Query(8) && !Game_Flag_Query(115) && Global_Variable_Query(1)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(31, 1, -1); + Outtake_Play(kOuttakeAway2, 1, -1); } // return 1; } diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 18a08ad5b1..02dd4ee699 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -127,7 +127,7 @@ bool SceneScriptRC02::ClickedOn3DObject(const char *objectName, bool a2) { return false; } -void SceneScriptRC02::sub_402A7C() { +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); @@ -260,7 +260,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { if (Game_Flag_Query(187)) { if (Player_Query_Agenda() == 0) { Game_Flag_Reset(0); - sub_402A7C(); + dialogueWithRunciter(); AI_Movement_Track_Unpause(kActorRunciter); return true; } @@ -289,7 +289,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { AI_Movement_Track_Unpause(kActorRunciter); return true; } - sub_402A7C(); + dialogueWithRunciter(); AI_Movement_Track_Unpause(kActorRunciter); return true; } @@ -320,14 +320,14 @@ bool SceneScriptRC02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_Looping_Sound(75, true); Ambient_Sounds_Adjust_Looping_Sound(85, 100, -101, 1); Actor_Set_Goal_Number(kActorRunciter, 0); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -20.2f, -1238.73f, 108152.73f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108076.27f, 0, false); - Set_Enter(16, 107); + Set_Enter(16, kSceneRC51); } return true; } diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp index 2af0a8e8ef..6f7bdad3cc 100644 --- a/engines/bladerunner/script/scene/rc03.cpp +++ b/engines/bladerunner/script/scene/rc03.cpp @@ -141,7 +141,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { Game_Flag_Set(702); } Game_Flag_Set(kFlagRC03toRC01); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Actor_Set_Goal_Number(kActorDektora, 100); } return true; @@ -154,7 +154,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { Game_Flag_Set(116); Game_Flag_Reset(182); Game_Flag_Set(180); - Set_Enter(0, 1); + Set_Enter(0, kSceneAR02); } return true; } @@ -166,7 +166,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { if (Game_Flag_Query(289)) { Game_Flag_Set(702); } - Set_Enter(74, 86); + Set_Enter(74, kSceneUG01); Actor_Set_Goal_Number(kActorDektora, 100); } return true; @@ -179,7 +179,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { if (Game_Flag_Query(289)) { Game_Flag_Set(702); } - Set_Enter(8, 106); + Set_Enter(8, kSceneHC04); Actor_Set_Goal_Number(kActorDektora, 100); } return true; @@ -190,7 +190,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { Actor_Says(kActorMcCoy, 8522, 14); } else { Game_Flag_Set(120); - Set_Enter(71, 81); + Set_Enter(71, kSceneRC04); } } return true; diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp index 827f836414..72f50588a9 100644 --- a/engines/bladerunner/script/scene/rc04.cpp +++ b/engines/bladerunner/script/scene/rc04.cpp @@ -372,7 +372,7 @@ 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, 80); + Set_Enter(70, kSceneRC03); } return true; } diff --git a/engines/bladerunner/script/scene/rc51.cpp b/engines/bladerunner/script/scene/rc51.cpp index c19a0ff7ce..33c8549017 100644 --- a/engines/bladerunner/script/scene/rc51.cpp +++ b/engines/bladerunner/script/scene/rc51.cpp @@ -101,7 +101,7 @@ bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) { bool SceneScriptRC51::ClickedOnExit(int exitId) { if (exitId == 0 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108173.27f, 0, 1, false, 0)) { - Set_Enter(16, 79); + Set_Enter(16, kSceneRC02); return true; } return false; diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp index 801481f4c4..301fa98f46 100644 --- a/engines/bladerunner/script/scene/tb02.cpp +++ b/engines/bladerunner/script/scene/tb02.cpp @@ -34,7 +34,7 @@ void SceneScriptTB02::InitializeScene() { } else { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(27, 0, -1); + Outtake_Play(kOuttakeTyrellBuildingFly, false, -1); Setup_Scene_Information(-304.0f, -81.46f, 1434.0f, 250); } if (Global_Variable_Query(1) > 3) { @@ -158,7 +158,7 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(154); Game_Flag_Reset(450); - Set_Enter(17, 83); + Set_Enter(17, kSceneTB03); Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1890.0f, 0, false); } return true; @@ -170,9 +170,9 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { if (Global_Variable_Query(1) < 4) { Game_Flag_Set(451); Game_Flag_Set(96); - Set_Enter(72, 84); + Set_Enter(72, kSceneTB05); } else { - Set_Enter(18, 108); + Set_Enter(18, kSceneTB07); } } return true; @@ -197,55 +197,55 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(307); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(307); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(307); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(307); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(307); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(307); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(307); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(307); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); Game_Flag_Reset(307); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); break; default: Game_Flag_Set(261); @@ -270,7 +270,7 @@ void SceneScriptTB02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptTB02::PlayerWalkedIn() { if (Game_Flag_Query(625) && ((Game_Flag_Reset(625) , Global_Variable_Query(1) == 2) || Global_Variable_Query(1) == 3)) { - Set_Enter(18, 108); + Set_Enter(18, kSceneTB07); //return true; return; } diff --git a/engines/bladerunner/script/scene/tb03.cpp b/engines/bladerunner/script/scene/tb03.cpp index 0c05c5599e..599e321402 100644 --- a/engines/bladerunner/script/scene/tb03.cpp +++ b/engines/bladerunner/script/scene/tb03.cpp @@ -108,7 +108,7 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(447); - Set_Enter(88, 101); + Set_Enter(88, kSceneUG17); } return true; } @@ -117,7 +117,7 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(155); - Set_Enter(17, 82); + Set_Enter(17, 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 8971fdf46b..0b1bd1c672 100644 --- a/engines/bladerunner/script/scene/tb05.cpp +++ b/engines/bladerunner/script/scene/tb05.cpp @@ -151,7 +151,7 @@ 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, 85); + Set_Enter(73, kSceneTB06); Scene_Loop_Start_Special(1, 2, 1); } return true; @@ -159,7 +159,7 @@ bool SceneScriptTB05::ClickedOnExit(int exitId) { 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, 82); + Set_Enter(17, kSceneTB02); } return true; } diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp index 6a28d760c7..5642281d26 100644 --- a/engines/bladerunner/script/scene/tb06.cpp +++ b/engines/bladerunner/script/scene/tb06.cpp @@ -128,7 +128,7 @@ 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, 84); + Set_Enter(72, 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 efd4fba197..5a249c649e 100644 --- a/engines/bladerunner/script/scene/tb07.cpp +++ b/engines/bladerunner/script/scene/tb07.cpp @@ -83,7 +83,7 @@ bool SceneScriptTB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); if (Global_Variable_Query(1) == 4) { Game_Flag_Set(608); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); } else { Game_Flag_Reset(176); Game_Flag_Reset(182); @@ -98,55 +98,55 @@ bool SceneScriptTB07::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(307); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(307); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(307); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(307); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(307); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(307); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(307); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(307); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); Game_Flag_Reset(307); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); break; default: Game_Flag_Set(261); @@ -198,7 +198,7 @@ void SceneScriptTB07::sub_401B0C() { Actor_Put_In_Set(kActorRachael, 18); Actor_Set_At_XYZ(kActorRachael, -260.15f, 12.0f, -19.16f, 256); Actor_Change_Animation_Mode(kActorRachael, 0); - Outtake_Play(39, 1, -1); + Outtake_Play(kOuttakeRachel, true, -1); Loop_Actor_Walk_To_XYZ(kActorRachael, -146.15f, 12.0f, -5.84f, 0, 0, false, 0); Actor_Face_Actor(kActorRachael, kActorMcCoy, true); Actor_Says(kActorRachael, 480, 14); diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp index 91d0d63467..a1dde296e8 100644 --- a/engines/bladerunner/script/scene/ug01.cpp +++ b/engines/bladerunner/script/scene/ug01.cpp @@ -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, 95); + Set_Enter(83, kSceneUG10); } return true; } @@ -112,14 +112,14 @@ bool SceneScriptUG01::ClickedOnExit(int exitId) { Game_Flag_Set(119); Game_Flag_Reset(259); Game_Flag_Set(182); - Set_Enter(70, 80); + Set_Enter(70, 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, 87); + Set_Enter(75, kSceneUG02); } return true; } diff --git a/engines/bladerunner/script/scene/ug02.cpp b/engines/bladerunner/script/scene/ug02.cpp index ed2cef490e..af91b5a060 100644 --- a/engines/bladerunner/script/scene/ug02.cpp +++ b/engines/bladerunner/script/scene/ug02.cpp @@ -157,7 +157,7 @@ bool SceneScriptUG02::ClickedOnExit(int exitId) { int v4 = Player_Query_Combat_Mode(); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -95.0f, 74.870003f, -503.0f, 0, 0, v4, 0); Game_Flag_Set(315); - Set_Enter(74, 86); + Set_Enter(74, kSceneUG01); } } return true; @@ -181,7 +181,7 @@ bool SceneScriptUG02::ClickedOnExit(int exitId) { Game_Flag_Set(403); Item_Remove_From_World(121); } - Set_Enter(8, 33); + Set_Enter(8, kSceneHC03); return true; } return false; diff --git a/engines/bladerunner/script/scene/ug03.cpp b/engines/bladerunner/script/scene/ug03.cpp index 64a56dc342..d5d80c9d90 100644 --- a/engines/bladerunner/script/scene/ug03.cpp +++ b/engines/bladerunner/script/scene/ug03.cpp @@ -106,7 +106,7 @@ bool SceneScriptUG03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(336); - Set_Enter(83, 95); + Set_Enter(83, kSceneUG10); } } return true; @@ -116,7 +116,7 @@ bool SceneScriptUG03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(334); - Set_Enter(77, 89); + Set_Enter(77, kSceneUG04); } return true; } diff --git a/engines/bladerunner/script/scene/ug04.cpp b/engines/bladerunner/script/scene/ug04.cpp index 1166b84e1e..13fb0d472c 100644 --- a/engines/bladerunner/script/scene/ug04.cpp +++ b/engines/bladerunner/script/scene/ug04.cpp @@ -88,21 +88,21 @@ bool SceneScriptUG04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -172.0f, 16.29f, -735.0f, 0, 1, false, 0)) { Game_Flag_Set(335); - Set_Enter(76, 88); + Set_Enter(76, kSceneUG03); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, -1.74f, -2400.0f, 0, 1, false, 0)) { Game_Flag_Set(338); - Set_Enter(78, 90); + Set_Enter(78, kSceneUG05); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 164.0f, 11.87f, -1013.0f, 0, 1, false, 0)) { Game_Flag_Set(340); - Set_Enter(79, 91); + Set_Enter(79, kSceneUG06); } return true; } diff --git a/engines/bladerunner/script/scene/ug05.cpp b/engines/bladerunner/script/scene/ug05.cpp index c1f25be009..3a66f5e45a 100644 --- a/engines/bladerunner/script/scene/ug05.cpp +++ b/engines/bladerunner/script/scene/ug05.cpp @@ -116,19 +116,19 @@ bool SceneScriptUG05::ClickedOnExit(int exitId) { if (Game_Flag_Query(663) && !Game_Flag_Query(368)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -356.35f, 132.77f, -1092.36f, 0, 0, false, 0); Game_Flag_Set(361); - Set_Enter(43, 40); + Set_Enter(43, kSceneHF07); } else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -156.72f, 3.03f, -1118.17f, 0, 1, false, 0)) { Actor_Face_Heading(kActorMcCoy, 760, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 1, 0); Game_Flag_Set(361); - Set_Enter(43, 40); + Set_Enter(43, kSceneHF07); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 4.0f, -11.67f, -4.0f, 0, 1, false, 0)) { Game_Flag_Set(339); - Set_Enter(77, 89); + Set_Enter(77, kSceneUG04); } return true; } @@ -237,7 +237,7 @@ void SceneScriptUG05::sub_402218() { Actor_Face_Actor(kActorMcCoy, v0, true); Actor_Face_Actor(v0, kActorMcCoy, true); Actor_Says(kActorMcCoy, 5535, 13); - if (v0 == 3) { + if (v0 == kActorDektora) { Actor_Says(kActorDektora, 1110, 15); } else { Actor_Says(kActorLucy, 670, 17); @@ -248,27 +248,27 @@ void SceneScriptUG05::sub_402218() { if (v0 == kActorLucy) { if (Game_Flag_Query(46)) { if (Global_Variable_Query(48) > 3) { - Outtake_Play(13, 0, -1); + Outtake_Play(kOuttakeEnd1B, false, -1); } else { - Outtake_Play(14, 0, -1); + Outtake_Play(kOuttakeEnd1C, false, -1); } } else { - Outtake_Play(12, 0, -1); + Outtake_Play(kOuttakeEnd1A, false, -1); } } else if (v0 == kActorDektora) { if (Game_Flag_Query(47)) { if (Global_Variable_Query(48) > 3) { - Outtake_Play(16, 0, -1); + Outtake_Play(kOuttakeEnd1E, false, -1); } else { - Outtake_Play(17, 0, -1); + Outtake_Play(kOuttakeEnd1F, false, -1); } } else { - Outtake_Play(15, 0, -1); + Outtake_Play(kOuttakeEnd1D, false, -1); } } else { - Outtake_Play(19, 0, -1); + Outtake_Play(kOuttakeEnd3, false, -1); } - Outtake_Play(18, 0, -1); + Outtake_Play(kOuttakeEnd2, false, -1); Game_Over(); } diff --git a/engines/bladerunner/script/scene/ug06.cpp b/engines/bladerunner/script/scene/ug06.cpp index ca3501f9a0..55a84442f9 100644 --- a/engines/bladerunner/script/scene/ug06.cpp +++ b/engines/bladerunner/script/scene/ug06.cpp @@ -28,11 +28,11 @@ void SceneScriptUG06::InitializeScene() { if (Game_Flag_Query(680)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(7, 0, -1); + Outtake_Play(kOuttakeMovieC1, false, -1); if (Game_Flag_Query(560)) { - Outtake_Play(9, 0, -1); + Outtake_Play(kOuttakeMovieC3, false, -1); } else { - Outtake_Play(8, 0, -1); + Outtake_Play(kOuttakeMovieC2, false, -1); } Game_Flag_Reset(680); } @@ -95,7 +95,7 @@ bool SceneScriptUG06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(341); - Set_Enter(77, 89); + Set_Enter(77, kSceneUG04); } return true; } @@ -107,7 +107,7 @@ bool SceneScriptUG06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(342); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } return true; } diff --git a/engines/bladerunner/script/scene/ug07.cpp b/engines/bladerunner/script/scene/ug07.cpp index ff7dc7b06a..fdb61c766a 100644 --- a/engines/bladerunner/script/scene/ug07.cpp +++ b/engines/bladerunner/script/scene/ug07.cpp @@ -98,7 +98,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(427); - Set_Enter(82, 94); + Set_Enter(82, kSceneUG09); return true; } } @@ -107,7 +107,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(425); - Set_Enter(81, 93); + Set_Enter(81, kSceneUG08); return true; } } @@ -146,7 +146,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(423); - Set_Enter(83, 95); + Set_Enter(83, kSceneUG10); return true; } } diff --git a/engines/bladerunner/script/scene/ug08.cpp b/engines/bladerunner/script/scene/ug08.cpp index 0d68ec983b..667fa620fe 100644 --- a/engines/bladerunner/script/scene/ug08.cpp +++ b/engines/bladerunner/script/scene/ug08.cpp @@ -89,7 +89,7 @@ bool SceneScriptUG08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(426); - Set_Enter(80, 92); + Set_Enter(80, kSceneUG07); } } else if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -312.0f, -2.0f, 152.0f, 0, 1, false, 0)) { @@ -102,7 +102,7 @@ bool SceneScriptUG08::ClickedOnExit(int exitId) { Actor_Set_Invisible(kActorMcCoy, true); Game_Flag_Set(429); Game_Flag_Reset(431); - Set_Enter(85, 97); + Set_Enter(85, kSceneUG13); Scene_Loop_Start_Special(1, 3, 0); } } diff --git a/engines/bladerunner/script/scene/ug09.cpp b/engines/bladerunner/script/scene/ug09.cpp index 8ff3b7f74b..f217b3df67 100644 --- a/engines/bladerunner/script/scene/ug09.cpp +++ b/engines/bladerunner/script/scene/ug09.cpp @@ -104,7 +104,7 @@ bool SceneScriptUG09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(432); - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -113,7 +113,7 @@ bool SceneScriptUG09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(428); - Set_Enter(80, 92); + Set_Enter(80, kSceneUG07); } return true; } diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp index 1f07c6d828..2568e433cd 100644 --- a/engines/bladerunner/script/scene/ug10.cpp +++ b/engines/bladerunner/script/scene/ug10.cpp @@ -104,7 +104,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { if ((!Game_Flag_Query(474) && x > 125.0f) || Game_Flag_Query(474)) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 1.15f, 29.0f, 0, 1, false, 0)) { Game_Flag_Set(317); - Set_Enter(74, 86); + Set_Enter(74, kSceneUG01); return true; } } else if (!Game_Flag_Query(474)) { @@ -117,7 +117,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 1, 0); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, 81.83f, -652.0f, 0, 0, false, 0); Game_Flag_Set(337); - Set_Enter(76, 88); + Set_Enter(76, kSceneUG03); return true; } } else if (!Game_Flag_Query(474)) { @@ -129,7 +129,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 1001, false); Loop_Actor_Travel_Ladder(kActorMcCoy, 1, 1, 0); Game_Flag_Set(424); - Set_Enter(80, 92); + Set_Enter(80, kSceneUG07); return true; } } else if (!Game_Flag_Query(474)) { @@ -139,7 +139,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 405.0f, 0, 1, false, 0)) { Game_Flag_Set(347); - Set_Enter(86, 98); + Set_Enter(86, kSceneUG14); return true; } } else if (!Game_Flag_Query(474)) { diff --git a/engines/bladerunner/script/scene/ug12.cpp b/engines/bladerunner/script/scene/ug12.cpp index 311b350588..2f560d8f65 100644 --- a/engines/bladerunner/script/scene/ug12.cpp +++ b/engines/bladerunner/script/scene/ug12.cpp @@ -84,7 +84,7 @@ bool SceneScriptUG12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(344); - Set_Enter(86, 98); + Set_Enter(86, kSceneUG14); } return true; } @@ -93,7 +93,7 @@ bool SceneScriptUG12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(412); - Set_Enter(45, 42); + Set_Enter(45, kSceneKP02); } return true; } diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp index f380f07ace..668132088d 100644 --- a/engines/bladerunner/script/scene/ug13.cpp +++ b/engines/bladerunner/script/scene/ug13.cpp @@ -156,7 +156,7 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) { Player_Loses_Control(); Game_Flag_Set(430); Game_Flag_Set(431); - Set_Enter(81, 93); + Set_Enter(81, kSceneUG08); Scene_Loop_Start_Special(1, 3, 0); } return true; @@ -164,7 +164,7 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 39.0f, 52.94f, -528.0f, 0, 1, false, 0)) { Game_Flag_Set(351); - Set_Enter(87, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -177,7 +177,7 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) { if (!sub_402AD0()) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -477.0f, 141.9f, -870.0f, 0, 0, false, 0); Game_Flag_Set(434); - Set_Enter(89, 102); + Set_Enter(89, kSceneUG18); return true; } Actor_Face_Heading(kActorMcCoy, 325, false); diff --git a/engines/bladerunner/script/scene/ug14.cpp b/engines/bladerunner/script/scene/ug14.cpp index 926862da4d..8cb205856c 100644 --- a/engines/bladerunner/script/scene/ug14.cpp +++ b/engines/bladerunner/script/scene/ug14.cpp @@ -96,7 +96,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(348); - Set_Enter(90, 103); + Set_Enter(90, kSceneUG19); } return true; } @@ -114,7 +114,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(345); - Set_Enter(6, 96); + Set_Enter(6, kSceneUG12); } return true; } @@ -137,7 +137,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(346); - Set_Enter(83, 95); + Set_Enter(83, kSceneUG10); } return true; } diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp index 6d0ae376e5..e35121fe11 100644 --- a/engines/bladerunner/script/scene/ug15.cpp +++ b/engines/bladerunner/script/scene/ug15.cpp @@ -108,7 +108,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(352); - Set_Enter(88, 101); + Set_Enter(88, kSceneUG17); } return true; } @@ -117,7 +117,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(152); - Set_Enter(19, 100); + Set_Enter(19, kSceneUG16); } return true; } @@ -129,7 +129,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(354); - Set_Enter(19, 100); + Set_Enter(19, kSceneUG16); } return true; } @@ -138,7 +138,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(350); - Set_Enter(85, 97); + Set_Enter(85, kSceneUG13); } return true; } diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp index eb1f5a0251..4b1ce4f7c5 100644 --- a/engines/bladerunner/script/scene/ug16.cpp +++ b/engines/bladerunner/script/scene/ug16.cpp @@ -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, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -142,7 +142,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(153); - Set_Enter(87, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -153,7 +153,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(551); - Set_Enter(36, 30); + Set_Enter(36, kSceneDR06); } return true; } diff --git a/engines/bladerunner/script/scene/ug17.cpp b/engines/bladerunner/script/scene/ug17.cpp index f0fc32d2a6..1f223b2312 100644 --- a/engines/bladerunner/script/scene/ug17.cpp +++ b/engines/bladerunner/script/scene/ug17.cpp @@ -68,7 +68,7 @@ bool SceneScriptUG17::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(353); - Set_Enter(87, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -82,7 +82,7 @@ bool SceneScriptUG17::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(448); - Set_Enter(17, 83); + Set_Enter(17, kSceneTB03); } } return true; diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp index 939404dcc5..08d6269e8b 100644 --- a/engines/bladerunner/script/scene/ug18.cpp +++ b/engines/bladerunner/script/scene/ug18.cpp @@ -114,7 +114,7 @@ bool SceneScriptUG18::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(435); - Set_Enter(85, 97); + Set_Enter(85, kSceneUG13); } return true; } diff --git a/engines/bladerunner/script/scene/ug19.cpp b/engines/bladerunner/script/scene/ug19.cpp index 01ca0d18da..cee17d1223 100644 --- a/engines/bladerunner/script/scene/ug19.cpp +++ b/engines/bladerunner/script/scene/ug19.cpp @@ -92,7 +92,7 @@ bool SceneScriptUG19::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(356); - Set_Enter(53, 53); + Set_Enter(53, kSceneMA07); } return true; } @@ -101,7 +101,7 @@ bool SceneScriptUG19::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(349); - Set_Enter(86, 98); + Set_Enter(86, kSceneUG14); } return true; } diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index 3c0c8e1866..3f84f31ad0 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -1085,9 +1085,9 @@ void ScriptBase::ESPER_Flag_To_Activate() { } } -bool ScriptBase::Voight_Kampff_Activate(int a1, int a2){ +bool ScriptBase::Voight_Kampff_Activate(int actorId, int a2){ //TODO - warning("Voight_Kampff_Activate(%d, %d)", a1, a2); + warning("Voight_Kampff_Activate(%d, %d)", actorId, a2); return false; } @@ -1295,9 +1295,9 @@ void ScriptBase::ESPER_Define_Special_Region(int regionId, int a2, int a3, int a _vm->_esper->defineRegion(regionId, Common::Rect(a2, a3, a4, a5), Common::Rect(a6, a7, a8, a9), Common::Rect(a10, a11, a12, a13), name); } -void ScriptBase::VK_Add_Question(int a1, int a2, int a3) { +void ScriptBase::VK_Add_Question(int intensity, int questionId, int a3) { //TODO - warning("VK_Add_Question(%d, %d, %d)", a1, a2, a3); + warning("VK_Add_Question(%d, %d, %d)", intensity, questionId, a3); } void ScriptBase::VK_Eye_Animates(int a1) { @@ -1310,9 +1310,9 @@ void ScriptBase::VK_Subject_Reacts(int a1, int a2, int a3, int a4) { warning("VK_Subject_Reacts(%d, %d, %d, %d)", a1, a2, a3, a4); } -void ScriptBase::VK_Play_Speech_Line(int actorIndex, int a2, float a3) { +void ScriptBase::VK_Play_Speech_Line(int actorId, int sentenceId, float a3) { //TODO - warning("VK_Play_Speech_Line(%d, %d, %g)", actorIndex, a2, a3); + warning("VK_Play_Speech_Line(%d, %d, %g)", actorId, sentenceId, a3); } } // End of namespace BladeRunner diff --git a/engines/bladerunner/script/script.h b/engines/bladerunner/script/script.h index 574f3a8f65..154345f73f 100644 --- a/engines/bladerunner/script/script.h +++ b/engines/bladerunner/script/script.h @@ -232,7 +232,7 @@ protected: // Spinner_Query_Selectable_Destination_Flag(int destination); int Spinner_Interface_Choose_Dest(int loopId, bool immediately); void ESPER_Flag_To_Activate(); - bool Voight_Kampff_Activate(int a1, int a2); + bool Voight_Kampff_Activate(int actorId, int a2); int Elevator_Activate(int elevatorId); void View_Score_Board(); // Query_Score @@ -279,8 +279,8 @@ protected: void KIA_Play_Slice_Model(int sliceModelId); void KIA_Play_Photograph(int photographId); - void VK_Play_Speech_Line(int actorIndex, int a2, float a3); - void VK_Add_Question(int a1, int a2, int a3); + void VK_Play_Speech_Line(int actorId, int sentenceId, float a3); + void VK_Add_Question(int intensity, int questionId, int a3); void VK_Subject_Reacts(int a1, int a2, int a3, int a4); void VK_Eye_Animates(int a1); }; diff --git a/engines/bladerunner/script/vk.cpp b/engines/bladerunner/script/vk.cpp index 5e99c29ba6..7b5f378396 100644 --- a/engines/bladerunner/script/vk.cpp +++ b/engines/bladerunner/script/vk.cpp @@ -26,14 +26,14 @@ namespace BladeRunner { -bool VKScript::SCRIPT_VK_DLL_Initialize(int a1) { +bool VKScript::SCRIPT_VK_DLL_Initialize(int actorId) { VK_Add_Question(0, 7400, -1); VK_Add_Question(0, 7405, -1); VK_Add_Question(0, 7410, -1); VK_Add_Question(0, 7415, -1); VK_Add_Question(0, 7420, -1); VK_Add_Question(0, 7425, -1); - if (a1 == 6 || a1 == 3) { + if (actorId == kActorLucy || actorId == kActorDektora) { VK_Add_Question(0, 7430, -1); } VK_Add_Question(0, 7435, -1); @@ -69,34 +69,33 @@ bool VKScript::SCRIPT_VK_DLL_Initialize(int a1) { VK_Add_Question(2, 7740, -1); VK_Add_Question(2, 7750, -1); VK_Add_Question(2, 7770, -1); - switch (a1) { + + switch (actorId) { + case kActorDektora: + case kActorLucy: + case kActorGrigorian: + case kActorBulletBob: + case kActorRunciter: + return true; default: return false; - case 3: - case 6: - case 11: - case 14: - case 15: - return true; - } } -void VKScript::SCRIPT_VK_DLL_Calibrate(int a1) { - if (unknown1 == 0) { - VK_Play_Speech_Line(0, 7370, 0.5f); - VK_Play_Speech_Line(0, 7385, 0.5f); - sub_40A300(a1, 7385); - } else if (unknown1 == 1) { - VK_Play_Speech_Line(0, 7390, 0.5f); - sub_40A350(a1, 7390); - } else if (unknown1 == 2) { - VK_Play_Speech_Line(0, 7395, 0.5f); - sub_40A3A0(a1, 7395); +void VKScript::SCRIPT_VK_DLL_Calibrate(int actorId) { + if (calibrationQuestionCounter == 0) { + VK_Play_Speech_Line(kActorMcCoy, 7370, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7385, 0.5f); + askCalibrationQuestion1(actorId, 7385); + } else if (calibrationQuestionCounter == 1) { + VK_Play_Speech_Line(kActorMcCoy, 7390, 0.5f); + askCalibrationQuestion2(actorId, 7390); + } else if (calibrationQuestionCounter == 2) { + VK_Play_Speech_Line(kActorMcCoy, 7395, 0.5f); + askCalibrationQuestion3(actorId, 7395); } - unknown1++; - if (unknown1 > 3) { //bug? - unknown1 = 0; + if (++calibrationQuestionCounter > 3) { + calibrationQuestionCounter = 0; } } @@ -105,193 +104,193 @@ bool VKScript::SCRIPT_VK_DLL_Begin_Test() { return false; } -void VKScript::SCRIPT_VK_DLL_McCoy_Asks_Question(int a1, int a2) { - switch (a2) { +void VKScript::SCRIPT_VK_DLL_McCoy_Asks_Question(int actorId, int questionId) { + switch (questionId) { case 7400: - VK_Play_Speech_Line(0, 7400, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7400, 0.5f); break; case 7405: - VK_Play_Speech_Line(0, 7405, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7405, 0.5f); break; case 7410: - VK_Play_Speech_Line(0, 7410, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7410, 0.5f); break; case 7415: - VK_Play_Speech_Line(0, 7415, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7415, 0.5f); break; case 7420: - VK_Play_Speech_Line(0, 7420, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7420, 0.5f); break; case 7425: - VK_Play_Speech_Line(0, 7425, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7425, 0.5f); break; case 7430: - VK_Play_Speech_Line(0, 7430, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7430, 0.5f); break; case 7435: - VK_Play_Speech_Line(0, 7435, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7435, 0.5f); break; case 7440: - VK_Play_Speech_Line(0, 7440, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7440, 0.5f); break; case 7445: - VK_Play_Speech_Line(0, 7445, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7445, 0.5f); break; case 7450: - VK_Play_Speech_Line(0, 7450, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7450, 0.5f); break; case 7455: - VK_Play_Speech_Line(0, 7455, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7455, 0.5f); break; case 7460: - VK_Play_Speech_Line(0, 7460, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7460, 0.5f); break; case 7465: - VK_Play_Speech_Line(0, 7465, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7465, 0.5f); break; case 7470: - VK_Play_Speech_Line(0, 7470, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7470, 0.5f); break; case 7475: - VK_Play_Speech_Line(0, 7475, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7475, 0.5f); break; case 7480: - VK_Play_Speech_Line(0, 7480, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7480, 0.5f); break; case 7485: - VK_Play_Speech_Line(0, 7485, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7485, 0.5f); break; case 7490: - VK_Play_Speech_Line(0, 7490, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7490, 0.5f); break; case 7495: - VK_Play_Speech_Line(0, 7495, 0.5f); - VK_Play_Speech_Line(0, 7500, 0.5f); - VK_Play_Speech_Line(0, 7505, 0.5f); - VK_Play_Speech_Line(0, 7510, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7495, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7500, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7505, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7510, 0.5f); break; case 7515: - VK_Play_Speech_Line(0, 7515, 0.5f); - VK_Play_Speech_Line(0, 7520, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7515, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7520, 0.5f); break; case 7525: - VK_Play_Speech_Line(0, 7525, 0.5f); - VK_Play_Speech_Line(0, 7530, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7525, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7530, 0.5f); break; case 7535: - VK_Play_Speech_Line(0, 7535, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7535, 0.5f); break; case 7540: - VK_Play_Speech_Line(0, 7540, 0.5f); - VK_Play_Speech_Line(0, 7545, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7540, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7545, 0.5f); break; case 7550: - VK_Play_Speech_Line(0, 7550, 0.5f); - VK_Play_Speech_Line(0, 7555, 0.5f); - VK_Play_Speech_Line(0, 7560, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7550, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7555, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7560, 0.5f); break; case 7565: - VK_Play_Speech_Line(0, 7565, 0.5f); - if (a1 != 14) { - VK_Play_Speech_Line(0, 7570, 0.5f); - VK_Play_Speech_Line(0, 7575, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7565, 0.5f); + if (actorId != kActorBulletBob) { + VK_Play_Speech_Line(kActorMcCoy, 7570, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7575, 0.5f); } break; case 7580: - VK_Play_Speech_Line(0, 7580, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7580, 0.5f); break; case 7585: - VK_Play_Speech_Line(0, 7585, 0.5f); - if (a1 != 6 && a1 != 14) { - VK_Play_Speech_Line(0, 7590, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7585, 0.5f); + if (actorId != kActorLucy && actorId != kActorBulletBob) { + VK_Play_Speech_Line(kActorMcCoy, 7590, 0.5f); } break; case 7595: - VK_Play_Speech_Line(0, 7595, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7595, 0.5f); break; case 7600: - VK_Play_Speech_Line(0, 7600, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7600, 0.5f); break; case 7605: - VK_Play_Speech_Line(0, 7605, 0.5f); - VK_Play_Speech_Line(0, 7610, 0.5f); - VK_Play_Speech_Line(0, 7615, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7605, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7610, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7615, 0.5f); break; case 7620: - VK_Play_Speech_Line(0, 7620, 0.5f); - VK_Play_Speech_Line(0, 7625, 0.5f); - if (a1 != 14) { - if (a1 == 3 && Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2330, 0.5f); - VK_Play_Speech_Line(0, 7880, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7620, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7625, 0.5f); + if (actorId != kActorBulletBob) { + if (actorId == kActorDektora && Game_Flag_Query(47)) { + VK_Play_Speech_Line(kActorDektora, 2330, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7880, 0.5f); } - VK_Play_Speech_Line(0, 7630, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7630, 0.5f); } break; case 7635: - VK_Play_Speech_Line(0, 7635, 0.5f); - VK_Play_Speech_Line(0, 7640, 0.5f); - if (a1 != 11 && a1 != 14) { - VK_Play_Speech_Line(0, 7645, 0.5f); - VK_Play_Speech_Line(0, 7650, 0.5f); - if (a1 != 6) { - VK_Play_Speech_Line(0, 7655, 0.5f); - VK_Play_Speech_Line(0, 7660, 0.5f); - VK_Play_Speech_Line(0, 7665, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7635, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7640, 0.5f); + if (actorId != kActorGrigorian && actorId != kActorBulletBob) { + VK_Play_Speech_Line(kActorMcCoy, 7645, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7650, 0.5f); + if (actorId != kActorLucy) { + VK_Play_Speech_Line(kActorMcCoy, 7655, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7660, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7665, 0.5f); } } break; case 7670: - VK_Play_Speech_Line(0, 7670, 0.5f); - VK_Play_Speech_Line(0, 7675, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7670, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7675, 0.5f); break; case 7680: - VK_Play_Speech_Line(0, 7680, 0.5f); - VK_Play_Speech_Line(0, 7685, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7680, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7685, 0.5f); break; case 7690: - VK_Play_Speech_Line(0, 7690, 0.5f); - if (a1 != 11) { - VK_Play_Speech_Line(0, 7695, 0.5f); - VK_Play_Speech_Line(0, 7700, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7690, 0.5f); + if (actorId != kActorGrigorian) { + VK_Play_Speech_Line(kActorMcCoy, 7695, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7700, 0.5f); } break; case 7705: - VK_Play_Speech_Line(0, 7705, 0.5f); - VK_Play_Speech_Line(0, 7710, 0.5f); - VK_Play_Speech_Line(0, 7715, 0.5f); - if (a1 != 11 && a1 != 14) { - VK_Play_Speech_Line(0, 7720, 0.5f); - VK_Play_Speech_Line(0, 7725, 0.5f); - if (a1 != 6) { - if (a1 == 3) { - VK_Play_Speech_Line(3, 2490, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7705, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7710, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7715, 0.5f); + if (actorId != kActorGrigorian && actorId != kActorBulletBob) { + VK_Play_Speech_Line(kActorMcCoy, 7720, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7725, 0.5f); + if (actorId != kActorLucy) { + if (actorId == kActorDektora) { + VK_Play_Speech_Line(kActorDektora, 2490, 0.5f); } - VK_Play_Speech_Line(0, 7730, 0.5f); - VK_Play_Speech_Line(0, 7735, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7730, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7735, 0.5f); } } break; case 7740: - VK_Play_Speech_Line(0, 7740, 0.5f); - VK_Play_Speech_Line(0, 7745, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7740, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7745, 0.5f); break; case 7750: - VK_Play_Speech_Line(0, 7750, 0.5f); - VK_Play_Speech_Line(0, 7755, 0.5f); - if (a1 == 3) { - VK_Play_Speech_Line(3, 2570, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7750, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7755, 0.5f); + if (actorId == kActorDektora) { + VK_Play_Speech_Line(kActorDektora, 2570, 0.5f); } - VK_Play_Speech_Line(0, 7760, 0.5f); - VK_Play_Speech_Line(0, 7765, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7760, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7765, 0.5f); break; case 7770: - VK_Play_Speech_Line(0, 7770, 0.5f); - if (a1 == 3) { - VK_Play_Speech_Line(3, 2620, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7770, 0.5f); + if (actorId == kActorDektora) { + VK_Play_Speech_Line(kActorDektora, 2620, 0.5f); } - VK_Play_Speech_Line(0, 7775, 0.5f); - VK_Play_Speech_Line(0, 7780, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7775, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7780, 0.5f); break; } if (++unknown2 >= 10) { @@ -299,98 +298,98 @@ void VKScript::SCRIPT_VK_DLL_McCoy_Asks_Question(int a1, int a2) { } } -void VKScript::SCRIPT_VK_DLL_Question_Asked(int a1, int a2) { - switch (a1) { - case 15: - sub_407CF8(a2); +void VKScript::SCRIPT_VK_DLL_Question_Asked(int actorId, int questionId) { + switch (actorId) { + case kActorRunciter: + askRunciter(questionId); break; - case 14: - sub_40897C(a2); + case kActorBulletBob: + askBulletBob(questionId); break; - case 11: - sub_404B44(a2); + case kActorGrigorian: + askGrigorian(questionId); break; - case 6: - sub_402604(a2); + case kActorLucy: + askLucy(questionId); break; - case 3: - sub_406088(a2); + case kActorDektora: + askDektora(questionId); break; } } -void VKScript::SCRIPT_VK_DLL_Shutdown(int a1, signed int a2, signed int a3) { - if (a2 > 79 && a3 > 79) { - VK_Play_Speech_Line(39, 450, 0.5f); - } else if (a3 > 79) { - VK_Play_Speech_Line(39, 420, 0.5f); - VK_Play_Speech_Line(39, 430, 0.5f); - switch (a1) { - case 15: +void VKScript::SCRIPT_VK_DLL_Shutdown(int actorId, signed int humanPercentage, signed replicantPercentage) { + if (humanPercentage > 79 && replicantPercentage > 79) { + VK_Play_Speech_Line(kActorAnsweringMachine, 450, 0.5f); + } else if (replicantPercentage > 79) { + VK_Play_Speech_Line(kActorAnsweringMachine, 420, 0.5f); + VK_Play_Speech_Line(kActorAnsweringMachine, 430, 0.5f); + switch (actorId) { + case kActorRunciter: Actor_Clue_Acquire(kActorMcCoy, kClueVKRunciterReplicant, 1, -1); break; - case 14: + case kActorBulletBob: Actor_Clue_Acquire(kActorMcCoy, kClueVKBobGorskyReplicant, 1, -1); break; - case 11: + case kActorGrigorian: Actor_Clue_Acquire(kActorMcCoy, kClueVKGrigorianReplicant, 1, -1); break; - case 6: + case kActorLucy: Actor_Clue_Acquire(kActorMcCoy, kClueVKLucyReplicant, 1, -1); break; - case 3: + case kActorDektora: Actor_Clue_Acquire(kActorMcCoy, kClueVKDektoraReplicant, 1, -1); break; } - } else if (a2 > 79) { - VK_Play_Speech_Line(39, 420, 0.5f); - VK_Play_Speech_Line(39, 440, 0.5f); - switch (a1) { - case 15: + } else if (humanPercentage > 79) { + VK_Play_Speech_Line(kActorAnsweringMachine, 420, 0.5f); + VK_Play_Speech_Line(kActorAnsweringMachine, 440, 0.5f); + switch (actorId) { + case kActorRunciter: Actor_Clue_Acquire(kActorMcCoy, kClueVKRunciterHuman, 1, -1); break; - case 14: + case kActorBulletBob: Actor_Clue_Acquire(kActorMcCoy, kClueVKBobGorskyHuman, 1, -1); break; - case 11: + case kActorGrigorian: Actor_Clue_Acquire(kActorMcCoy, kClueVKGrigorianHuman, 1, -1); break; - case 6: + case kActorLucy: Actor_Clue_Acquire(kActorMcCoy, kClueVKLucyHuman, 1, -1); break; - case 3: + case kActorDektora: Actor_Clue_Acquire(kActorMcCoy, kClueVKDektoraHuman, 1, -1); break; } } - VK_Play_Speech_Line(39, 460, 0.5f); + VK_Play_Speech_Line(kActorAnsweringMachine, 460, 0.5f); } -void VKScript::sub_402604(int a1) { - switch (a1) { +void VKScript::askLucy(int questionId) { + switch (questionId) { case 7385: VK_Subject_Reacts(40, 0, 0, 0); VK_Eye_Animates(2); - VK_Play_Speech_Line(6, 1240, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1240, 0.5f); break; case 7390: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 1250, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1250, 0.5f); VK_Subject_Reacts(40, 0, 2, 5); - VK_Play_Speech_Line(6, 1260, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1260, 0.5f); VK_Eye_Animates(3); } else { - VK_Play_Speech_Line(6, 1270, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1270, 0.5f); VK_Subject_Reacts(40, 3, 0, 2); } break; case 7395: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 1280, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1280, 0.5f); VK_Subject_Reacts(40, 0, 0, 0); } else { VK_Subject_Reacts(40, 0, 0, 0); - VK_Play_Speech_Line(6, 1280, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1280, 0.5f); } break; case 7400: @@ -399,17 +398,17 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(30, 9, 0, -10); } - VK_Play_Speech_Line(6, 1300, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1300, 0.5f); VK_Eye_Animates(3); break; case 7405: - VK_Play_Speech_Line(6, 1310, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1310, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(50, 1, 11, 5); } else { VK_Subject_Reacts(60, 11, 1, 5); } - VK_Play_Speech_Line(6, 1320, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1320, 0.5f); break; case 7410: if (Game_Flag_Query(46)) { @@ -418,80 +417,80 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(40, 10, -2, -5); } - VK_Play_Speech_Line(6, 1330, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1330, 0.5f); break; case 7415: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 1340, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1340, 0.5f); VK_Subject_Reacts(50, 1, 11, -5); - VK_Play_Speech_Line(0, 7935, 0.5f); - VK_Play_Speech_Line(6, 1350, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7935, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1350, 0.5f); } else { - VK_Play_Speech_Line(6, 1360, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1360, 0.5f); VK_Subject_Reacts(20, 9, -2, -5); } break; case 7420: VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 1370, 0.5f); - VK_Play_Speech_Line(0, 8000, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1370, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8000, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(50, 1, 11, -8); } else { VK_Subject_Reacts(60, 11, -2, -8); } - VK_Play_Speech_Line(6, 1390, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1390, 0.5f); break; case 7425: - VK_Play_Speech_Line(6, 1400, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1400, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(20, -2, 9, -2); } else { VK_Subject_Reacts(20, 9, -2, -2); } - VK_Play_Speech_Line(6, 1410, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1410, 0.5f); break; case 7430: - VK_Play_Speech_Line(6, 1420, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1420, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(20, -1, 9, -3); } else { VK_Subject_Reacts(30, 9, -1, -3); } - VK_Play_Speech_Line(6, 1430, 0.5f); - VK_Play_Speech_Line(0, 7940, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1430, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7940, 0.5f); VK_Eye_Animates(2); break; case 7435: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 1440, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1440, 0.5f); VK_Subject_Reacts(30, 5, 10, 2); } else { VK_Subject_Reacts(30, 9, 3, 2); - VK_Play_Speech_Line(6, 1450, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1450, 0.5f); } break; case 7440: - VK_Play_Speech_Line(6, 1460, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1460, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(40, 5, 10, 2); VK_Eye_Animates(3); } else { VK_Subject_Reacts(20, 9, -3, 2); } - VK_Play_Speech_Line(6, 1470, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1470, 0.5f); break; case 7445: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 1480, 0.5f); - VK_Play_Speech_Line(0, 7940, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1480, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7940, 0.5f); VK_Subject_Reacts(50, 4, 11, 10); - VK_Play_Speech_Line(6, 1500, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1500, 0.5f); } else { VK_Subject_Reacts(30, 9, -1, -2); - VK_Play_Speech_Line(6, 1510, 0.5f); - VK_Play_Speech_Line(0, 7945, 0.5f); - VK_Play_Speech_Line(6, 1520, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1510, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7945, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1520, 0.5f); } break; case 7450: @@ -501,17 +500,17 @@ void VKScript::sub_402604(int a1) { VK_Subject_Reacts(30, 9, 4, -6); VK_Eye_Animates(2); } - VK_Play_Speech_Line(6, 1530, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1530, 0.5f); break; case 7455: - VK_Play_Speech_Line(6, 1540, 0.5f); - VK_Play_Speech_Line(0, 7950, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1540, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7950, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(10, 1, 8, -5); } else { VK_Subject_Reacts(10, 9, -1, -2); } - VK_Play_Speech_Line(6, 1550, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1550, 0.5f); break; case 7460: if (Game_Flag_Query(46)) { @@ -519,62 +518,62 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(30, 9, 2, -5); } - VK_Play_Speech_Line(6, 1560, 0.5f); - VK_Play_Speech_Line(0, 7955, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1560, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7955, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 1570, 0.5f); - VK_Play_Speech_Line(6, 1580, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1570, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1580, 0.5f); break; case 7465: if (Game_Flag_Query(46)) { VK_Subject_Reacts(40, -1, 11, 2); - VK_Play_Speech_Line(6, 1590, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1590, 0.5f); } else { VK_Eye_Animates(2); - VK_Play_Speech_Line(6, 1590, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1590, 0.5f); VK_Subject_Reacts(20, 9, 2, -8); } break; case 7470: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 1610, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1610, 0.5f); VK_Subject_Reacts(20, 3, 9, -5); - VK_Play_Speech_Line(6, 1620, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1620, 0.5f); } else { VK_Subject_Reacts(30, 9, 0, -5); - VK_Play_Speech_Line(6, 1630, 0.5f); - VK_Play_Speech_Line(6, 1640, 0.5f); - VK_Play_Speech_Line(0, 7960, 0.5f); - VK_Play_Speech_Line(6, 1650, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1630, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1640, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7960, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1650, 0.5f); } break; case 7475: if (Game_Flag_Query(46)) { VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 1660, 0.5f); - VK_Play_Speech_Line(0, 7965, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1660, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7965, 0.5f); VK_Subject_Reacts(70, -3, 13, 10); - VK_Play_Speech_Line(6, 1670, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1670, 0.5f); } else { - VK_Play_Speech_Line(6, 1680, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1680, 0.5f); VK_Subject_Reacts(60, 13, -4, 5); - VK_Play_Speech_Line(6, 1690, 0.5f); - VK_Play_Speech_Line(0, 7970, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1690, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7970, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 1700, 0.5f); - VK_Play_Speech_Line(6, 1710, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1700, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1710, 0.5f); } break; case 7480: - VK_Play_Speech_Line(6, 1720, 0.5f); - VK_Play_Speech_Line(0, 7975, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1720, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7975, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(20, 2, 10, 7); } else { VK_Subject_Reacts(50, 12, 3, 7); } - VK_Play_Speech_Line(6, 1730, 0.5f); - VK_Play_Speech_Line(0, 7980, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1730, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7980, 0.5f); break; case 7485: if (Game_Flag_Query(46)) { @@ -583,7 +582,7 @@ void VKScript::sub_402604(int a1) { VK_Subject_Reacts(30, 10, -2, 6); VK_Eye_Animates(2); } - VK_Play_Speech_Line(6, 1740, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1740, 0.5f); break; case 7490: if (Game_Flag_Query(46)) { @@ -591,10 +590,10 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(40, 11, 1, 8); } - VK_Play_Speech_Line(6, 1750, 0.5f); - VK_Play_Speech_Line(0, 7985, 0.5f); - VK_Play_Speech_Line(0, 7990, 0.5f); - VK_Play_Speech_Line(6, 1760, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1750, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7985, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7990, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1760, 0.5f); break; case 7495: if (Game_Flag_Query(46)) { @@ -602,19 +601,19 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(30, 10, -1, 5); } - VK_Play_Speech_Line(6, 1770, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1770, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(6, 1780, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1780, 0.5f); break; case 7515: if (Game_Flag_Query(46)) { VK_Subject_Reacts(50, -1, 12, 5); - VK_Play_Speech_Line(6, 1790, 0.5f); - VK_Play_Speech_Line(0, 7995, 0.5f); - VK_Play_Speech_Line(6, 1800, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1790, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7995, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1800, 0.5f); } else { VK_Subject_Reacts(30, 10, 0, 3); - VK_Play_Speech_Line(6, 1810, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1810, 0.5f); } break; case 7525: @@ -625,92 +624,92 @@ void VKScript::sub_402604(int a1) { VK_Subject_Reacts(40, 11, -3, 7); VK_Eye_Animates(2); } - VK_Play_Speech_Line(6, 1820, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1820, 0.5f); break; case 7535: - VK_Play_Speech_Line(6, 1830, 0.5f); - VK_Play_Speech_Line(0, 8000, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1830, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8000, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(10, 1, 8, 0); } else { VK_Subject_Reacts(20, 9, -1, 0); } - VK_Play_Speech_Line(6, 1840, 0.5f); - VK_Play_Speech_Line(6, 1850, 0.5f); - VK_Play_Speech_Line(0, 8005, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1840, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1850, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8005, 0.5f); break; case 7540: if (Game_Flag_Query(46)) { VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 1860, 0.5f); - VK_Play_Speech_Line(0, 8010, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1860, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8010, 0.5f); VK_Subject_Reacts(50, -2, 12, 5); - VK_Play_Speech_Line(6, 1870, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1870, 0.5f); } else { VK_Subject_Reacts(60, 12, -2, 5); - VK_Play_Speech_Line(6, 1880, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1880, 0.5f); } break; case 7550: - VK_Play_Speech_Line(6, 1890, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1890, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(20, 2, 9, -1); } else { VK_Subject_Reacts(10, 8, -1, -2); } - VK_Play_Speech_Line(6, 1900, 0.5f); - VK_Play_Speech_Line(0, 8015, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1900, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8015, 0.5f); break; case 7565: - VK_Play_Speech_Line(6, 1910, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1910, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(30, -2, 10, 8); } else { VK_Subject_Reacts(20, 9, -3, 6); } - VK_Play_Speech_Line(6, 1920, 0.5f); - VK_Play_Speech_Line(0, 8020, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1920, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8020, 0.5f); VK_Eye_Animates(2); break; case 7580: - VK_Play_Speech_Line(6, 1930, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1930, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(20, 5, 10, -1); } else { VK_Subject_Reacts(30, 10, 3, 0); } - VK_Play_Speech_Line(0, 8025, 0.5f); - VK_Play_Speech_Line(6, 1940, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8025, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1940, 0.5f); break; case 7585: - VK_Play_Speech_Line(6, 1950, 0.5f); - VK_Play_Speech_Line(0, 8030, 0.5f); - VK_Play_Speech_Line(6, 1960, 0.5f); - VK_Play_Speech_Line(0, 8035, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1950, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8030, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1960, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8035, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 1970, 0.5f); - VK_Play_Speech_Line(0, 7590, 0.5f); - VK_Play_Speech_Line(6, 1980, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1970, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7590, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1980, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(40, 1, 11, 5); } else { VK_Subject_Reacts(50, 12, -3, 5); } - VK_Play_Speech_Line(6, 1990, 0.5f); - VK_Play_Speech_Line(0, 8040, 0.5f); + VK_Play_Speech_Line(kActorLucy, 1990, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8040, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(6, 2000, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2000, 0.5f); break; case 7595: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 2010, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2010, 0.5f); VK_Subject_Reacts(30, -2, 10, 5); - VK_Play_Speech_Line(6, 2020, 0.5f); - VK_Play_Speech_Line(0, 8045, 0.5f); - VK_Play_Speech_Line(6, 2030, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2020, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8045, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2030, 0.5f); } else { VK_Subject_Reacts(60, 12, -3, 7); - VK_Play_Speech_Line(6, 2040, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2040, 0.5f); } break; case 7600: @@ -720,19 +719,19 @@ void VKScript::sub_402604(int a1) { VK_Subject_Reacts(60, 12, -2, 10); } VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 2050, 0.5f); - VK_Play_Speech_Line(0, 8050, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2050, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8050, 0.5f); VK_Subject_Reacts(90, 0, 0, 0); - VK_Play_Speech_Line(6, 2060, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2060, 0.5f); break; case 7605: - VK_Play_Speech_Line(6, 2070, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2070, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(30, 0, 11, 12); } else { VK_Subject_Reacts(50, 10, -3, 15); } - VK_Play_Speech_Line(6, 2080, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2080, 0.5f); break; case 7620: if (Game_Flag_Query(46)) { @@ -740,44 +739,44 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(70, 9, -1, 10); } - VK_Play_Speech_Line(6, 2090, 0.5f); - VK_Play_Speech_Line(0, 8055, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2090, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8055, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(6, 2100, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2100, 0.5f); break; case 7635: VK_Eye_Animates(3); - VK_Play_Speech_Line(6, 2110, 0.5f); - VK_Play_Speech_Line(0, 7655, 0.5f); - VK_Play_Speech_Line(0, 7660, 0.5f); - VK_Play_Speech_Line(0, 7665, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2110, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7655, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7660, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7665, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(80, 5, 14, 25); } else { VK_Subject_Reacts(70, 9, -2, 20); } - VK_Play_Speech_Line(6, 2120, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2120, 0.5f); break; case 7670: if (Game_Flag_Query(46)) { - VK_Play_Speech_Line(6, 2130, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2130, 0.5f); VK_Subject_Reacts(30, -3, 11, 8); - VK_Play_Speech_Line(6, 2140, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2140, 0.5f); } else { VK_Subject_Reacts(20, 10, 0, 5); - VK_Play_Speech_Line(6, 2150, 0.5f); - VK_Play_Speech_Line(6, 2160, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2150, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2160, 0.5f); } break; case 7680: VK_Eye_Animates(2); - VK_Play_Speech_Line(6, 2170, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2170, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(65, 1, 6, 5); } else { VK_Subject_Reacts(50, 10, 3, 4); } - VK_Play_Speech_Line(6, 2180, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2180, 0.5f); break; case 7690: if (Game_Flag_Query(46)) { @@ -785,38 +784,38 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(50, 13, 0, 0); } - VK_Play_Speech_Line(6, 2190, 0.5f); - VK_Play_Speech_Line(0, 8060, 0.5f); - VK_Play_Speech_Line(6, 2200, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2190, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8060, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2200, 0.5f); VK_Subject_Reacts(30, -4, -4, -5); - VK_Play_Speech_Line(6, 2210, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2210, 0.5f); break; case 7705: if (Game_Flag_Query(46)) { VK_Eye_Animates(3); VK_Subject_Reacts(30, 0, 0, 0); - VK_Play_Speech_Line(6, 2220, 0.5f); - VK_Play_Speech_Line(0, 7730, 0.5f); - VK_Play_Speech_Line(0, 7735, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2220, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7730, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7735, 0.5f); VK_Subject_Reacts(50, 2, 10, 12); - VK_Play_Speech_Line(6, 2230, 0.5f); - VK_Play_Speech_Line(0, 8065, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2230, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8065, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(6, 2240, 0.5f); - VK_Play_Speech_Line(0, 8070, 0.5f); - VK_Play_Speech_Line(0, 8075, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2240, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8070, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8075, 0.5f); } else { VK_Eye_Animates(2); VK_Subject_Reacts(50, 0, 0, 0); - VK_Play_Speech_Line(6, 2250, 0.5f); - VK_Play_Speech_Line(0, 7730, 0.5f); - VK_Play_Speech_Line(0, 7735, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2250, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7730, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7735, 0.5f); VK_Eye_Animates(3); VK_Subject_Reacts(60, 12, 2, 12); - VK_Play_Speech_Line(6, 2230, 0.5f); - VK_Play_Speech_Line(6, 2270, 0.5f); - VK_Play_Speech_Line(0, 8080, 0.5f); - VK_Play_Speech_Line(6, 2280, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2230, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2270, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8080, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2280, 0.5f); } break; case 7740: @@ -825,13 +824,13 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(50, -1, -3, 3); } - VK_Play_Speech_Line(6, 2290, 0.5f); - VK_Play_Speech_Line(0, 8085, 0.5f); - VK_Play_Speech_Line(6, 2300, 0.5f); - VK_Play_Speech_Line(0, 8090, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2290, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8085, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2300, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8090, 0.5f); VK_Subject_Reacts(20, 2, 2, 0); - VK_Play_Speech_Line(6, 2310, 0.5f); - VK_Play_Speech_Line(6, 2320, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2310, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2320, 0.5f); break; case 7750: VK_Eye_Animates(3); @@ -840,1137 +839,1137 @@ void VKScript::sub_402604(int a1) { } else { VK_Subject_Reacts(80, 12, -3, 18); } - VK_Play_Speech_Line(6, 2330, 0.5f); - VK_Play_Speech_Line(0, 8095, 0.5f); - VK_Play_Speech_Line(6, 2340, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2330, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8095, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2340, 0.5f); break; case 7770: - VK_Play_Speech_Line(6, 2350, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2350, 0.5f); if (Game_Flag_Query(46)) { VK_Subject_Reacts(90, -3, -1, 12); } else { VK_Eye_Animates(2); VK_Subject_Reacts(90, 13, -4, 12); } - VK_Play_Speech_Line(6, 2360, 0.5f); + VK_Play_Speech_Line(kActorLucy, 2360, 0.5f); break; } } -void VKScript::sub_404B44(int a1) { - switch (a1) { +void VKScript::askGrigorian(int questionId) { + switch (questionId) { case 7385: VK_Subject_Reacts(20, 0, 0, 5); - VK_Play_Speech_Line(11, 440, 0.5f); - VK_Play_Speech_Line(0, 8100, 0.5f); - VK_Play_Speech_Line(11, 450, 0.5f); - VK_Play_Speech_Line(0, 8105, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 440, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8100, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 450, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8105, 0.5f); break; case 7390: VK_Subject_Reacts(20, 0, 0, 3); - VK_Play_Speech_Line(11, 460, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 460, 0.5f); break; case 7395: VK_Subject_Reacts(20, 0, 0, 7); VK_Eye_Animates(2); - VK_Play_Speech_Line(11, 470, 0.5f); - VK_Play_Speech_Line(11, 480, 0.5f); - VK_Play_Speech_Line(0, 8105, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 470, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 480, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8105, 0.5f); break; case 7400: VK_Subject_Reacts(10, 8, 0, -5); - VK_Play_Speech_Line(11, 490, 0.5f); - VK_Play_Speech_Line(11, 500, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 490, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 500, 0.5f); break; case 7405: - VK_Play_Speech_Line(11, 510, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 510, 0.5f); VK_Subject_Reacts(30, 10, 7, 0); - VK_Play_Speech_Line(11, 520, 0.5f); - VK_Play_Speech_Line(0, 8115, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 520, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8115, 0.5f); break; case 7410: VK_Subject_Reacts(20, 12, -3, -3); - VK_Play_Speech_Line(11, 530, 0.5f); - VK_Play_Speech_Line(11, 540, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 530, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 540, 0.5f); break; case 7415: - VK_Play_Speech_Line(11, 550, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 550, 0.5f); VK_Subject_Reacts(25, 7, 8, 8); - VK_Play_Speech_Line(11, 560, 0.5f); - VK_Play_Speech_Line(0, 8120, 0.5f); - VK_Play_Speech_Line(0, 8125, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 560, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8120, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8125, 0.5f); VK_Subject_Reacts(75, 8, 0, 0); - VK_Play_Speech_Line(11, 570, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 570, 0.5f); break; case 7420: VK_Subject_Reacts(10, 6, 8, -5); - VK_Play_Speech_Line(11, 580, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 580, 0.5f); break; case 7425: VK_Subject_Reacts(30, 8, -2, 5); - VK_Play_Speech_Line(11, 590, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 590, 0.5f); break; case 7430: VK_Eye_Animates(2); VK_Subject_Reacts(45, 8, 7, 15); - VK_Play_Speech_Line(11, 600, 0.5f); - VK_Play_Speech_Line(0, 8130, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 600, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8130, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(11, 610, 0.5f); - VK_Play_Speech_Line(0, 8135, 0.5f); - VK_Play_Speech_Line(0, 8140, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 610, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8135, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8140, 0.5f); break; case 7435: - VK_Play_Speech_Line(11, 620, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 620, 0.5f); VK_Subject_Reacts(15, 8, -3, -5); - VK_Play_Speech_Line(11, 630, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 630, 0.5f); break; case 7440: VK_Subject_Reacts(25, 4, 7, -3); - VK_Play_Speech_Line(11, 640, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 640, 0.5f); break; case 7445: VK_Subject_Reacts(30, 8, 3, 5); - VK_Play_Speech_Line(11, 650, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 650, 0.5f); break; case 7450: - VK_Play_Speech_Line(11, 660, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 660, 0.5f); VK_Subject_Reacts(35, 4, 8, 3); - VK_Play_Speech_Line(0, 8145, 0.5f); - VK_Play_Speech_Line(11, 670, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8145, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 670, 0.5f); break; case 7455: - VK_Play_Speech_Line(11, 680, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 680, 0.5f); VK_Subject_Reacts(20, 7, -3, -5); - VK_Play_Speech_Line(11, 690, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 690, 0.5f); break; case 7460: VK_Subject_Reacts(15, 4, 8, 0); - VK_Play_Speech_Line(11, 700, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 700, 0.5f); break; case 7465: VK_Subject_Reacts(5, 7, -4, -7); - VK_Play_Speech_Line(11, 710, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 710, 0.5f); break; case 7470: VK_Subject_Reacts(30, 4, 8, -2); - VK_Play_Speech_Line(11, 720, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 720, 0.5f); break; case 7475: VK_Subject_Reacts(15, 8, 2, 5); - VK_Play_Speech_Line(11, 730, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 730, 0.5f); break; case 7480: VK_Subject_Reacts(20, 9, 4, 8); - VK_Play_Speech_Line(11, 740, 0.5f); - VK_Play_Speech_Line(11, 750, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 740, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 750, 0.5f); break; case 7485: VK_Subject_Reacts(15, 8, 8, 5); - VK_Play_Speech_Line(11, 760, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 760, 0.5f); break; case 7490: VK_Eye_Animates(3); VK_Subject_Reacts(30, 7, -4, 12); - VK_Play_Speech_Line(11, 770, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 770, 0.5f); break; case 7495: - VK_Play_Speech_Line(11, 780, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 780, 0.5f); VK_Subject_Reacts(30, 9, 6, 5); - VK_Play_Speech_Line(11, 790, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 790, 0.5f); break; case 7515: VK_Eye_Animates(2); - VK_Play_Speech_Line(11, 800, 0.5f); - VK_Play_Speech_Line(0, 8150, 0.5f); - VK_Play_Speech_Line(0, 8155, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 800, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8150, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8155, 0.5f); VK_Subject_Reacts(30, 9, -5, 12); - VK_Play_Speech_Line(11, 810, 0.5f); - VK_Play_Speech_Line(0, 8160, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 810, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8160, 0.5f); break; case 7525: VK_Subject_Reacts(30, 8, 5, 8); - VK_Play_Speech_Line(11, 820, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 820, 0.5f); break; case 7535: VK_Subject_Reacts(20, 9, 2, 4); - VK_Play_Speech_Line(11, 830, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 830, 0.5f); break; case 7540: - VK_Play_Speech_Line(11, 840, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 840, 0.5f); VK_Subject_Reacts(20, 5, 1, 8); break; case 7550: VK_Eye_Animates(3); - VK_Play_Speech_Line(11, 850, 0.5f); - VK_Play_Speech_Line(0, 8165, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 850, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8165, 0.5f); VK_Subject_Reacts(60, 6, 2, 15); - VK_Play_Speech_Line(11, 860, 0.5f); - VK_Play_Speech_Line(0, 8170, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 860, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8170, 0.5f); VK_Eye_Animates(3); break; case 7565: VK_Subject_Reacts(40, 8, 8, 12); VK_Eye_Animates(2); - VK_Play_Speech_Line(11, 870, 0.5f); - VK_Play_Speech_Line(0, 8175, 0.5f); - VK_Play_Speech_Line(11, 880, 0.5f); - VK_Play_Speech_Line(11, 890, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 870, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8175, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 880, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 890, 0.5f); break; case 7580: - VK_Play_Speech_Line(11, 900, 0.5f); - VK_Play_Speech_Line(0, 8180, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 900, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8180, 0.5f); VK_Subject_Reacts(20, 8, 3, 6); - VK_Play_Speech_Line(11, 910, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 910, 0.5f); break; case 7585: VK_Subject_Reacts(50, 9, 3, 8); - VK_Play_Speech_Line(11, 1250, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1250, 0.5f); break; case 7595: VK_Subject_Reacts(25, 8, -3, 5); - VK_Play_Speech_Line(11, 920, 0.5f); - VK_Play_Speech_Line(0, 8185, 0.5f); - VK_Play_Speech_Line(11, 930, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 920, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8185, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 930, 0.5f); break; case 7600: VK_Subject_Reacts(20, 5, 9, 2); - VK_Play_Speech_Line(11, 940, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 940, 0.5f); break; case 7605: VK_Eye_Animates(3); VK_Subject_Reacts(40, 10, -3, 15); - VK_Play_Speech_Line(11, 950, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 950, 0.5f); break; case 7620: VK_Subject_Reacts(30, 9, 10, 10); - VK_Play_Speech_Line(11, 960, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 960, 0.5f); break; case 7635: VK_Eye_Animates(2); - VK_Play_Speech_Line(11, 970, 0.5f); - VK_Play_Speech_Line(0, 7645, 0.5f); - VK_Play_Speech_Line(0, 7650, 0.5f); - VK_Play_Speech_Line(0, 7655, 0.5f); - VK_Play_Speech_Line(0, 7660, 0.5f); - VK_Play_Speech_Line(0, 7665, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 970, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7645, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7650, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7655, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7660, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7665, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(11, 980, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 980, 0.5f); VK_Subject_Reacts(20, 10, 5, 12); break; case 7670: VK_Subject_Reacts(30, 4, 1, 10); - VK_Play_Speech_Line(11, 990, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 990, 0.5f); break; case 7680: - VK_Play_Speech_Line(11, 1000, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1000, 0.5f); VK_Subject_Reacts(30, 9, 3, 10); - VK_Play_Speech_Line(11, 1010, 0.5f); - VK_Play_Speech_Line(0, 8190, 0.5f); - VK_Play_Speech_Line(11, 1020, 0.5f); - VK_Play_Speech_Line(11, 1030, 0.5f); - VK_Play_Speech_Line(11, 1040, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1010, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8190, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1020, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1030, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1040, 0.5f); break; case 7690: - VK_Play_Speech_Line(11, 1050, 0.5f); - VK_Play_Speech_Line(0, 7695, 0.5f); - VK_Play_Speech_Line(0, 7700, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1050, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7695, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7700, 0.5f); VK_Subject_Reacts(60, 11, 9, 100); - VK_Play_Speech_Line(11, 1060, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1060, 0.5f); break; case 7705: VK_Eye_Animates(3); - VK_Play_Speech_Line(11, 1070, 0.5f); - VK_Play_Speech_Line(0, 7720, 0.5f); - VK_Play_Speech_Line(0, 7725, 0.5f); - VK_Play_Speech_Line(0, 7730, 0.5f); - VK_Play_Speech_Line(0, 7735, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1070, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7720, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7725, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7730, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7735, 0.5f); VK_Subject_Reacts(60, 14, 3, 20); - VK_Play_Speech_Line(11, 1080, 0.5f); - VK_Play_Speech_Line(0, 8195, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1080, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8195, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(11, 1090, 0.5f); - VK_Play_Speech_Line(0, 8200, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1090, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8200, 0.5f); break; case 7740: VK_Subject_Reacts(40, 10, 1, 15); - VK_Play_Speech_Line(11, 1100, 0.5f); - VK_Play_Speech_Line(0, 8205, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1100, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8205, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(11, 1110, 0.5f); - VK_Play_Speech_Line(0, 8210, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1110, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8210, 0.5f); break; case 7750: VK_Eye_Animates(2); VK_Subject_Reacts(50, 9, -4, 20); - VK_Play_Speech_Line(11, 1120, 0.5f); - VK_Play_Speech_Line(11, 1130, 0.5f); - VK_Play_Speech_Line(11, 1140, 0.5f); - VK_Play_Speech_Line(0, 8220, 0.5f); - VK_Play_Speech_Line(11, 1150, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1120, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1130, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1140, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8220, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1150, 0.5f); break; case 7770: - VK_Play_Speech_Line(11, 1160, 0.5f); + VK_Play_Speech_Line(kActorGrigorian, 1160, 0.5f); VK_Subject_Reacts(5, -8, 7, 10); break; } } -void VKScript::sub_406088(int a1) { - switch (a1) { +void VKScript::askDektora(int questionId) { + switch (questionId) { case 7385: VK_Subject_Reacts(36, 0, 0, 0); - VK_Play_Speech_Line(3, 1440, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1440, 0.5f); break; case 7390: VK_Subject_Reacts(40, 2, 2, 0); - VK_Play_Speech_Line(3, 1450, 0.5f); - VK_Play_Speech_Line(0, 7785, 0.5f); - VK_Play_Speech_Line(3, 1460, 0.5f); - VK_Play_Speech_Line(0, 7790, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1450, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7785, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1460, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7790, 0.5f); break; case 7395: - VK_Play_Speech_Line(3, 1470, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1470, 0.5f); VK_Subject_Reacts(40, 4, 4, 0); - VK_Play_Speech_Line(0, 7795, 0.5f); - VK_Play_Speech_Line(3, 1480, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7795, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1480, 0.5f); break; case 7400: if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 1490, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1490, 0.5f); VK_Subject_Reacts(15, -1, 9, 0); - VK_Play_Speech_Line(3, 1500, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1500, 0.5f); } else { VK_Subject_Reacts(15, 13, -1, 0); - VK_Play_Speech_Line(3, 1510, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1510, 0.5f); } break; case 7405: VK_Eye_Animates(3); if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 1520, 0.5f); - VK_Play_Speech_Line(0, 7840, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1520, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7840, 0.5f); VK_Subject_Reacts(20, -1, 9, 10); - VK_Play_Speech_Line(3, 1540, 0.80000001f); - VK_Play_Speech_Line(3, 1550, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1540, 0.80000001f); + VK_Play_Speech_Line(kActorDektora, 1550, 0.5f); } else { - VK_Play_Speech_Line(3, 1560, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1560, 0.5f); VK_Subject_Reacts(25, 13, -3, 0); - VK_Play_Speech_Line(3, 1570, 0.80000001f); - VK_Play_Speech_Line(3, 1580, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1570, 0.80000001f); + VK_Play_Speech_Line(kActorDektora, 1580, 0.5f); } break; case 7410: - VK_Play_Speech_Line(3, 1590, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1590, 0.5f); VK_Subject_Reacts(50, 10, 10, 10); - VK_Play_Speech_Line(3, 1600, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1600, 0.5f); break; case 7415: VK_Eye_Animates(3); VK_Subject_Reacts(80, 6, 4, 10); - VK_Play_Speech_Line(3, 1610, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1610, 0.5f); break; case 7420: if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 1620, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1620, 0.5f); VK_Subject_Reacts(25, -1, 9, 0); } else { VK_Subject_Reacts(25, 14, -2, 0); - VK_Play_Speech_Line(3, 1630, 0.89999998f); - VK_Play_Speech_Line(3, 1640, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1630, 0.89999998f); + VK_Play_Speech_Line(kActorDektora, 1640, 0.5f); } break; case 7425: VK_Subject_Reacts(40, -1, -1, 0); - VK_Play_Speech_Line(3, 1650, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1650, 0.5f); break; case 7430: VK_Subject_Reacts(65, 4, 6, 10); VK_Eye_Animates(3); - VK_Play_Speech_Line(3, 1660, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1660, 0.5f); break; case 7435: if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 1670, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1670, 0.5f); VK_Subject_Reacts(60, -2, 9, 0); - VK_Play_Speech_Line(3, 1680, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1680, 0.5f); } else { VK_Subject_Reacts(60, 14, 2, 0); - VK_Play_Speech_Line(3, 1690, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1690, 0.5f); } break; case 7440: VK_Subject_Reacts(30, 3, 5, 0); - VK_Play_Speech_Line(3, 1700, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1700, 0.5f); break; case 7445: - VK_Play_Speech_Line(3, 1710, 0.5f); - VK_Play_Speech_Line(0, 7800, 0.5f); - VK_Play_Speech_Line(3, 1720, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1710, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7800, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1720, 0.5f); VK_Subject_Reacts(45, 4, 6, 0); - VK_Play_Speech_Line(3, 1730, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1730, 0.5f); break; case 7450: VK_Eye_Animates(2); VK_Subject_Reacts(60, 7, 7, 20); - VK_Play_Speech_Line(3, 1740, 0.5f); - VK_Play_Speech_Line(0, 7805, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1740, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7805, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(3, 1750, 0.89999998f); - VK_Play_Speech_Line(3, 1760, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1750, 0.89999998f); + VK_Play_Speech_Line(kActorDektora, 1760, 0.5f); break; case 7455: - VK_Play_Speech_Line(3, 1780, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1780, 0.5f); VK_Subject_Reacts(35, 3, 5, 0); - VK_Play_Speech_Line(3, 1790, 0.5f); - VK_Play_Speech_Line(0, 7810, 0.5f); - VK_Play_Speech_Line(3, 1800, 0.5f); - VK_Play_Speech_Line(0, 7815, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1790, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7810, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1800, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7815, 0.5f); break; case 7460: if (Game_Flag_Query(47)) { VK_Subject_Reacts(40, -2, 10, 10); - VK_Play_Speech_Line(3, 1810, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1810, 0.5f); } else { VK_Subject_Reacts(35, 14, 3, 0); - VK_Play_Speech_Line(3, 1820, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1820, 0.5f); } break; case 7465: if (Game_Flag_Query(47)) { VK_Subject_Reacts(60, -3, 10, 5); - VK_Play_Speech_Line(3, 1830, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1830, 0.5f); } else { - VK_Play_Speech_Line(3, 1840, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1840, 0.5f); VK_Subject_Reacts(60, 13, 2, 5); } break; case 7470: if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 1850, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1850, 0.5f); VK_Subject_Reacts(50, -2, 11, 0); - VK_Play_Speech_Line(3, 1860, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1860, 0.5f); } else { VK_Subject_Reacts(90, 15, -5, 10); - VK_Play_Speech_Line(3, 1870, 0.5f); - VK_Play_Speech_Line(0, 8532, 0.5f); - VK_Play_Speech_Line(3, 1890, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1870, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8532, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1890, 0.5f); } break; case 7475: VK_Subject_Reacts(28, 0, 0, 0); - VK_Play_Speech_Line(3, 1900, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1900, 0.5f); break; case 7480: if (Game_Flag_Query(47)) { VK_Subject_Reacts(55, -3, 12, 5); - VK_Play_Speech_Line(3, 1910, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1910, 0.5f); } else { - VK_Play_Speech_Line(3, 1920, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1920, 0.5f); VK_Subject_Reacts(55, 17, -3, 5); - VK_Play_Speech_Line(3, 1930, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1930, 0.5f); } break; case 7485: - VK_Play_Speech_Line(3, 1940, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1940, 0.5f); VK_Subject_Reacts(38, 4, 9, 0); break; case 7490: VK_Subject_Reacts(43, 8, 8, 5); - VK_Play_Speech_Line(3, 1950, 0.5f); - VK_Play_Speech_Line(0, 7820, 0.5f); - VK_Play_Speech_Line(3, 1960, 0.5f); - VK_Play_Speech_Line(0, 7825, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1950, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7820, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1960, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7825, 0.5f); break; case 7495: - VK_Play_Speech_Line(3, 1970, 0.5f); - VK_Play_Speech_Line(0, 7830, 0.5f); - VK_Play_Speech_Line(3, 1980, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1970, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7830, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1980, 0.5f); VK_Subject_Reacts(65, 4, 4, 5); - VK_Play_Speech_Line(3, 1990, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1990, 0.5f); break; case 7515: if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2000, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2000, 0.5f); VK_Subject_Reacts(72, -3, 12, 2); - VK_Play_Speech_Line(3, 2010, 0.5f); - VK_Play_Speech_Line(0, 7835, 0.5f); - VK_Play_Speech_Line(3, 2020, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2010, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7835, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2020, 0.5f); } else { VK_Subject_Reacts(60, 16, -1, 2); - VK_Play_Speech_Line(3, 2030, 0.5f); - VK_Play_Speech_Line(0, 7840, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2030, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7840, 0.5f); } break; case 7525: VK_Subject_Reacts(40, 6, 6, 0); - VK_Play_Speech_Line(3, 2040, 0.5f); - VK_Play_Speech_Line(0, 8533, 0.5f); - VK_Play_Speech_Line(3, 2060, 0.5f); - VK_Play_Speech_Line(3, 2070, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2040, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8533, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2060, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2070, 0.5f); break; case 7535: if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2080, 0.5f); - VK_Play_Speech_Line(0, 7845, 0.5f); - VK_Play_Speech_Line(3, 2090, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2080, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7845, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2090, 0.5f); VK_Subject_Reacts(60, -6, 11, 0); - VK_Play_Speech_Line(3, 2100, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2100, 0.5f); } else { VK_Subject_Reacts(60, 17, -7, 0); - VK_Play_Speech_Line(3, 2110, 0.5f); - VK_Play_Speech_Line(0, 7850, 0.5f); - VK_Play_Speech_Line(3, 2120, 0.5f); - VK_Play_Speech_Line(0, 7855, 0.5f); - VK_Play_Speech_Line(3, 2130, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2110, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7850, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2120, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7855, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2130, 0.5f); } break; case 7540: VK_Eye_Animates(2); if (Game_Flag_Query(47)) { VK_Subject_Reacts(70, -5, 12, 80); - VK_Play_Speech_Line(3, 2140, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2140, 0.5f); } else { VK_Subject_Reacts(80, 17, -1, 80); - VK_Play_Speech_Line(3, 2150, 1.0f); - VK_Play_Speech_Line(3, 2160, 0.5f); - VK_Play_Speech_Line(0, 7860, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2150, 1.0f); + VK_Play_Speech_Line(kActorDektora, 2160, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7860, 0.5f); } break; case 7550: - VK_Play_Speech_Line(3, 2170, 0.5f); - VK_Play_Speech_Line(0, 7865, 0.5f); - VK_Play_Speech_Line(3, 2180, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2170, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7865, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2180, 0.5f); VK_Subject_Reacts(55, 6, 5, 0); - VK_Play_Speech_Line(3, 2190, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2190, 0.5f); break; case 7565: VK_Eye_Animates(2); - VK_Play_Speech_Line(3, 2210, 0.5f); - VK_Play_Speech_Line(0, 7870, 0.5f); - VK_Play_Speech_Line(3, 2220, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2210, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7870, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2220, 0.5f); VK_Subject_Reacts(70, 8, 7, 10); - VK_Play_Speech_Line(3, 2230, 0.5f); - VK_Play_Speech_Line(0, 7875, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2230, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7875, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(3, 2240, 0.5f); - VK_Play_Speech_Line(3, 2250, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2240, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2250, 0.5f); break; case 7580: - VK_Play_Speech_Line(3, 2260, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2260, 0.5f); VK_Subject_Reacts(40, 5, 5, 10); - VK_Play_Speech_Line(3, 2270, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2270, 0.5f); break; case 7585: VK_Subject_Reacts(50, 8, 8, 7); - VK_Play_Speech_Line(3, 2280, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2280, 0.5f); break; case 7595: VK_Eye_Animates(3); - VK_Play_Speech_Line(3, 2290, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2290, 0.5f); VK_Subject_Reacts(30, 5, 5, 8); break; case 7600: - VK_Play_Speech_Line(3, 2300, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2300, 0.5f); VK_Subject_Reacts(30, 4, 4, 5); if (!Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2310, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2310, 0.5f); } break; case 7605: VK_Subject_Reacts(60, -1, -1, 5); - VK_Play_Speech_Line(3, 2320, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2320, 0.5f); break; case 7620: - VK_Play_Speech_Line(3, 2340, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2340, 0.5f); VK_Subject_Reacts(72, 9, 9, 5); - VK_Play_Speech_Line(3, 2350, 0.5f); - VK_Play_Speech_Line(0, 7885, 0.5f); - VK_Play_Speech_Line(3, 2360, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2350, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7885, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2360, 0.5f); break; case 7635: VK_Subject_Reacts(60, 6, 7, 0); - VK_Play_Speech_Line(3, 2370, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2370, 0.5f); break; case 7670: VK_Eye_Animates(3); if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2380, 0.5f); - VK_Play_Speech_Line(0, 7890, 0.5f); - VK_Play_Speech_Line(3, 2390, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2380, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7890, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2390, 0.5f); VK_Subject_Reacts(90, -3, 14, 50); - VK_Play_Speech_Line(0, 7895, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7895, 0.5f); } else { VK_Subject_Reacts(80, 18, -3, 10); - VK_Play_Speech_Line(3, 2410, 0.5f); - VK_Play_Speech_Line(0, 8534, 0.5f); - VK_Play_Speech_Line(3, 2430, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2410, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8534, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2430, 0.5f); } break; case 7680: VK_Eye_Animates(3); if (Game_Flag_Query(47)) { VK_Subject_Reacts(70, -4, 14, 15); - VK_Play_Speech_Line(3, 2440, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2440, 0.5f); } else { - VK_Play_Speech_Line(3, 2450, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2450, 0.5f); VK_Subject_Reacts(70, 18, -4, 15); - VK_Play_Speech_Line(3, 2460, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2460, 0.5f); } break; case 7690: - VK_Play_Speech_Line(3, 2470, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2470, 0.5f); VK_Subject_Reacts(20, 9, 8, 5); - VK_Play_Speech_Line(3, 2480, 0.5f); - VK_Play_Speech_Line(0, 7900, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2480, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7900, 0.5f); break; case 7705: VK_Eye_Animates(3); if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2500, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2500, 0.5f); VK_Subject_Reacts(85, 7, 14, 20); - VK_Play_Speech_Line(3, 2510, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2510, 0.5f); } else { VK_Subject_Reacts(99, 18, 7, 20); - VK_Play_Speech_Line(3, 2530, 0.5f); - VK_Play_Speech_Line(0, 7910, 0.5f); - VK_Play_Speech_Line(3, 2550, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2530, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7910, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2550, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(0, 7915, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7915, 0.5f); } break; case 7740: VK_Subject_Reacts(60, 5, 6, 0); - VK_Play_Speech_Line(3, 2560, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2560, 0.5f); break; case 7750: if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2580, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2580, 0.5f); VK_Subject_Reacts(90, -5, 14, 20); - VK_Play_Speech_Line(3, 2590, 0.5f); - VK_Play_Speech_Line(0, 7920, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2590, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7920, 0.5f); } else { VK_Subject_Reacts(90, 17, 3, 20); - VK_Play_Speech_Line(3, 2600, 0.5f); - VK_Play_Speech_Line(0, 7925, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2600, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7925, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(3, 2610, 0.5f); - VK_Play_Speech_Line(0, 7930, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2610, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7930, 0.5f); } break; case 7770: VK_Eye_Animates(2); if (Game_Flag_Query(47)) { - VK_Play_Speech_Line(3, 2630, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2630, 0.5f); VK_Subject_Reacts(99, 6, 15, 30); } else { - VK_Play_Speech_Line(3, 2640, 0.5f); + VK_Play_Speech_Line(kActorDektora, 2640, 0.5f); VK_Subject_Reacts(99, 15, -4, 30); } break; } } -void VKScript::sub_407CF8(int a1) { - switch (a1) { +void VKScript::askRunciter(int questionId) { + switch (questionId) { case 7385: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7390: VK_Eye_Animates(3); VK_Subject_Reacts(60, 15, -30, 2); - VK_Play_Speech_Line(15, 1260, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1260, 0.5f); break; case 7395: VK_Eye_Animates(2); VK_Subject_Reacts(90, -40, -10, 6); - VK_Play_Speech_Line(15, 1280, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1280, 0.5f); break; case 7400: VK_Subject_Reacts(70, -10, -10, 0); - VK_Play_Speech_Line(15, 1300, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1300, 0.5f); break; case 7405: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7410: VK_Subject_Reacts(100, 10, 10, 0); - VK_Play_Speech_Line(15, 1330, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1330, 0.5f); break; case 7415: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7420: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7425: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7430: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7435: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7440: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7445: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7450: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7455: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7460: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7465: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7470: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7475: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7480: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7485: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7490: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7495: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7515: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7525: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7535: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7540: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7550: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7565: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7580: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7585: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7595: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7600: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7605: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7620: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7635: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7670: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7680: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7690: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7705: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7740: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7750: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; case 7770: VK_Subject_Reacts(20, 10, 20, 0); - VK_Play_Speech_Line(15, 1240, 0.5f); + VK_Play_Speech_Line(kActorRunciter, 1240, 0.5f); break; } } -void VKScript::sub_40897C(int a1) { - switch (a1) { +void VKScript::askBulletBob(int questionId) { + switch (questionId) { case 7385: VK_Eye_Animates(1); VK_Subject_Reacts(54, 0, 0, 0); - VK_Play_Speech_Line(14, 900, 0.5f); - VK_Play_Speech_Line(14, 910, 0.5f); - VK_Play_Speech_Line(0, 8225, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 900, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 910, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8225, 0.5f); break; case 7390: VK_Subject_Reacts(48, 0, 0, 3); - VK_Play_Speech_Line(14, 920, 0.5f); - VK_Play_Speech_Line(0, 8230, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 920, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8230, 0.5f); break; case 7395: - VK_Play_Speech_Line(14, 930, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 930, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(50, 0, 0, 8); - VK_Play_Speech_Line(14, 940, 0.5f); - VK_Play_Speech_Line(0, 8235, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 940, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8235, 0.5f); break; case 7400: - VK_Play_Speech_Line(14, 950, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 950, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(10, -5, -6, 2); - VK_Play_Speech_Line(14, 960, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 960, 0.5f); break; case 7405: VK_Subject_Reacts(25, 8, 7, 4); - VK_Play_Speech_Line(14, 970, 0.5f); - VK_Play_Speech_Line(0, 8240, 0.5f); - VK_Play_Speech_Line(14, 980, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 970, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8240, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 980, 0.5f); break; case 7410: VK_Subject_Reacts(40, -6, -5, 5); - VK_Play_Speech_Line(14, 990, 0.5f); - VK_Play_Speech_Line(0, 8245, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 990, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8245, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1000, 0.5f); - VK_Play_Speech_Line(0, 8250, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1000, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8250, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(70, 8, 6, 0); - VK_Play_Speech_Line(14, 1010, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1010, 0.5f); break; case 7415: VK_Subject_Reacts(25, 9, 6, 5); - VK_Play_Speech_Line(14, 1020, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1020, 0.5f); break; case 7420: VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1030, 0.5f); - VK_Play_Speech_Line(0, 8255, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1030, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8255, 0.5f); VK_Subject_Reacts(30, 7, 5, 3); VK_Eye_Animates(3); - VK_Play_Speech_Line(14, 1040, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1040, 0.5f); break; case 7425: - VK_Play_Speech_Line(14, 1050, 0.5f); - VK_Play_Speech_Line(14, 1060, 0.5f); - VK_Play_Speech_Line(0, 8260, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1050, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1060, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8260, 0.5f); VK_Subject_Reacts(5, 5, 6, -5); - VK_Play_Speech_Line(14, 1070, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1070, 0.5f); break; case 7430: VK_Subject_Reacts(15, 7, 6, -6); - VK_Play_Speech_Line(14, 1080, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1080, 0.5f); break; case 7435: VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1100, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1100, 0.5f); VK_Subject_Reacts(25, 8, 5, -7); - VK_Play_Speech_Line(0, 8265, 0.5f); - VK_Play_Speech_Line(14, 1110, 0.5f); - VK_Play_Speech_Line(14, 1120, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8265, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1110, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1120, 0.5f); break; case 7440: VK_Subject_Reacts(30, 8, 6, 0); - VK_Play_Speech_Line(14, 1130, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1130, 0.5f); break; case 7445: VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1140, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1140, 0.5f); VK_Subject_Reacts(80, 8, 8, -10); VK_Eye_Animates(3); - VK_Play_Speech_Line(14, 1150, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1150, 0.5f); break; case 7450: VK_Eye_Animates(2); - VK_Play_Speech_Line(14, 1160, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1160, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(60, 8, 8, -5); - VK_Play_Speech_Line(14, 1170, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1170, 0.5f); break; case 7455: VK_Subject_Reacts(30, 7, 6, 3); - VK_Play_Speech_Line(14, 1180, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1180, 0.5f); break; case 7460: VK_Subject_Reacts(10, 4, 4, 2); - VK_Play_Speech_Line(14, 1190, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1190, 0.5f); break; case 7465: VK_Subject_Reacts(15, 5, 3, -5); - VK_Play_Speech_Line(14, 1200, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1200, 0.5f); if (Actor_Query_Friendliness_To_Other(14, 0) <= 40) { VK_Eye_Animates(2); - VK_Play_Speech_Line(14, 1210, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1210, 0.5f); VK_Eye_Animates(1); } break; case 7470: VK_Subject_Reacts(50, -4, 0, -5); - VK_Play_Speech_Line(14, 1240, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1240, 0.5f); break; case 7475: - VK_Play_Speech_Line(14, 1250, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1250, 0.5f); VK_Subject_Reacts(30, 9, 7, -5); - VK_Play_Speech_Line(14, 1260, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1260, 0.5f); break; case 7480: VK_Subject_Reacts(60, 10, 8, -6); - VK_Play_Speech_Line(14, 1270, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1270, 0.5f); break; case 7485: VK_Subject_Reacts(70, 8, 9, 10); VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1280, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1280, 0.5f); break; case 7490: - VK_Play_Speech_Line(14, 1290, 0.5f); - VK_Play_Speech_Line(14, 1300, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1290, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1300, 0.5f); VK_Subject_Reacts(10, 11, 10, 0); - VK_Play_Speech_Line(14, 1310, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1310, 0.5f); break; case 7495: VK_Eye_Animates(2); - VK_Play_Speech_Line(14, 1320, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1320, 0.5f); VK_Subject_Reacts(10, 8, 7, 7); break; case 7515: VK_Subject_Reacts(25, 7, 7, 0); VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1330, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1330, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1340, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1340, 0.5f); break; case 7525: - VK_Play_Speech_Line(14, 1350, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1350, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(10, 7, 6, 6); break; case 7535: VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1360, 0.5f); - VK_Play_Speech_Line(0, 8275, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1360, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8275, 0.5f); VK_Subject_Reacts(10, 9, 7, -4); - VK_Play_Speech_Line(0, 8280, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8280, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1380, 0.5f); - VK_Play_Speech_Line(14, 1390, 0.5f); - VK_Play_Speech_Line(0, 8285, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1380, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1390, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8285, 0.5f); break; case 7540: - VK_Play_Speech_Line(14, 1400, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1400, 0.5f); VK_Subject_Reacts(30, 10, 9, 10); - VK_Play_Speech_Line(14, 1410, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1410, 0.5f); break; case 7550: VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1420, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1420, 0.5f); VK_Subject_Reacts(20, 7, 7, -5); - VK_Play_Speech_Line(14, 1430, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1430, 0.5f); if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } break; case 7565: - VK_Play_Speech_Line(14, 1440, 0.5f); - VK_Play_Speech_Line(0, 8295, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1440, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8295, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1450, 0.5f); - VK_Play_Speech_Line(0, 7570, 0.5f); - VK_Play_Speech_Line(0, 7575, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1450, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7570, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7575, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(14, 1460, 0.5f); - VK_Play_Speech_Line(0, 8300, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1460, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8300, 0.5f); VK_Subject_Reacts(90, 8, 9, 18); - VK_Play_Speech_Line(14, 1470, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1470, 0.5f); VK_Eye_Animates(3); break; case 7580: VK_Subject_Reacts(20, 9, 7, 0); - VK_Play_Speech_Line(14, 1480, 0.5f); - VK_Play_Speech_Line(0, 8305, 0.5f); - VK_Play_Speech_Line(14, 1490, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1480, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8305, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1490, 0.5f); break; case 7585: - VK_Play_Speech_Line(14, 1500, 0.5f); - VK_Play_Speech_Line(0, 7590, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1500, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7590, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(10, 8, 7, 5); - VK_Play_Speech_Line(14, 1510, 0.5f); - VK_Play_Speech_Line(14, 1520, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1510, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1520, 0.5f); break; case 7595: VK_Eye_Animates(1); VK_Subject_Reacts(40, 10, 9, 15); - VK_Play_Speech_Line(14, 1530, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1530, 0.5f); VK_Eye_Animates(2); break; case 7600: VK_Subject_Reacts(20, 8, 8, 5); - VK_Play_Speech_Line(14, 1540, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1540, 0.5f); break; case 7605: VK_Eye_Animates(1); VK_Subject_Reacts(40, 9, 8, 10); - VK_Play_Speech_Line(14, 1550, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1550, 0.5f); break; case 7620: - VK_Play_Speech_Line(14, 1560, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1560, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(0, 7630, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7630, 0.5f); VK_Eye_Animates(3); - VK_Play_Speech_Line(14, 1570, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1570, 0.5f); VK_Subject_Reacts(10, 10, 9, 10); break; case 7635: - VK_Play_Speech_Line(14, 1580, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1580, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(0, 8310, 0.5f); - VK_Play_Speech_Line(0, 7645, 0.5f); - VK_Play_Speech_Line(0, 7650, 0.5f); - VK_Play_Speech_Line(0, 7655, 0.5f); - VK_Play_Speech_Line(0, 7660, 0.5f); - VK_Play_Speech_Line(0, 7665, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8310, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7645, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7650, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7655, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7660, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7665, 0.5f); VK_Eye_Animates(2); VK_Subject_Reacts(60, 8, 8, 40); - VK_Play_Speech_Line(14, 1590, 0.5f); - VK_Play_Speech_Line(0, 8315, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1590, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8315, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(85, 10, 11, 0); - VK_Play_Speech_Line(14, 1600, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1600, 0.5f); VK_Eye_Animates(3); break; case 7670: VK_Subject_Reacts(50, 12, 7, 10); - VK_Play_Speech_Line(14, 1620, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1620, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(14, 1630, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1630, 0.5f); break; case 7680: - VK_Play_Speech_Line(14, 1640, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1640, 0.5f); VK_Subject_Reacts(15, 5, 6, 5); if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } - VK_Play_Speech_Line(0, 8320, 0.5f); - VK_Play_Speech_Line(14, 1650, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8320, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1650, 0.5f); break; case 7690: VK_Eye_Animates(2); VK_Subject_Reacts(50, 14, 13, 15); - VK_Play_Speech_Line(14, 1660, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1660, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(0, 8325, 0.5f); - VK_Play_Speech_Line(14, 1670, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8325, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1670, 0.5f); break; case 7705: - VK_Play_Speech_Line(14, 1680, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1680, 0.5f); VK_Eye_Animates(1); - VK_Play_Speech_Line(0, 7720, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7720, 0.5f); VK_Eye_Animates(1); VK_Subject_Reacts(40, 12, 10, 0); - VK_Play_Speech_Line(0, 7725, 0.5f); - VK_Play_Speech_Line(0, 7730, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7725, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7730, 0.5f); VK_Subject_Reacts(55, 6, 6, 0); VK_Eye_Animates(1); - VK_Play_Speech_Line(0, 7735, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7735, 0.5f); VK_Eye_Animates(2); VK_Subject_Reacts(70, 11, 9, 100); - VK_Play_Speech_Line(14, 1690, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1690, 0.5f); VK_Eye_Animates(2); break; case 7740: VK_Subject_Reacts(30, 4, 3, 3); VK_Eye_Animates(2); - VK_Play_Speech_Line(14, 1700, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1700, 0.5f); if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } - VK_Play_Speech_Line(14, 1710, 0.5f); - VK_Play_Speech_Line(14, 1720, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1710, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1720, 0.5f); if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } - VK_Play_Speech_Line(14, 1730, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1730, 0.5f); break; case 7750: if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } VK_Subject_Reacts(10, 8, 5, 0); - VK_Play_Speech_Line(14, 1740, 0.5f); - VK_Play_Speech_Line(0, 8330, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1740, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8330, 0.5f); if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } - VK_Play_Speech_Line(14, 1750, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1750, 0.5f); VK_Subject_Reacts(25, 7, 5, 8); - VK_Play_Speech_Line(14, 1760, 0.5f); - VK_Play_Speech_Line(14, 1770, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1760, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1770, 0.5f); break; case 7770: - VK_Play_Speech_Line(14, 1780, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1780, 0.5f); if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } - VK_Play_Speech_Line(0, 8335, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 8335, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(14, 1790, 0.5f); + VK_Play_Speech_Line(kActorBulletBob, 1790, 0.5f); if (Random_Query(0, 1) == 1) { VK_Eye_Animates(1); } @@ -1979,84 +1978,84 @@ void VKScript::sub_40897C(int a1) { } } -void VKScript::sub_40A300(int a1, int a2) { - switch (a1) { - case 15: - sub_407CF8(7385); +void VKScript::askCalibrationQuestion1(int actorId, int notUsed) { + switch (actorId) { + case kActorRunciter: + askRunciter(7385); break; - case 14: - sub_40897C(7385); + case kActorBulletBob: + askBulletBob(7385); break; - case 11: - sub_404B44(7385); + case kActorGrigorian: + askGrigorian(7385); break; - case 6: - sub_402604(7385); + case kActorLucy: + askLucy(7385); break; - case 3: - sub_40A510(7385); + case kActorDektora: + askCalibrationDektora1(7385); break; } } -void VKScript::sub_40A350(int a1, int a2) { - switch (a1) { - case 15: - sub_407CF8(7390); +void VKScript::askCalibrationQuestion2(int actorId, int notUsed) { + switch (actorId) { + case kActorRunciter: + askRunciter(7390); break; - case 14: - sub_40897C(7390); + case kActorBulletBob: + askBulletBob(7390); break; - case 11: - sub_404B44(7390); + case kActorGrigorian: + askGrigorian(7390); break; - case 6: - sub_402604(7390); + case kActorLucy: + askLucy(7390); break; - case 3: - sub_40A470(7390); + case kActorDektora: + askCalibrationDektora2(7390); break; } } -void VKScript::sub_40A3A0(int a1, int a2) { - switch (a1) { - case 15: - sub_407CF8(7395); +void VKScript::askCalibrationQuestion3(int actorId, int notUsed) { + switch (actorId) { + case kActorRunciter: + askRunciter(7395); break; - case 14: - sub_40897C(7395); + case kActorBulletBob: + askBulletBob(7395); break; - case 11: - sub_404B44(7395); + case kActorGrigorian: + askGrigorian(7395); break; - case 6: - sub_402604(7395); + case kActorLucy: + askLucy(7395); break; - case 3: - sub_40A3F0(7395); + case kActorDektora: + askCalibrationDektora3(7395); break; } } -void VKScript::sub_40A3F0(int a1) { - VK_Play_Speech_Line(3, 1470, 0.5f); +void VKScript::askCalibrationDektora3(int question1) { + VK_Play_Speech_Line(kActorDektora, 1470, 0.5f); VK_Subject_Reacts(40, 4, 4, 0); - VK_Play_Speech_Line(0, 7795, 0.5f); - VK_Play_Speech_Line(3, 1480, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7795, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1480, 0.5f); } -void VKScript::sub_40A470(int a1) { +void VKScript::askCalibrationDektora2(int question1) { VK_Subject_Reacts(40, 2, 2, 0); - VK_Play_Speech_Line(3, 1450, 0.5f); - VK_Play_Speech_Line(0, 7785, 0.5f); - VK_Play_Speech_Line(3, 1460, 0.5f); - VK_Play_Speech_Line(0, 7790, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1450, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7785, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1460, 0.5f); + VK_Play_Speech_Line(kActorMcCoy, 7790, 0.5f); } -void VKScript::sub_40A510(int a1) { +void VKScript::askCalibrationDektora1(int question1) { VK_Subject_Reacts(36, 0, 0, 0); - VK_Play_Speech_Line(3, 1440, 0.5f); + VK_Play_Speech_Line(kActorDektora, 1440, 0.5f); } } // End of namespace BladeRunner diff --git a/engines/bladerunner/script/vk.h b/engines/bladerunner/script/vk.h index 0835568f9e..ee82843ae1 100644 --- a/engines/bladerunner/script/vk.h +++ b/engines/bladerunner/script/vk.h @@ -35,28 +35,28 @@ public: : ScriptBase(vm) { } - bool SCRIPT_VK_DLL_Initialize(int a1); - void SCRIPT_VK_DLL_Calibrate(int a1); + bool SCRIPT_VK_DLL_Initialize(int actorId); + void SCRIPT_VK_DLL_Calibrate(int actorId); bool SCRIPT_VK_DLL_Begin_Test(); - void SCRIPT_VK_DLL_McCoy_Asks_Question(int a1, int a2); - void SCRIPT_VK_DLL_Question_Asked(int a1, int a2); - void SCRIPT_VK_DLL_Shutdown(int a1, signed int a2, signed int a3); + void SCRIPT_VK_DLL_McCoy_Asks_Question(int actorId, int questionId); + void SCRIPT_VK_DLL_Question_Asked(int actorId, int questionId); + void SCRIPT_VK_DLL_Shutdown(int actorId, signed int humanPercentage, signed int replicantPercentage); private: - int unknown1; + int calibrationQuestionCounter; int unknown2; - void sub_402604(int a1); - void sub_404B44(int a1); - void sub_406088(int a1); - void sub_407CF8(int a1); - void sub_40897C(int a1); - void sub_40A300(int a1, int a2); - void sub_40A350(int a1, int a2); - void sub_40A3A0(int a1, int a2); - void sub_40A3F0(int a1); - void sub_40A470(int a1); - void sub_40A510(int a1); + void askLucy(int questionId); + void askGrigorian(int questionId); + void askDektora(int questionId); + void askRunciter(int questionId); + void askBulletBob(int questionId); + void askCalibrationQuestion1(int actorId, int notUsed); + void askCalibrationQuestion2(int actorId, int notUsed); + void askCalibrationQuestion3(int actorId, int notUsed); + void askCalibrationDektora3(int questionId); + void askCalibrationDektora2(int questionId); + void askCalibrationDektora1(int questionId); }; } // End of namespace BladeRunner |