From 027dc4c38c033dcae3dd0ed485b56f587ee05b44 Mon Sep 17 00:00:00 2001 From: Peter Kohaut Date: Sun, 2 Apr 2017 18:17:43 +0200 Subject: BLADERUNNER: fixed lighting cache actors can be now partially illuminated (per slice), it iss visible in scene rc02 in the right part of the room --- engines/bladerunner/script/scene/rc01.cpp | 14 +++++++------- engines/bladerunner/script/script.cpp | 6 +++--- engines/bladerunner/script/script.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'engines/bladerunner/script') diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp index 5ac89e8d85..642f4c7bb0 100644 --- a/engines/bladerunner/script/scene/rc01.cpp +++ b/engines/bladerunner/script/scene/rc01.cpp @@ -220,7 +220,7 @@ bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) { Actor_Voice_Over(1880, kActorVoiceOver); Actor_Voice_Over(1890, kActorVoiceOver); I_Sez("JM: That McCoy--he's one funny guy! Jet-black fire truck, hehehehe..."); - Actor_Clue_Acquire(kActorMcCoy, kCluePaintTransfer, 1, -1); + Actor_Clue_Acquire(kActorMcCoy, kCluePaintTransfer, true, -1); } } return true; @@ -234,11 +234,11 @@ bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) { Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); Actor_Says(kActorOfficerLeary, 0, 12); Actor_Says(kActorMcCoy, 4495, 13); - Actor_Clue_Acquire(kActorMcCoy, kClueDoorForced2, 1, kActorOfficerLeary); + Actor_Clue_Acquire(kActorMcCoy, kClueDoorForced2, true, kActorOfficerLeary); } else { Actor_Says(kActorMcCoy, 8570, 14); } - Actor_Clue_Acquire(kActorMcCoy, kClueDoorForced1, 1, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueDoorForced1, true, -1); } return true; } @@ -270,7 +270,7 @@ bool SceneScriptRC01::ClickedOnActor(int actorId) { Actor_Face_Object(kActorOfficerLeary, "70_1", true); Actor_Says(kActorOfficerLeary, 100, 15); Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); - Actor_Clue_Acquire(kActorMcCoy, kClueCrowdInterviewA, 1, kActorOfficerLeary); + Actor_Clue_Acquire(kActorMcCoy, kClueCrowdInterviewA, true, kActorOfficerLeary); Game_Flag_Reset(392); } else if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB) && !Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewB)) { Actor_Face_Object(kActorOfficerLeary, "70_5", true); @@ -278,7 +278,7 @@ bool SceneScriptRC01::ClickedOnActor(int actorId) { Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); Actor_Says(kActorOfficerLeary, 130, 14); I_Sez("JM: Did it have a huge, ugly piece of chrome on it?"); - Actor_Clue_Acquire(kActorMcCoy, kClueCrowdInterviewB, 1, kActorOfficerLeary); + Actor_Clue_Acquire(kActorMcCoy, kClueCrowdInterviewB, true, kActorOfficerLeary); Game_Flag_Reset(392); } else { Actor_Says(kActorOfficerLeary, 90, 16); @@ -294,7 +294,7 @@ bool SceneScriptRC01::ClickedOnActor(int actorId) { I_Sez("MG: Hey, leave that officer alone. Can't you see he's busy?"); I_Sez("JM: (...mmm, donuts...)"); Game_Flag_Set(3); - Actor_Clue_Acquire(kActorMcCoy, kClueOfficersStatement, 1, kActorOfficerLeary); + Actor_Clue_Acquire(kActorMcCoy, kClueOfficersStatement, true, kActorOfficerLeary); Actor_Says(kActorMcCoy, 4515, 13); Game_Flag_Set(392); Actor_Says(kActorOfficerLeary, 40, 13); @@ -321,7 +321,7 @@ bool SceneScriptRC01::ClickedOnItem(int itemId, bool a2) { Actor_Set_Goal_Number(kActorOfficerLeary, 0); if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 66, 36, 1, false)) { Actor_Face_Item(kActorMcCoy, 66, true); - Actor_Clue_Acquire(kActorMcCoy, kClueChromeDebris, 1, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueChromeDebris, true, -1); Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true); Actor_Says(kActorOfficerLeary, 20, 12); Game_Flag_Set(163); diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index 18d99273c8..184efe7ae2 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -536,11 +536,11 @@ bool ScriptBase::Loop_Actor_Travel_Ladder(int actorId, int a2, int a3, int a4) { return false; } -void ScriptBase::Actor_Clue_Add_To_Database(int actorId, int clueId, int unknown, bool clueAcquired, bool unknownFlag, int fromActorId) { - _vm->_actors[actorId]->addClueToDatabase(clueId, unknown, clueAcquired, unknownFlag, fromActorId); +void ScriptBase::Actor_Clue_Add_To_Database(int actorId, int clueId, int weight, bool clueAcquired, bool unknownFlag, int fromActorId) { + _vm->_actors[actorId]->addClueToDatabase(clueId, weight, clueAcquired, unknownFlag, fromActorId); } -void ScriptBase::Actor_Clue_Acquire(int actorId, int clueId, byte unknownFlag, int fromActorId) { +void ScriptBase::Actor_Clue_Acquire(int actorId, int clueId, bool unknownFlag, int fromActorId) { _vm->_actors[actorId]->acquireClue(clueId, unknownFlag, fromActorId); } diff --git a/engines/bladerunner/script/script.h b/engines/bladerunner/script/script.h index 12a76505ff..836d914ca5 100644 --- a/engines/bladerunner/script/script.h +++ b/engines/bladerunner/script/script.h @@ -511,7 +511,7 @@ protected: bool Loop_Actor_Travel_Stairs(int actorId, int a2, int a3, int a4); bool Loop_Actor_Travel_Ladder(int actorId, int a2, int a3, int a4); void Actor_Clue_Add_To_Database(int actorId, int clueId, int weight, bool clueAcquired, bool unknownFlag, int fromActorId); - void Actor_Clue_Acquire(int actorId, int clueId, byte unknownFlag, int fromActorId); + void Actor_Clue_Acquire(int actorId, int clueId, bool unknownFlag, int fromActorId); void Actor_Clue_Lose(int actorId, int clueId); bool Actor_Clue_Query(int actorId, int clueId); void Actor_Clues_Transfer_New_To_Mainframe(int actorId); -- cgit v1.2.3