From 5f5cee2be3428ae244664401c453e410a7d6baf5 Mon Sep 17 00:00:00 2001 From: Thomas Fach-Pedersen Date: Sun, 18 Mar 2018 20:35:28 +0100 Subject: BLADERUNNER: Round coordinates to two decimals Also fixes a couple of typos. --- engines/bladerunner/script/ai/hysteria_patron1.cpp | 2 +- engines/bladerunner/script/scene/ct11.cpp | 8 ++++---- engines/bladerunner/script/scene/ct12.cpp | 2 +- engines/bladerunner/script/scene/dr02.cpp | 2 +- engines/bladerunner/script/scene/dr04.cpp | 2 +- engines/bladerunner/script/scene/dr06.cpp | 4 ++-- engines/bladerunner/script/scene/hf05.cpp | 4 ++-- engines/bladerunner/script/scene/nr09.cpp | 2 +- engines/bladerunner/script/scene/ps12.cpp | 4 ++-- engines/bladerunner/script/scene/ps13.cpp | 4 ++-- engines/bladerunner/script/scene/tb05.cpp | 4 ++-- engines/bladerunner/script/scene/ug02.cpp | 4 ++-- engines/bladerunner/script/scene/ug07.cpp | 2 +- engines/bladerunner/script/scene/ug15.cpp | 4 ++-- engines/bladerunner/script/scene/ug18.cpp | 2 +- engines/bladerunner/script/vk_script.cpp | 8 ++++---- 16 files changed, 29 insertions(+), 29 deletions(-) (limited to 'engines') diff --git a/engines/bladerunner/script/ai/hysteria_patron1.cpp b/engines/bladerunner/script/ai/hysteria_patron1.cpp index 44278ac5e9..6eadd74976 100644 --- a/engines/bladerunner/script/ai/hysteria_patron1.cpp +++ b/engines/bladerunner/script/ai/hysteria_patron1.cpp @@ -34,7 +34,7 @@ void AIScriptHysteriaPatron1::Initialize() { _animationNext = 0; Actor_Put_In_Set(kActorHysteriaPatron1, kSetNR03); - Actor_Set_At_XYZ(kActorHysteriaPatron1, 50.0f, -6.5900002f, -1030.0f, 524); + Actor_Set_At_XYZ(kActorHysteriaPatron1, 50.0f, -6.59f, -1030.0f, 524); } bool AIScriptHysteriaPatron1::Update() { diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp index 63d114ebfb..49dd417ae1 100644 --- a/engines/bladerunner/script/scene/ct11.cpp +++ b/engines/bladerunner/script/scene/ct11.cpp @@ -54,7 +54,7 @@ void SceneScriptCT11::SceneLoaded() { Unobstacle_Object("BOX SOUTH 1", true); if (Global_Variable_Query(kVariableChapter) < 4) { if (!Game_Flag_Query(645)) { - Item_Add_To_World(115, 951, 33, 640.21002f, 30.0f, 470.0f, 512, 12, 12, false, true, false, true); + Item_Add_To_World(115, 951, 33, 640.21f, 30.0f, 470.0f, 512, 12, 12, false, true, false, true); Scene_2D_Region_Add(0, 505, 316, 513, 321); Game_Flag_Set(725); } @@ -99,15 +99,15 @@ bool SceneScriptCT11::ClickedOnItem(int itemId, bool a2) { 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)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 121.0f, 9.68f, -42.0f, 0, 1, false, 0)) { Game_Flag_Set(304); Set_Enter(31, kSceneCT09); } return true; } if (exitId == 1) { - 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); + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -300.0f, 9.68f, 66.0f, 0, 1, false, 0)) { + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -400.0f, 9.68f, -70.0f, 0, 1, false, 0); Game_Flag_Set(86); Set_Enter(4, kSceneCT12); } diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp index 859b065b37..88bbd4645a 100644 --- a/engines/bladerunner/script/scene/ct12.cpp +++ b/engines/bladerunner/script/scene/ct12.cpp @@ -138,7 +138,7 @@ bool SceneScriptCT12::ClickedOnItem(int itemId, bool a2) { bool SceneScriptCT12::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.14999f, -6.5f, 696.94f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.15f, -6.5f, 696.94f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Game_Flag_Set(88); Set_Enter(4, kSceneCT01); diff --git a/engines/bladerunner/script/scene/dr02.cpp b/engines/bladerunner/script/scene/dr02.cpp index cbdb1ddcd7..c416fe2ff2 100644 --- a/engines/bladerunner/script/scene/dr02.cpp +++ b/engines/bladerunner/script/scene/dr02.cpp @@ -32,7 +32,7 @@ void SceneScriptDR02::InitializeScene() { } else if (Game_Flag_Query(264)) { Setup_Scene_Information(-1258.0f, 7.18f, -314.0f, 400); } else { - Setup_Scene_Information(168.78f, 0.16f, -775.71997f, 193); + Setup_Scene_Information(168.78f, 0.16f, -775.72f, 193); } Scene_Exit_Add_2D_Exit(0, 605, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(1, 222, 176, 279, 314, 0); diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp index 21933aaae7..fd7316536d 100644 --- a/engines/bladerunner/script/scene/dr04.cpp +++ b/engines/bladerunner/script/scene/dr04.cpp @@ -247,7 +247,7 @@ void SceneScriptDR04::PlayerWalkedIn() { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -851.0f, 71.64f, 647.0f, 0, 0, false, 0); Actor_Face_Heading(kActorMcCoy, 0, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 7, 0, 0); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -774.85f, 7.18f, 386.67001f, 0, 0, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -774.85f, 7.18f, 386.67f, 0, 0, false, 0); Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false); Footstep_Sound_Override_Off(); } diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp index ebc19bce41..393cdc3184 100644 --- a/engines/bladerunner/script/scene/dr06.cpp +++ b/engines/bladerunner/script/scene/dr06.cpp @@ -26,9 +26,9 @@ namespace BladeRunner { void SceneScriptDR06::InitializeScene() { if (Game_Flag_Query(230)) { - Setup_Scene_Information(-733.57001f, 136.60001f, -968.64001f, 0); + Setup_Scene_Information(-733.57f, 136.6f, -968.64f, 0); } else { - Setup_Scene_Information(-707.57001f, 136.60001f, -1132.64f, 472); + Setup_Scene_Information(-707.57f, 136.6f, -1132.64f, 472); } Scene_Exit_Add_2D_Exit(0, 601, 11, 639, 479, 1); if (Global_Variable_Query(kVariableChapter) > 3 && Game_Flag_Query(715)) { diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp index a620d3aa15..c96f852973 100644 --- a/engines/bladerunner/script/scene/hf05.cpp +++ b/engines/bladerunner/script/scene/hf05.cpp @@ -114,7 +114,7 @@ bool SceneScriptHF05::ClickedOn3DObject(const char *objectName, bool a2) { ADQ_Add(kActorVoiceOver, 940, -1); Ambient_Sounds_Play_Sound(147, 50, 99, 0, 0); Delay(1500); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, 181.53999f, 40.630001f, 388.09f, 0, 0, true, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, 181.54f, 40.63f, 388.09f, 0, 0, true, 0); Actor_Face_Heading(kActorMcCoy, 0, false); Actor_Change_Animation_Mode(kActorMcCoy, 23); Actor_Clue_Lose(kActorMcCoy, kClueBomb); @@ -163,7 +163,7 @@ bool SceneScriptHF05::ClickedOnExit(int exitId) { 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)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 277.0f, 40.63f, 410.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) { Game_Flag_Set(529); Set_Enter(42, kSceneHF06); } diff --git a/engines/bladerunner/script/scene/nr09.cpp b/engines/bladerunner/script/scene/nr09.cpp index fd4faeccb0..7f786e17c8 100644 --- a/engines/bladerunner/script/scene/nr09.cpp +++ b/engines/bladerunner/script/scene/nr09.cpp @@ -107,7 +107,7 @@ void SceneScriptNR09::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptNR09::PlayerWalkedIn() { if (Game_Flag_Query(614)) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -704.07001f, 0.35f, 623.04f, 0, 0, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -704.07f, 0.35f, 623.04f, 0, 0, false, 0); Game_Flag_Reset(614); } //return false; diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp index 7db642891e..2e6f54e247 100644 --- a/engines/bladerunner/script/scene/ps12.cpp +++ b/engines/bladerunner/script/scene/ps12.cpp @@ -96,9 +96,9 @@ void SceneScriptPS12::SceneLoaded() { } Police_Maze_Target_Track_Add(29, -691.8f, -9.06f, 587.67f, -649.11f, -9.06f, 587.71f, 6, track_data_29, true); Police_Maze_Target_Track_Add(30, -679.6f, -45.4f, 721.05f, -679.6f, -1.4f, 721.05f, 6, track_data_30, true); - Police_Maze_Target_Track_Add(31, -414.04f, -8.98f, 711.917f, -459.54f, -8.99f, 707.81f, 6, track_data_31, false); + Police_Maze_Target_Track_Add(31, -414.04f, -8.98f, 711.91f, -459.54f, -8.99f, 707.81f, 6, track_data_31, false); Police_Maze_Target_Track_Add(32, -440.0f, -8.97f, 1137.0f, -430.0f, -8.97f, 921.0f, 6, track_data_32, false); - Police_Maze_Target_Track_Add(33, -764.92f, -0.84f, 950.21997f, -722.92f, -0.84f, 950.22f, 6, track_data_33, false); + Police_Maze_Target_Track_Add(33, -764.92f, -0.84f, 950.22f, -722.92f, -0.84f, 950.22f, 6, track_data_33, false); Police_Maze_Target_Track_Add(34, -696.0f, -5.7f, 1185.0f, -635.0f, -5.7f, 1185.0f, 20, track_data_34, false); Police_Maze_Target_Track_Add(35, -635.0f, -5.7f, 1165.0f, -620.0f, -8.63f, 1366.0f, 10, track_data_35, false); Police_Maze_Target_Track_Add(36, -620.0f, -8.63f, 1366.0f, -595.0f, -8.63f, 1366.0f, 10, track_data_36, false); diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp index 83f99faf4f..736df765a3 100644 --- a/engines/bladerunner/script/scene/ps13.cpp +++ b/engines/bladerunner/script/scene/ps13.cpp @@ -99,7 +99,7 @@ void SceneScriptPS13::SceneLoaded() { Item_Add_To_World(51, 443, 14, -24.0f, 102.0f, 1625.0f, 823, 72, 36, true, false, false, true); Item_Add_To_World(52, 449, 14, 180.0f, -72.7f, 1605.0f, 305, 72, 36, true, false, false, true); Item_Add_To_World(53, 443, 14, 127.79f, 14.56f, 1703.03f, 356, 72, 36, true, false, false, true); - Item_Add_To_World(54, 443, 14, 136.37f, -6.84f, 1425.4301f, 512, 72, 36, true, false, false, true); + Item_Add_To_World(54, 443, 14, 136.37f, -6.84f, 1425.43f, 512, 72, 36, true, false, false, true); Item_Add_To_World(55, 441, 14, 77.83f, -79.8f, 1520.5f, 327, 72, 36, true, false, false, true); Item_Add_To_World(56, 441, 14, 77.83f, -7.8f, 1520.5f, 327, 72, 36, true, false, false, true); Item_Add_To_World(57, 443, 14, -88.0f, -8.8f, 1520.5f, 327, 72, 36, true, false, false, true); @@ -115,7 +115,7 @@ void SceneScriptPS13::SceneLoaded() { Police_Maze_Target_Track_Add(51, -24.0f, 102.0f, 1625.0f, -24.0f, 138.0f, 1625.0f, 10, track_data_51, false); Police_Maze_Target_Track_Add(52, 180.0f, -72.7f, 1605.0f, 180.0f, -0.7f, 1605.0f, 10, track_data_52, false); Police_Maze_Target_Track_Add(53, 127.79f, 14.56f, 1703.03f, -56.07f, 1.89f, 1589.04f, 6, track_data_53, false); - Police_Maze_Target_Track_Add(54, 136.37f, -6.84f, 1425.4301f, 117.55f, -6.84f, 1442.09f, 4, track_data_54, false); + Police_Maze_Target_Track_Add(54, 136.37f, -6.84f, 1425.43f, 117.55f, -6.84f, 1442.09f, 4, track_data_54, false); Police_Maze_Target_Track_Add(55, 77.83f, -79.8f, 1520.5f, 77.83f, -7.8f, 1520.5f, 15, track_data_55, false); Police_Maze_Target_Track_Add(56, 77.83f, -7.8f, 1520.5f, -88.0f, -8.8f, 1520.5f, 15, track_data_56, false); Police_Maze_Target_Track_Add(57, -88.0f, -8.8f, 1520.5f, -88.0f, -80.8f, 1520.5f, 15, track_data_57, false); diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp index b3299292f1..a7797414d6 100644 --- a/engines/bladerunner/script/scene/tb05.cpp +++ b/engines/bladerunner/script/scene/tb05.cpp @@ -52,10 +52,10 @@ void SceneScriptTB05::SceneLoaded() { Clickable_Object("MONITOR05"); Unclickable_Object("SMUDGE_GLASS01"); if (!Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring)) { - Item_Add_To_World(76, 940, 72, 76.160004f, 147.36f, -235.14999f, 0, 6, 6, false, true, false, true); + Item_Add_To_World(76, 940, 72, 76.16f, 147.36f, -235.15f, 0, 6, 6, false, true, false, true); } if (!Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphlet1) && !Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphlet2) && (Game_Flag_Query(kFlagGordoIsReplicant) || Game_Flag_Query(kFlagLucyIsReplicant))) { - Item_Add_To_World(119, 972, 72, 129.00999f, 147.12f, -162.98f, 0, 8, 8, false, true, false, true); + Item_Add_To_World(119, 972, 72, 129.01f, 147.12f, -162.98f, 0, 8, 8, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/ug02.cpp b/engines/bladerunner/script/scene/ug02.cpp index c6b96c65a5..f8f1e84578 100644 --- a/engines/bladerunner/script/scene/ug02.cpp +++ b/engines/bladerunner/script/scene/ug02.cpp @@ -153,9 +153,9 @@ bool SceneScriptUG02::ClickedOnExit(int exitId) { Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 0, 0); Footstep_Sound_Override_Off(); int v3 = Player_Query_Combat_Mode(); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -96.57f, 74.870003f, -271.28f, 0, 0, v3, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -96.57f, 74.87f, -271.28f, 0, 0, v3, 0); int v4 = Player_Query_Combat_Mode(); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -95.0f, 74.870003f, -503.0f, 0, 0, v4, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -95.0f, 74.87f, -503.0f, 0, 0, v4, 0); Game_Flag_Set(315); Set_Enter(74, kSceneUG01); } diff --git a/engines/bladerunner/script/scene/ug07.cpp b/engines/bladerunner/script/scene/ug07.cpp index 9a586407fc..4a256b02c7 100644 --- a/engines/bladerunner/script/scene/ug07.cpp +++ b/engines/bladerunner/script/scene/ug07.cpp @@ -119,7 +119,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) { Actor_Set_At_XYZ(kActorClovis, 118.02f, -12.21f, -154.0f, 768); Player_Set_Combat_Mode(true); Actor_Face_Actor(kActorMcCoy, kActorClovis, true); - Loop_Actor_Walk_To_XYZ(kActorClovis, 98.019997f, -12.21f, -154.0f, 0, 0, false, 0); + Loop_Actor_Walk_To_XYZ(kActorClovis, 98.02f, -12.21f, -154.0f, 0, 0, false, 0); Actor_Face_Actor(kActorClovis, kActorMcCoy, true); Actor_Set_Goal_Number(kActorMcCoy, 301); Actor_Face_Heading(kActorMcCoy, 0, true); diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp index 8477e5b46f..3503992457 100644 --- a/engines/bladerunner/script/scene/ug15.cpp +++ b/engines/bladerunner/script/scene/ug15.cpp @@ -26,9 +26,9 @@ namespace BladeRunner { void SceneScriptUG15::InitializeScene() { if (Game_Flag_Query(353)) { - Setup_Scene_Information(-25.0f, 26.309999f, -434.0f, 520); + Setup_Scene_Information(-25.0f, 26.31f, -434.0f, 520); } else if (Game_Flag_Query(153)) { - Setup_Scene_Information(-17.0f, 26.309999f, -346.0f, 711); + Setup_Scene_Information(-17.0f, 26.31f, -346.0f, 711); } else if (Game_Flag_Query(355)) { Setup_Scene_Information(-18.0f, 48.07f, 62.0f, 650); } else { diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp index c20c58cc72..05ef4559fb 100644 --- a/engines/bladerunner/script/scene/ug18.cpp +++ b/engines/bladerunner/script/scene/ug18.cpp @@ -110,7 +110,7 @@ bool SceneScriptUG18::ClickedOnItem(int itemId, bool a2) { bool SceneScriptUG18::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -684.712f, 0.0f, 171.59f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -684.71f, 0.0f, 171.59f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(435); diff --git a/engines/bladerunner/script/vk_script.cpp b/engines/bladerunner/script/vk_script.cpp index 8a7ddb26eb..eef5f5bdaf 100644 --- a/engines/bladerunner/script/vk_script.cpp +++ b/engines/bladerunner/script/vk_script.cpp @@ -1209,12 +1209,12 @@ void VKScript::askDektora(int questionId) { 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(kActorDektora, 1540, 0.80000001f); + VK_Play_Speech_Line(kActorDektora, 1540, 0.8f); VK_Play_Speech_Line(kActorDektora, 1550, 0.5f); } else { VK_Play_Speech_Line(kActorDektora, 1560, 0.5f); VK_Subject_Reacts(25, 13, -3, 0); - VK_Play_Speech_Line(kActorDektora, 1570, 0.80000001f); + VK_Play_Speech_Line(kActorDektora, 1570, 0.8f); VK_Play_Speech_Line(kActorDektora, 1580, 0.5f); } break; @@ -1234,7 +1234,7 @@ void VKScript::askDektora(int questionId) { VK_Subject_Reacts(25, -1, 9, 0); } else { VK_Subject_Reacts(25, 14, -2, 0); - VK_Play_Speech_Line(kActorDektora, 1630, 0.89999998f); + VK_Play_Speech_Line(kActorDektora, 1630, 0.9f); VK_Play_Speech_Line(kActorDektora, 1640, 0.5f); } break; @@ -1274,7 +1274,7 @@ void VKScript::askDektora(int questionId) { VK_Play_Speech_Line(kActorDektora, 1740, 0.5f); VK_Play_Speech_Line(kActorMcCoy, 7805, 0.5f); VK_Eye_Animates(2); - VK_Play_Speech_Line(kActorDektora, 1750, 0.89999998f); + VK_Play_Speech_Line(kActorDektora, 1750, 0.9f); VK_Play_Speech_Line(kActorDektora, 1760, 0.5f); break; case 7455: -- cgit v1.2.3