diff options
Diffstat (limited to 'engines/bladerunner/script/scene/nr01.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/nr01.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp index 8fe96be783..9fc87d8367 100644 --- a/engines/bladerunner/script/scene/nr01.cpp +++ b/engines/bladerunner/script/scene/nr01.cpp @@ -47,7 +47,7 @@ void SceneScriptNR01::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 201, 320, 276, 357, 2); } Scene_Exit_Add_2D_Exit(2, 583, 262, 639, 365, 1); - if (Game_Flag_Query(kFlagSpinnerToNR01)) { + if (Game_Flag_Query(kFlagSpinnerAtNR01)) { Scene_Exit_Add_2D_Exit(3, 320, 445, 639, 479, 2); } Ambient_Sounds_Add_Looping_Sound(54, 50, 0, 1); @@ -68,14 +68,14 @@ void SceneScriptNR01::InitializeScene() { Ambient_Sounds_Add_Sound(376, 10, 80, 33, 33, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 10, 80, 33, 33, 0, 0, -101, -101, 0, 0); if (Game_Flag_Query(643) && Actor_Query_Goal_Number(kActorSteele) == 230) { - Game_Flag_Reset(kFlagSpinnerToNR01); - Game_Flag_Reset(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtNR01); + Game_Flag_Reset(kFlagSpinnerAtHF01); } - if (Game_Flag_Query(kFlagSpinnerToNR01) && !Game_Flag_Query(kFlagArrivedFromSpinner)) { + if (Game_Flag_Query(kFlagSpinnerAtNR01) && !Game_Flag_Query(kFlagArrivedFromSpinner)) { Scene_Loop_Start_Special(0, 0, 0); Scene_Loop_Set_Default(1); Game_Flag_Set(kFlagArrivedFromSpinner); - } else if (Game_Flag_Query(kFlagSpinnerToNR01) && Game_Flag_Query(kFlagArrivedFromSpinner)) { + } else if (Game_Flag_Query(kFlagSpinnerAtNR01) && Game_Flag_Query(kFlagArrivedFromSpinner)) { Scene_Loop_Set_Default(1); } else { Scene_Loop_Set_Default(4); @@ -154,72 +154,72 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { switch (Spinner_Interface_Choose_Dest(-1, 1)) { case 9: Game_Flag_Set(257); - Game_Flag_Reset(kFlagSpinnerToNR01); - Game_Flag_Set(kFlagSpinnerToHF01); + Game_Flag_Reset(kFlagSpinnerAtNR01); + Game_Flag_Set(kFlagSpinnerAtHF01); Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 3, 1); break; case 7: Game_Flag_Set(258); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToBB01); + Game_Flag_Set(kFlagSpinnerAtBB01); Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 3, 1); break; case 6: Game_Flag_Set(177); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToDR01); + Game_Flag_Set(kFlagSpinnerAtDR01); Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 3, 1); break; case 5: Game_Flag_Set(261); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToTB02); + Game_Flag_Set(kFlagSpinnerAtTB02); Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 3, 1); break; case 4: Game_Flag_Set(180); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToAR01); + Game_Flag_Set(kFlagSpinnerAtAR01); Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 3, 1); break; case 3: Game_Flag_Set(176); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToCT01); + Game_Flag_Set(kFlagSpinnerAtCT01); Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 3, 1); break; case 2: Game_Flag_Set(182); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToRC01); + Game_Flag_Set(kFlagSpinnerAtRC01); Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 3, 1); break; case 1: Game_Flag_Set(179); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToMA01); + Game_Flag_Set(kFlagSpinnerAtMA01); Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 3, 1); break; case 0: Game_Flag_Set(178); - Game_Flag_Reset(kFlagSpinnerToNR01); + Game_Flag_Reset(kFlagSpinnerAtNR01); Game_Flag_Reset(kFlagArrivedFromSpinner); - Game_Flag_Set(kFlagSpinnerToPS01); + Game_Flag_Set(kFlagSpinnerAtPS01); Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); break; |