diff options
Diffstat (limited to 'engines/bladerunner/script/scene/ps01.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/ps01.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp index 34c7583381..bafa4a5570 100644 --- a/engines/bladerunner/script/scene/ps01.cpp +++ b/engines/bladerunner/script/scene/ps01.cpp @@ -87,74 +87,74 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1877.9f, 16592.0f, -2975.0f, 0, true, false, 0)) { Actor_Set_At_XYZ(kActorMcCoy, 1872.0f, 16592.0f, -2975.0f, 870); - Game_Flag_Reset(kFlagMcCoyAtCTxx); - Game_Flag_Reset(kFlagMcCoyAtRCxx); - Game_Flag_Reset(kFlagMcCoyAtMAxx); - Game_Flag_Reset(kFlagMcCoyAtPSxx); - Game_Flag_Reset(kFlagMcCoyAtARxx); - Game_Flag_Reset(kFlagMcCoyAtTBxx); - Game_Flag_Reset(kFlagMcCoyAtDRxx); - Game_Flag_Reset(kFlagMcCoyAtBBxx); + Game_Flag_Reset(kFlagMcCoyInChinaTown); + Game_Flag_Reset(kFlagMcCoyInRunciters); + Game_Flag_Reset(kFlagMcCoyInMcCoyApartment); + Game_Flag_Reset(kFlagMcCoyInPoliceStation); + Game_Flag_Reset(kFlagMcCoyInAnimoidRow); + Game_Flag_Reset(kFlagMcCoyInTyrellBuilding); + Game_Flag_Reset(kFlagMcCoyInDNARow); + Game_Flag_Reset(kFlagMcCoyInBradburyBuilding); int spinnerDest = Spinner_Interface_Choose_Dest(3, true); switch (spinnerDest) { case kSpinnerDestinationMcCoysApartment: - Game_Flag_Set(kFlagMcCoyAtMAxx); + Game_Flag_Set(kFlagMcCoyInMcCoyApartment); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(kSetMA01, kSceneMA01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationRuncitersAnimals: - Game_Flag_Set(kFlagMcCoyAtRCxx); + Game_Flag_Set(kFlagMcCoyInRunciters); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(kSetRC01, kSceneRC01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationChinatown: - Game_Flag_Set(kFlagMcCoyAtCTxx); + Game_Flag_Set(kFlagMcCoyInChinaTown); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(kSetCT01_CT12, kSceneCT01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationAnimoidRow: - Game_Flag_Set(kFlagMcCoyAtARxx); + Game_Flag_Set(kFlagMcCoyInAnimoidRow); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(kSetAR01_AR02, kSceneAR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationTyrellBuilding: - Game_Flag_Set(kFlagMcCoyAtTBxx); + Game_Flag_Set(kFlagMcCoyInTyrellBuilding); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(kSetTB02_TB03, kSceneTB02); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationDNARow: - Game_Flag_Set(kFlagMcCoyAtDRxx); + Game_Flag_Set(kFlagMcCoyInDNARow); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(kSetDR01_DR02_DR04, kSceneDR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationBradburyBuilding: - Game_Flag_Set(kFlagMcCoyAtBBxx); + Game_Flag_Set(kFlagMcCoyInBradburyBuilding); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(kSetBB01, kSceneBB01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationNightclubRow: - Game_Flag_Set(kFlagMcCoyAtNRxx); + Game_Flag_Set(kFlagMcCoyInNightclubRow); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtNR01); Set_Enter(kSetNR01, kSceneNR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationHysteriaHall: - Game_Flag_Set(kFlagMcCoyAtHFxx); + Game_Flag_Set(kFlagMcCoyInHysteriaHall); Game_Flag_Reset(kFlagSpinnerAtPS01); Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(kSetHF01, kSceneHF01); @@ -162,7 +162,7 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) { break; default: Actor_Face_Heading(kActorMcCoy, 870, false); - Game_Flag_Set(kFlagMcCoyAtPSxx); + Game_Flag_Set(kFlagMcCoyInPoliceStation); Game_Flag_Set(kFlagArrivedFromSpinner2); Player_Loses_Control(); Scene_Loop_Start_Special(2, 3, 1); |