diff options
Diffstat (limited to 'engines/bladerunner/script/scene')
36 files changed, 161 insertions, 161 deletions
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp index 1a2eecb586..adb8835286 100644 --- a/engines/bladerunner/script/scene/ar02.cpp +++ b/engines/bladerunner/script/scene/ar02.cpp @@ -80,13 +80,13 @@ void SceneScriptAR02::InitializeScene() { void SceneScriptAR02::SceneLoaded() { Obstacle_Object("DF_BOOTH", true); if (!Game_Flag_Query(kFlagAR02DektoraBoughtScorpions)) { - Item_Add_To_World(kItemScrorpions, 976, kSetAR01_AR02, -442.84f, 36.77f, -1144.51f, 360, 36, 36, false, true, false, true); + Item_Add_To_World(kItemScorpions, kModelAnimationCageOfScorpions, kSetAR01_AR02, -442.84f, 36.77f, -1144.51f, 360, 36, 36, false, true, false, true); } if ( Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(kFlagAR02DektoraBoughtScorpions) ) { Game_Flag_Set(kFlagNotUsed0); - Item_Remove_From_World(kItemScrorpions); + Item_Remove_From_World(kItemScorpions); } } @@ -180,7 +180,7 @@ bool SceneScriptAR02::ClickedOnActor(int actorId) { } bool SceneScriptAR02::ClickedOnItem(int itemId, bool a2) { - if (itemId == kItemScrorpions) { + if (itemId == kItemScorpions) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -386.96f, 0.0f, -1078.45f, 12, true, false, 0)) { Actor_Face_Actor(kActorMcCoy, kActorInsectDealer, true); if (!Game_Flag_Query(kFlagAR02ScorpionsChecked)) { @@ -323,7 +323,7 @@ void SceneScriptAR02::dialogueWithInsectDealer2() { Dialogue_Menu_Clear_List(); if (Global_Variable_Query(kVariableChinyen) >= 15 - || Query_Difficulty_Level() == 0 + || Query_Difficulty_Level() == kGameDifficultyEasy ) { DM_Add_To_List_Never_Repeat_Once_Selected(530, 7, 5, 3); // BUY } @@ -335,7 +335,7 @@ void SceneScriptAR02::dialogueWithInsectDealer2() { if (answerValue == 530) { // BUY Actor_Says(kActorMcCoy, 120, 12); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Decrement(kVariableChinyen, 15); } Actor_Clue_Acquire(kActorMcCoy, kClueMaggieBracelet, true, kActorInsectDealer); diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp index baa94ae4e4..d27ea18d22 100644 --- a/engines/bladerunner/script/scene/bb06.cpp +++ b/engines/bladerunner/script/scene/bb06.cpp @@ -85,7 +85,7 @@ void SceneScriptBB06::SceneLoaded() { #if BLADERUNNER_ORIGINAL_BUGS // Sebastian's Doll Fix // This Item_Add_To_World call is only ok for the transition from BB51 to BB06, // otherwise the doll item is not placed in the current set - Item_Add_To_World(kItemBB06ControlBox, 931, kSetBB06_BB07, -127.0f, 68.42f, 57.0f, 0, 8, 8, true, true, false, true); + Item_Add_To_World(kItemBB06ControlBox, kModelAnimationBadge, kSetBB06_BB07, -127.0f, 68.42f, 57.0f, 0, 8, 8, true, true, false, true); #else if (!Game_Flag_Query(kFlagBB06AndroidDestroyed)) { Combat_Target_Object("BOX31"); // diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp index ba2f659956..c7364d8822 100644 --- a/engines/bladerunner/script/scene/bb07.cpp +++ b/engines/bladerunner/script/scene/bb07.cpp @@ -76,7 +76,7 @@ bool SceneScriptBB07::ClickedOn3DObject(const char *objectName, bool a2) { && !Game_Flag_Query(kFlagBB07PrinterChecked) ) { Actor_Voice_Over(130, kActorVoiceOver); - Item_Pickup_Spin_Effect(941, 439, 242); + Item_Pickup_Spin_Effect(kModelAnimationDNADataDisc, 439, 242); Actor_Voice_Over(140, kActorVoiceOver); Game_Flag_Set(kFlagBB07PrinterChecked); Actor_Clue_Acquire(kActorMcCoy, kClueDNASebastian, true, -1); @@ -99,9 +99,9 @@ bool SceneScriptBB07::ClickedOnActor(int actorId) { } bool SceneScriptBB07::ClickedOnItem(int itemId, bool a2) { - if (itemId == 83) { // this item is never added to this set/scene - if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 83, 36, true, false)) { - Actor_Face_Item(kActorMcCoy, 83, true); + if (itemId == kItemDNATyrell) { // this item is never added to this set/scene - a bug? + if (!Loop_Actor_Walk_To_Item(kActorMcCoy, kItemDNATyrell, 36, true, false)) { + Actor_Face_Item(kActorMcCoy, kItemDNATyrell, true); if (Game_Flag_Query(kFlagBB07ElectricityOn)) { Actor_Voice_Over(150, kActorVoiceOver); Actor_Voice_Over(160, kActorVoiceOver); diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp index 9cfe78bc15..0e1b53b08b 100644 --- a/engines/bladerunner/script/scene/ct01.cpp +++ b/engines/bladerunner/script/scene/ct01.cpp @@ -586,7 +586,7 @@ void SceneScriptCT01::dialogueWithHowieLee() { Actor_Says(kActorMcCoy, 290, 13); if (Actor_Query_Friendliness_To_Other(kActorHowieLee, kActorMcCoy) > 49 && (Global_Variable_Query(kVariableChinyen) > 10 - || Query_Difficulty_Level() == 0 + || Query_Difficulty_Level() == kGameDifficultyEasy ) ) { Actor_Says(kActorHowieLee, 50, kAnimationModeTalk); @@ -594,7 +594,7 @@ void SceneScriptCT01::dialogueWithHowieLee() { Actor_Face_Actor(kActorHowieLee, kActorMcCoy, true); Actor_Says(kActorHowieLee, 70, 16); Actor_Says(kActorMcCoy, 325, 13); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Decrement(kVariableChinyen, 10); } Game_Flag_Set(kFlagCT01BoughtHowieLeeFood); diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp index 43e2db04e7..79347d2c9c 100644 --- a/engines/bladerunner/script/scene/ct04.cpp +++ b/engines/bladerunner/script/scene/ct04.cpp @@ -145,7 +145,7 @@ bool SceneScriptCT04::ClickedOn3DObject(const char *objectName, bool a2) { void SceneScriptCT04::dialogueWithHomeless() { Dialogue_Menu_Clear_List(); if (Global_Variable_Query(kVariableChinyen) > 10 - || Query_Difficulty_Level() == 0 + || Query_Difficulty_Level() == kGameDifficultyEasy ) { DM_Add_To_List_Never_Repeat_Once_Selected(410, 8, 4, -1); // YES } @@ -160,7 +160,7 @@ void SceneScriptCT04::dialogueWithHomeless() { Actor_Says(kActorTransient, 10, 14); Actor_Says(kActorTransient, 20, 14); Actor_Modify_Friendliness_To_Other(kActorTransient, kActorMcCoy, 5); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Decrement(kVariableChinyen, 10); } break; diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp index cf39f33ed1..00fc3bb37e 100644 --- a/engines/bladerunner/script/scene/ct06.cpp +++ b/engines/bladerunner/script/scene/ct06.cpp @@ -92,7 +92,7 @@ bool SceneScriptCT06::ClickedOnActor(int actorId) { Actor_Face_Actor(kActorMcCoy, kActorZuben, true); if (!Game_Flag_Query(kFlagCT06ZubenPhoto)) { Actor_Clue_Acquire(kActorMcCoy, kClueZuben, true, -1); - Item_Pickup_Spin_Effect(984, 340, 369); + Item_Pickup_Spin_Effect(kModelAnimationPhoto, 340, 369); Actor_Voice_Over(350, kActorVoiceOver); Actor_Voice_Over(360, kActorVoiceOver); Actor_Voice_Over(370, kActorVoiceOver); diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp index e584fb228d..63763157b4 100644 --- a/engines/bladerunner/script/scene/ct08.cpp +++ b/engines/bladerunner/script/scene/ct08.cpp @@ -81,10 +81,10 @@ void SceneScriptCT08::SceneLoaded() { Obstacle_Object("ASHTRAY", true); Unobstacle_Object("BLANKET03", true); if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) { - Item_Add_To_World(kItemRagDoll, 943, kSetCT08_CT51_UG12, 44.0f, 0.0f, -95.0f, 540, 12, 12, false, true, false, true); + Item_Add_To_World(kItemRagDoll, kModelAnimationRagDoll, kSetCT08_CT51_UG12, 44.0f, 0.0f, -95.0f, 540, 12, 12, false, true, false, true); } if (!Actor_Clue_Query(kActorMcCoy, kClueCheese)) { - Item_Add_To_World(kItemCheese, 936, kSetCT08_CT51_UG12, -102.0f, 2.0f, 41.0f, 432, 6, 6, false, true, false, true); + Item_Add_To_World(kItemCheese, kModelAnimationCheese, kSetCT08_CT51_UG12, -102.0f, 2.0f, 41.0f, 432, 6, 6, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp index 298f01c77a..49ed5470cf 100644 --- a/engines/bladerunner/script/scene/ct10.cpp +++ b/engines/bladerunner/script/scene/ct10.cpp @@ -73,7 +73,7 @@ void SceneScriptCT10::checkCabinet() { if (Actor_Clue_Query(kActorMcCoy, kClueHoldensBadge)) { Actor_Voice_Over(3700, kActorVoiceOver); } else { - Item_Pickup_Spin_Effect(931, 435, 258); + Item_Pickup_Spin_Effect(kModelAnimationBadge, 435, 258); Actor_Clue_Acquire(kActorMcCoy, kClueHoldensBadge, true, -1); } Player_Gains_Control(); diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp index 1c48fce07e..bd8e6e8ca4 100644 --- a/engines/bladerunner/script/scene/ct11.cpp +++ b/engines/bladerunner/script/scene/ct11.cpp @@ -62,7 +62,7 @@ void SceneScriptCT11::SceneLoaded() { Unobstacle_Object("BOX SOUTH 1", true); if (Global_Variable_Query(kVariableChapter) < 4) { if (!Game_Flag_Query(kFlagCT11DogWrapperTaken)) { - Item_Add_To_World(kItemDogWrapper, 951, 33, 640.21f, 30.0f, 470.0f, 512, 12, 12, false, true, false, true); + Item_Add_To_World(kItemDogWrapper, kModelAnimationLichenDogWrapper, 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(kFlagCT11DogWrapperAvailable); } diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp index 231f7bc175..d299595abc 100644 --- a/engines/bladerunner/script/scene/ct51.cpp +++ b/engines/bladerunner/script/scene/ct51.cpp @@ -45,10 +45,10 @@ void SceneScriptCT51::SceneLoaded() { Unobstacle_Object("BLANKET03", true); Clickable_Object("BED02"); if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) { - Item_Add_To_World(kItemRagDoll, 943, kSetCT08_CT51_UG12, 44.0f, 0.0f, -95.0f, 540, 24, 24, false, true, false, true); + Item_Add_To_World(kItemRagDoll, kModelAnimationRagDoll, kSetCT08_CT51_UG12, 44.0f, 0.0f, -95.0f, 540, 24, 24, false, true, false, true); } if (!Actor_Clue_Query(kActorMcCoy, kClueMoonbus1)) { - Item_Add_To_World(kItemMoonbusPhoto, 984, kSetCT08_CT51_UG12, 44.0f, 0.0f, -22.0f, 0, 12, 12, false, true, false, true); + Item_Add_To_World(kItemMoonbusPhoto, kModelAnimationPhoto, kSetCT08_CT51_UG12, 44.0f, 0.0f, -22.0f, 0, 12, 12, false, true, false, true); } } @@ -84,7 +84,7 @@ bool SceneScriptCT51::ClickedOnItem(int itemId, bool a2) { if (itemId == kItemMoonbusPhoto) { Actor_Clue_Acquire(kActorMcCoy, kClueMoonbus1, true, -1); - Item_Pickup_Spin_Effect(984, 490, 307); + Item_Pickup_Spin_Effect(kModelAnimationPhoto, 490, 307); Item_Remove_From_World(kItemMoonbusPhoto); Actor_Says(kActorMcCoy, 8527, kAnimationModeTalk); return true; diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp index b8292c4e2e..b433a00618 100644 --- a/engines/bladerunner/script/scene/dr05.cpp +++ b/engines/bladerunner/script/scene/dr05.cpp @@ -55,9 +55,9 @@ void SceneScriptDR05::SceneLoaded() { Clickable_Object("T2 DOORWAY"); if (!Game_Flag_Query(kFlagDR05BombExploded)) { - Item_Add_To_World(kItemBomb, 932, kSetDR05, -1.57f, 31.33f, 75.21f, 540, 16, 16, true, true, false, true); + Item_Add_To_World(kItemBomb, kModelAnimationBomb, kSetDR05, -1.57f, 31.33f, 75.21f, 540, 16, 16, true, true, false, true); if (Actor_Query_Goal_Number(kActorMoraji) == kGoalMorajiDefault) { - Item_Add_To_World(kItemChain, 931, kSetDR05, 37.35f, 1.59f, 46.72f, 0, 20, 20, true, true, false, true); + Item_Add_To_World(kItemChain, kModelAnimationBadge, kSetDR05, 37.35f, 1.59f, 46.72f, 0, 20, 20, true, true, false, true); // TODO a bug? reusing still animation of kModelAnimationBadge } } } diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp index 26eb0e983d..8fc7503ba4 100644 --- a/engines/bladerunner/script/scene/dr06.cpp +++ b/engines/bladerunner/script/scene/dr06.cpp @@ -162,7 +162,7 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) { Actor_Voice_Over(870, kActorVoiceOver); Actor_Voice_Over(880, kActorVoiceOver); Actor_Clue_Acquire(kActorMcCoy, kClueEnvelope, true, kActorLance); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Increment(kVariableChinyen, 200); } } diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp index bca5346275..4f3f1b76ba 100644 --- a/engines/bladerunner/script/scene/hc01.cpp +++ b/engines/bladerunner/script/scene/hc01.cpp @@ -131,11 +131,11 @@ bool SceneScriptHC01::ClickedOnActor(int actorId) { bool SceneScriptHC01::ClickedOnItem(int itemId, bool a2) { if (itemId == kItemCamera) { Item_Remove_From_World(kItemCamera); - Item_Pickup_Spin_Effect(977, 361, 381); + Item_Pickup_Spin_Effect(kModelAnimationIzoCamera, 361, 381); Delay(1500); - Item_Pickup_Spin_Effect(984, 377, 397); + Item_Pickup_Spin_Effect(kModelAnimationPhoto, 377, 397); Delay(1500); - Item_Pickup_Spin_Effect(984, 330, 384); + Item_Pickup_Spin_Effect(kModelAnimationPhoto, 330, 384); if (Game_Flag_Query(kFlagAR02DektoraBoughtScorpions)) { Actor_Clue_Acquire(kActorMcCoy, kCluePhotoOfMcCoy1, true, kActorIzo); } else { @@ -210,7 +210,7 @@ void SceneScriptHC01::SceneFrameAdvanced(int frame) { if (frame == 80) { Ambient_Sounds_Play_Sound(kSfxTRPDOOR1, 40, 100, 100, 0); - Item_Add_To_World(kItemGreenPawnLock, 931, kSetHC01_HC02_HC03_HC04, 582.0f, 27.0f, -41.0f, 0, 8, 8, true, true, false, true); + Item_Add_To_World(kItemGreenPawnLock, kModelAnimationBadge, kSetHC01_HC02_HC03_HC04, 582.0f, 27.0f, -41.0f, 0, 8, 8, true, true, false, true); // TODO a bug? reusing still animation of kModelAnimationBadge } } @@ -278,7 +278,7 @@ void SceneScriptHC01::dialogueWithIzo() { Actor_Says(kActorIzo, 250, 13); Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -1); if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47 - && Query_Difficulty_Level() == 0 + && Query_Difficulty_Level() == kGameDifficultyEasy ) { takePhotoAndRunAway(); } @@ -303,7 +303,7 @@ void SceneScriptHC01::dialogueWithIzo() { Actor_Says(kActorIzo, 220, 16); Actor_Says(kActorIzo, 230, kAnimationModeTalk); Actor_Says(kActorIzo, 240, 15); - if (Query_Difficulty_Level() < 2) { + if (Query_Difficulty_Level() < kGameDifficultyHard) { Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -1); } } @@ -315,7 +315,7 @@ void SceneScriptHC01::dialogueWithIzo() { Actor_Says(kActorIzo, 170, kAnimationModeTalk); Actor_Says(kActorIzo, 180, kAnimationModeTalk); Actor_Says(kActorIzo, 190, 12); - if (Query_Difficulty_Level() < 2) { + if (Query_Difficulty_Level() < kGameDifficultyHard) { Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -2); } } @@ -342,7 +342,7 @@ void SceneScriptHC01::dialogueWithIzo() { Actor_Says(kActorIzo, 300, 12); Actor_Says(kActorIzo, 310, 17); Actor_Says(kActorMcCoy, 1140, kAnimationModeTalk); - if (Query_Difficulty_Level() < 2) { + if (Query_Difficulty_Level() < kGameDifficultyHard) { Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -2); } if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47) { diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp index 413c9a78ae..bf35dd3257 100644 --- a/engines/bladerunner/script/scene/hc02.cpp +++ b/engines/bladerunner/script/scene/hc02.cpp @@ -114,7 +114,7 @@ bool SceneScriptHC02::ClickedOnActor(int actorId) { } else if ( Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview1) && !Actor_Clue_Query(kActorMcCoy, kClueFlaskOfAbsinthe) && (Global_Variable_Query(kVariableChinyen) > 20 - || Query_Difficulty_Level() == 0 + || Query_Difficulty_Level() == kGameDifficultyEasy ) ) { Actor_Clue_Acquire(kActorMcCoy, kClueFlaskOfAbsinthe, true, kActorHawkersBarkeep); @@ -129,7 +129,7 @@ bool SceneScriptHC02::ClickedOnActor(int actorId) { Actor_Change_Animation_Mode(kActorMcCoy, 23); Delay(1500); Actor_Says_With_Pause(kActorHawkersBarkeep, 50, 1.6f, 17); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Decrement(kVariableChinyen, 20); } Actor_Says(kActorMcCoy, 1245, 13); @@ -143,9 +143,9 @@ bool SceneScriptHC02::ClickedOnActor(int actorId) { Game_Flag_Set(kFlagHC02HawkersBarkeepBraceletTalk); } if (Global_Variable_Query(kVariableChinyen) > 5 - || Query_Difficulty_Level() == 0 + || Query_Difficulty_Level() == kGameDifficultyEasy ) { - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Decrement(kVariableChinyen, 5); } Global_Variable_Increment(kVariableMcCoyDrinks, 1); diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp index 426bdc12c3..06a8c3bca7 100644 --- a/engines/bladerunner/script/scene/hc03.cpp +++ b/engines/bladerunner/script/scene/hc03.cpp @@ -130,11 +130,11 @@ bool SceneScriptHC03::ClickedOnItem(int itemId, bool combatMode) { if (itemId == kItemCamera) { Item_Remove_From_World(kItemCamera); - Item_Pickup_Spin_Effect(977, 68, 435); + Item_Pickup_Spin_Effect(kModelAnimationIzoCamera, 68, 435); Delay(1500); - Item_Pickup_Spin_Effect(984, 78, 435); + Item_Pickup_Spin_Effect(kModelAnimationPhoto, 78, 435); Delay(1500); - Item_Pickup_Spin_Effect(984, 58, 435); + Item_Pickup_Spin_Effect(kModelAnimationPhoto, 58, 435); if (Game_Flag_Query(kFlagAR02DektoraBoughtScorpions)) { Actor_Clue_Acquire(kActorMcCoy, kCluePhotoOfMcCoy1, true, kActorIzo); } else { diff --git a/engines/bladerunner/script/scene/kp05.cpp b/engines/bladerunner/script/scene/kp05.cpp index d5b4895b9f..723047479d 100644 --- a/engines/bladerunner/script/scene/kp05.cpp +++ b/engines/bladerunner/script/scene/kp05.cpp @@ -59,7 +59,7 @@ void SceneScriptKP05::SceneLoaded() { if (!Actor_Clue_Query(kActorMcCoy, kCluePowerSource) && Game_Flag_Query(kFlagMcCoyIsHelpingReplicants) ) { - Item_Add_To_World(kItemPowerSource, 960, kSetKP05_KP06, -1095.0f, 0.0f, 770.0f, 256, 24, 24, false, true, false, true); + Item_Add_To_World(kItemPowerSource, kModelAnimationPowerSource, kSetKP05_KP06, -1095.0f, 0.0f, 770.0f, 256, 24, 24, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp index b7e869c21d..80dade2c41 100644 --- a/engines/bladerunner/script/scene/ma04.cpp +++ b/engines/bladerunner/script/scene/ma04.cpp @@ -580,7 +580,7 @@ void SceneScriptMA04::sleep() { Global_Variable_Set(kVariableChapter, 2); Chapter_Enter(2, kSetMA02_MA04, kSceneMA04); #if BLADERUNNER_ORIGINAL_BUGS - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { if (!Game_Flag_Query(kFlagZubenBountyPaid)) { Global_Variable_Increment(kVariableChinyen, 200); } @@ -589,7 +589,7 @@ void SceneScriptMA04::sleep() { // NOTE If not for the "Report Im" to Guzza, it would be simpler to have McCoy get the money as soon as he retires Zuben // so that would be in a single place in the code if (!Game_Flag_Query(kFlagZubenBountyPaid) && Game_Flag_Query(kFlagZubenRetired)) { // get retirement money at end of day 1 only if Zuben was retired. - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Increment(kVariableChinyen, 200); } Game_Flag_Set(kFlagZubenBountyPaid); // not a proper bug, but was missing from original code, so the flag would remain in non-consistent state in this case diff --git a/engines/bladerunner/script/scene/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp index ea156784d7..e643a6f816 100644 --- a/engines/bladerunner/script/scene/nr02.cpp +++ b/engines/bladerunner/script/scene/nr02.cpp @@ -115,21 +115,21 @@ bool SceneScriptNR02::ClickedOnActor(int actorId) { } bool SceneScriptNR02::ClickedOnItem(int itemId, bool a2) { - if (itemId == kItemGordosLighter1 - || itemId == kItemGordosLighter2 + if (itemId == kItemGordosLighterReplicant + || itemId == kItemGordosLighterHuman ) { if(!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 109.38f, -24.0f, 420.5f, 0, true, false, 0)) { Actor_Face_Heading(kActorMcCoy, 423, false); - if (itemId == kItemGordosLighter1) { - Item_Remove_From_World(kItemGordosLighter1); + if (itemId == kItemGordosLighterReplicant) { + Item_Remove_From_World(kItemGordosLighterReplicant); Item_Pickup_Spin_Effect(953, 214, 380); - Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighter1, true, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighterReplicant, true, -1); } - if (itemId == kItemGordosLighter2) { - Item_Remove_From_World(kItemGordosLighter2); + if (itemId == kItemGordosLighterHuman) { + Item_Remove_From_World(kItemGordosLighterHuman); Item_Pickup_Spin_Effect(954, 214, 380); - Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighter2, true, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighterHuman, true, -1); } } } diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp index 234467ec9f..76f22f07ab 100644 --- a/engines/bladerunner/script/scene/nr04.cpp +++ b/engines/bladerunner/script/scene/nr04.cpp @@ -268,7 +268,7 @@ void SceneScriptNR04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo case kGoalEarlyQNR04Talk3: Actor_Clue_Acquire(kActorMcCoy, kClueDektorasDressingRoom, false, kActorEarlyQ); - Item_Pickup_Spin_Effect(984, 200, 160); + Item_Pickup_Spin_Effect(kModelAnimationPhoto, 200, 160); Actor_Says(kActorEarlyQ, 200, 30); Actor_Says(kActorEarlyQ, 210, 30); Actor_Says(kActorEarlyQ, 220, 30); diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp index 73675680f5..b94f1a9399 100644 --- a/engines/bladerunner/script/scene/ps04.cpp +++ b/engines/bladerunner/script/scene/ps04.cpp @@ -61,7 +61,7 @@ void SceneScriptPS04::SceneLoaded() { && !Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm) && !Game_Flag_Query(kFlagPS04WeaponsOrderForm) ) { - Item_Add_To_World(kItemWeaponsOrderForm, 958, kSetPS04, -643.5f, -318.82f, 1148.87f, 525, 16, 12, false, true, false, true); + Item_Add_To_World(kItemWeaponsOrderForm, kModelAnimationOriginalRequisitionForm, kSetPS04, -643.5f, -318.82f, 1148.87f, 525, 16, 12, false, true, false, true); Game_Flag_Set(kFlagPS04WeaponsOrderForm); } @@ -192,7 +192,7 @@ void SceneScriptPS04::dialogueWithGuzza() { Actor_Says(kActorGuzza, 550, 32); Actor_Says(kActorMcCoy, 4065, 18); Actor_Says(kActorGuzza, 560, 34); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Increment(kVariableChinyen, 100); } } else { @@ -215,7 +215,7 @@ void SceneScriptPS04::dialogueWithGuzza() { Actor_Says(kActorGuzza, 550, 32); Actor_Says(kActorMcCoy, 4065, 18); Actor_Says(kActorGuzza, 560, 34); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Increment(kVariableChinyen, 100); } #endif // BLADERUNNER_RESTORED_CUT_CONTENT @@ -260,13 +260,13 @@ void SceneScriptPS04::dialogueWithGuzza() { Actor_Says(kActorGuzza, 270, 32); Game_Flag_Set(kFlagPS04GuzzaTalkZubenRetired); #if BLADERUNNER_ORIGINAL_BUGS - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Increment(kVariableChinyen, 200); } Game_Flag_Set(kFlagZubenBountyPaid); #else if (!Game_Flag_Query(kFlagZubenBountyPaid)) { // get retirement money only if haven't been auto-paid at end of Day 1 (sleep trigger) - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Increment(kVariableChinyen, 200); } Game_Flag_Set(kFlagZubenBountyPaid); // not a proper bug, but was missing from original code, so the flag would remain in non-consistent state in this case diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp index 19932495b0..6cb50cde29 100644 --- a/engines/bladerunner/script/scene/ps10.cpp +++ b/engines/bladerunner/script/scene/ps10.cpp @@ -452,15 +452,15 @@ void SceneScriptPS10::SceneLoaded() { // every maze target begins as NON-targetable targetStateMZ = false; #endif // BLADERUNNER_ORIGINAL_BUGS - Item_Add_To_World(kItemPS10Target1, 443, kSetPS10_PS11_PS12_PS13, -240.0f, -80.74f, 145.0f, 989, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target2, 443, kSetPS10_PS11_PS12_PS13, -240.0f, -8.74f, 145.0f, 740, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target3, 445, kSetPS10_PS11_PS12_PS13, -165.0f, 111.53f, -10.0f, 993, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target4, 447, kSetPS10_PS11_PS12_PS13, -125.0f, 160.0f, -10.0f, 993, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target5, 441, kSetPS10_PS11_PS12_PS13, -246.71f, 205.51f, -20.0f, 0, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target6, 445, kSetPS10_PS11_PS12_PS13, -27.69f, -86.92f, 434.0f, 999, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target7, 441, kSetPS10_PS11_PS12_PS13, -347.15f, 7.68f, -20.0f, 264, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target8, 449, kSetPS10_PS11_PS12_PS13, -51.0f, 160.0f, -10.0f, 993, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS10Target9, 445, kSetPS10_PS11_PS12_PS13, 39.0f, 9.16f, -20.0f, 738, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target1, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -240.0f, -80.74f, 145.0f, 989, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target2, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -240.0f, -8.74f, 145.0f, 740, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target3, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -165.0f, 111.53f, -10.0f, 993, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target4, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -125.0f, 160.0f, -10.0f, 993, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target5, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, -246.71f, 205.51f, -20.0f, 0, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target6, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -27.69f, -86.92f, 434.0f, 999, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target7, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, -347.15f, 7.68f, -20.0f, 264, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target8, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -51.0f, 160.0f, -10.0f, 993, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS10Target9, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, 39.0f, 9.16f, -20.0f, 738, 72, 36, targetStateMZ, false, false, true); } @@ -473,16 +473,16 @@ void SceneScriptPS10::SceneLoaded() { Police_Maze_Target_Track_Add(kItemPS10Target7, -347.15f, 7.68f, -20.0f, 39.0f, 9.16f, -20.0f, 90, getPoliceMazePS10TrackData7(), false); Police_Maze_Target_Track_Add(kItemPS10Target8, -51.0f, 160.0f, -10.0f, -125.0f, 160.0f, -10.0f, 35, getPoliceMazePS10TrackData8(), true); Police_Maze_Target_Track_Add(kItemPS10Target9, 39.0f, 9.16f, -20.0f, -347.15f, 7.68f, -20.0f, 90, getPoliceMazePS10TrackData9(), false); - Preload(441); - Preload(442); - Preload(443); - Preload(444); - Preload(445); - Preload(446); - Preload(447); - Preload(448); - Preload(449); - Preload(450); + Preload(kModelAnimationMaleTargetEmptyHandsActive); + Preload(kModelAnimationMaleTargetEmptyHandsDead); + Preload(kModelAnimationMaleTargetWithGunActive); + Preload(kModelAnimationMaleTargetWithGunDead); + Preload(kModelAnimationMaleTargetWithShotgunActive); + Preload(kModelAnimationMaleTargetWithShotgunDead); + Preload(kModelAnimationFemaleTargetWithBabyActive); + Preload(kModelAnimationFemaleTargetWithBabyDead); + Preload(kModelAnimationFemaleTargetWithGunActive); + Preload(kModelAnimationFemaleTargetWithGunDead); } bool SceneScriptPS10::MouseClick(int x, int y) { diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp index 03c3b0906b..a56e3d076d 100644 --- a/engines/bladerunner/script/scene/ps11.cpp +++ b/engines/bladerunner/script/scene/ps11.cpp @@ -687,22 +687,22 @@ void SceneScriptPS11::SceneLoaded() { // every maze target begins as NON-targetable targetStateMZ = false; #endif // BLADERUNNER_ORIGINAL_BUGS - Item_Add_To_World(kItemPS11Target1, 449, kSetPS10_PS11_PS12_PS13, -450.0f, -7.5f, 335.0f, 50, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target2, 449, kSetPS10_PS11_PS12_PS13, -740.0f, 27.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target3, 449, kSetPS10_PS11_PS12_PS13, -740.0f, 99.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target4, 441, kSetPS10_PS11_PS12_PS13, -400.0f, -9.23f, -75.0f, 725, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target5, 443, kSetPS10_PS11_PS12_PS13, -803.72f, -72.7f, 60.22f, 340, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target6, 443, kSetPS10_PS11_PS12_PS13, -853.0f, -70.0f, 195.0f, 900, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target7, 447, kSetPS10_PS11_PS12_PS13, -740.0f, 27.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target8, 447, kSetPS10_PS11_PS12_PS13, -740.0f, 99.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target9, 445, kSetPS10_PS11_PS12_PS13, -888.0f, 155.0f, 100.0f, 310, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target10, 443, kSetPS10_PS11_PS12_PS13, -430.0f, 164.0f, 11.0f, 900, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target11, 443, kSetPS10_PS11_PS12_PS13, -430.0f, -0.86f, 11.0f, 512, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target12, 443, kSetPS10_PS11_PS12_PS13, -891.0f, 3.1f, 90.0f, 280, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target13, 447, kSetPS10_PS11_PS12_PS13, -891.0f, 3.1f, 90.0f, 280, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target14, 445, kSetPS10_PS11_PS12_PS13, -891.0f, 171.0f, 190.0f, 255, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target15, 441, kSetPS10_PS11_PS12_PS13, -888.0f, 155.0f, 30.0f, 310, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS11Target16, 445, kSetPS10_PS11_PS12_PS13, -800.0f, -9.23f, -75.0f, 346, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target1, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -450.0f, -7.5f, 335.0f, 50, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target2, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -740.0f, 27.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target3, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -740.0f, 99.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target4, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, -400.0f, -9.23f, -75.0f, 725, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target5, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -803.72f, -72.7f, 60.22f, 340, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target6, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -853.0f, -70.0f, 195.0f, 900, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target7, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -740.0f, 27.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target8, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -740.0f, 99.0f, -30.0f, 860, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target9, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -888.0f, 155.0f, 100.0f, 310, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target10, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -430.0f, 164.0f, 11.0f, 900, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target11, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -430.0f, -0.86f, 11.0f, 512, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target12, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -891.0f, 3.1f, 90.0f, 280, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target13, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -891.0f, 3.1f, 90.0f, 280, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target14, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -891.0f, 171.0f, 190.0f, 255, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target15, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, -888.0f, 155.0f, 30.0f, 310, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS11Target16, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -800.0f, -9.23f, -75.0f, 346, 72, 36, targetStateMZ, false, false, true); } Police_Maze_Target_Track_Add(kItemPS11Target1, -450.0f, -7.5f, 335.0f, -450.0f, -7.5f, 295.0f, 8, getPoliceMazePS11TrackData9(), true); diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp index e31f8cf867..0d0fceeefe 100644 --- a/engines/bladerunner/script/scene/ps12.cpp +++ b/engines/bladerunner/script/scene/ps12.cpp @@ -739,23 +739,23 @@ void SceneScriptPS12::SceneLoaded() { // every maze target begins as NON-targetable targetStateMZ = false; #endif // BLADERUNNER_ORIGINAL_BUGS - Item_Add_To_World(kItemPS12Target1, 449, kSetPS10_PS11_PS12_PS13, -691.8f, -9.06f, 587.67f, 200, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target2, 445, kSetPS10_PS11_PS12_PS13, -679.6f, -45.4f, 721.05f, 67, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target3, 447, kSetPS10_PS11_PS12_PS13, -414.04f, -8.98f, 711.91f, 480, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target4, 443, kSetPS10_PS11_PS12_PS13, -440.0f, -8.97f, 1137.0f, 1010, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target5, 441, kSetPS10_PS11_PS12_PS13, -764.92f, -0.84f, 950.22f, 540, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target6, 449, kSetPS10_PS11_PS12_PS13, -696.0f, -5.7f, 1185.0f, 469, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target7, 449, kSetPS10_PS11_PS12_PS13, -635.0f, -5.7f, 1165.0f, 198, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target8, 449, kSetPS10_PS11_PS12_PS13, -620.0f, -8.63f, 1366.0f, 469, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target9, 447, kSetPS10_PS11_PS12_PS13, -584.0f, -79.4f, 775.0f, 1010, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target10, 445, kSetPS10_PS11_PS12_PS13, -578.0f, -79.4f, 810.0f, 990, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target11, 443, kSetPS10_PS11_PS12_PS13, -400.0f, -12.0f, 1110.0f, 513, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target12, 449, kSetPS10_PS11_PS12_PS13, -414.04f, -8.98f, 711.91f, 480, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target13, 447, kSetPS10_PS11_PS12_PS13, -400.0f, -12.0f, 1110.0f, 513, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target14, 449, kSetPS10_PS11_PS12_PS13, -731.0f, 93.66f, 788.0f, 109, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target15, 441, kSetPS10_PS11_PS12_PS13, -580.0f, -80.0f, 925.0f, 540, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target16, 441, kSetPS10_PS11_PS12_PS13, -731.0f, 93.66f, 788.0f, 109, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS12Target17, 443, kSetPS10_PS11_PS12_PS13, -580.0f, -80.0f, 925.0f, 540, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target1, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -691.8f, -9.06f, 587.67f, 200, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target2, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -679.6f, -45.4f, 721.05f, 67, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target3, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -414.04f, -8.98f, 711.91f, 480, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target4, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -440.0f, -8.97f, 1137.0f, 1010, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target5, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, -764.92f, -0.84f, 950.22f, 540, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target6, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -696.0f, -5.7f, 1185.0f, 469, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target7, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -635.0f, -5.7f, 1165.0f, 198, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target8, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -620.0f, -8.63f, 1366.0f, 469, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target9, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -584.0f, -79.4f, 775.0f, 1010, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target10, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -578.0f, -79.4f, 810.0f, 990, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target11, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -400.0f, -12.0f, 1110.0f, 513, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target12, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -414.04f, -8.98f, 711.91f, 480, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target13, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -400.0f, -12.0f, 1110.0f, 513, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target14, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -731.0f, 93.66f, 788.0f, 109, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target15, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, -580.0f, -80.0f, 925.0f, 540, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target16, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, -731.0f, 93.66f, 788.0f, 109, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS12Target17, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -580.0f, -80.0f, 925.0f, 540, 72, 36, targetStateMZ, false, false, true); } Police_Maze_Target_Track_Add(kItemPS12Target1, -691.8f, -9.06f, 587.67f, -649.11f, -9.06f, 587.71f, 6, getPoliceMazePS12TrackData29(), true); Police_Maze_Target_Track_Add(kItemPS12Target2, -679.6f, -45.4f, 721.05f, -679.6f, -1.4f, 721.05f, 6, getPoliceMazePS12TrackData30(), true); diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp index e88e3e9047..ef1d45f883 100644 --- a/engines/bladerunner/script/scene/ps13.cpp +++ b/engines/bladerunner/script/scene/ps13.cpp @@ -645,21 +645,21 @@ void SceneScriptPS13::SceneLoaded() { // every maze target begins as NON-targetable targetStateMZ = false; #endif // BLADERUNNER_ORIGINAL_BUGS - Item_Add_To_World(kItemPS13Target1, 443, kSetPS10_PS11_PS12_PS13, -372.0f, -9.0f, 1509.0f, 960, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target2, 443, kSetPS10_PS11_PS12_PS13, 291.61f, -0.66f, 1610.3f, 823, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target3, 447, kSetPS10_PS11_PS12_PS13, -25.0f, 102.0f, 1625.0f, 823, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target4, 449, kSetPS10_PS11_PS12_PS13, -45.51f, -8.8f, 1676.0f, 922, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target5, 447, kSetPS10_PS11_PS12_PS13, 291.61f, -0.66f, 1610.3f, 823, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target6, 443, kSetPS10_PS11_PS12_PS13, -24.0f, 102.0f, 1625.0f, 823, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target7, 449, kSetPS10_PS11_PS12_PS13, 180.0f, -72.7f, 1605.0f, 305, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target8, 443, kSetPS10_PS11_PS12_PS13, 127.79f, 14.56f, 1703.03f, 356, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target9, 443, kSetPS10_PS11_PS12_PS13, 136.37f, -6.84f, 1425.43f, 512, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target10, 441, kSetPS10_PS11_PS12_PS13, 77.83f, -79.8f, 1520.5f, 327, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target11, 441, kSetPS10_PS11_PS12_PS13, 77.83f, -7.8f, 1520.5f, 327, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target12, 443, kSetPS10_PS11_PS12_PS13, -88.0f, -8.8f, 1520.5f, 327, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target13, 447, kSetPS10_PS11_PS12_PS13, -45.51f, -8.8f, 1676.0f, 922, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target14, 445, kSetPS10_PS11_PS12_PS13, -300.0f, -79.75f, 1543.0f, 465, 72, 36, targetStateMZ, false, false, true); - Item_Add_To_World(kItemPS13Target15, 449, kSetPS10_PS11_PS12_PS13, -325.0f, -7.75f, 1543.0f, 465, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target1, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -372.0f, -9.0f, 1509.0f, 960, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target2, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, 291.61f, -0.66f, 1610.3f, 823, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target3, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -25.0f, 102.0f, 1625.0f, 823, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target4, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -45.51f, -8.8f, 1676.0f, 922, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target5, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, 291.61f, -0.66f, 1610.3f, 823, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target6, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -24.0f, 102.0f, 1625.0f, 823, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target7, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, 180.0f, -72.7f, 1605.0f, 305, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target8, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, 127.79f, 14.56f, 1703.03f, 356, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target9, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, 136.37f, -6.84f, 1425.43f, 512, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target10, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, 77.83f, -79.8f, 1520.5f, 327, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target11, kModelAnimationMaleTargetEmptyHandsActive, kSetPS10_PS11_PS12_PS13, 77.83f, -7.8f, 1520.5f, 327, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target12, kModelAnimationMaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -88.0f, -8.8f, 1520.5f, 327, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target13, kModelAnimationFemaleTargetWithBabyActive, kSetPS10_PS11_PS12_PS13, -45.51f, -8.8f, 1676.0f, 922, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target14, kModelAnimationMaleTargetWithShotgunActive, kSetPS10_PS11_PS12_PS13, -300.0f, -79.75f, 1543.0f, 465, 72, 36, targetStateMZ, false, false, true); + Item_Add_To_World(kItemPS13Target15, kModelAnimationFemaleTargetWithGunActive, kSetPS10_PS11_PS12_PS13, -325.0f, -7.75f, 1543.0f, 465, 72, 36, targetStateMZ, false, false, true); } Police_Maze_Target_Track_Add(kItemPS13Target1, -372.0f, -9.0f, 1509.0f, -345.0f, -9.0f, 1509.0f, 6, getPoliceMazePS13TrackData46(), true); diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp index 464133535d..cb7a7511d0 100644 --- a/engines/bladerunner/script/scene/ps15.cpp +++ b/engines/bladerunner/script/scene/ps15.cpp @@ -43,7 +43,7 @@ void SceneScriptPS15::InitializeScene() { void SceneScriptPS15::SceneLoaded() { Obstacle_Object("E.ARCH", true); if (Global_Variable_Query(kVariableChapter) == 2) { - Item_Add_To_World(kItemWeaponsCrate, 983, 101, -208.0f, -113.43f, 30.28f, 750, 16, 12, false, true, false, true); + Item_Add_To_World(kItemWeaponsCrate, kModelAnimationWeaponsCrate, 101, -208.0f, -113.43f, 30.28f, 750, 16, 12, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp index a0074ebccc..2170ce2b44 100644 --- a/engines/bladerunner/script/scene/rc01.cpp +++ b/engines/bladerunner/script/scene/rc01.cpp @@ -197,7 +197,7 @@ void SceneScriptRC01::SceneLoaded() { } if (!Game_Flag_Query(kFlagRC01ChromeDebrisTaken)) { - Item_Add_To_World(kItemChromeDebris, 938, kSetRC01, -148.60f, -0.30f, 225.15f, 256, 24, 24, false, true, false, true); + Item_Add_To_World(kItemChromeDebris, kModelAnimationChromeDebris, kSetRC01, -148.60f, -0.30f, 225.15f, 256, 24, 24, false, true, false, true); } if (!Game_Flag_Query(kFlagIntroPlayed)) { diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 46c644407b..8f9529f0b2 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -85,9 +85,9 @@ void SceneScriptRC02::SceneLoaded() { Unclickable_Object("SCRTY CA03"); } if (!Game_Flag_Query(kFlagRC02ShellCasingsTaken)) { - Item_Add_To_World(kItemShellCasingA, 966, kSetRC02_RC51, -52.88f, -1238.89f, 108467.74f, 256, 6, 6, false, true, false, true); - Item_Add_To_World(kItemShellCasingB, 966, kSetRC02_RC51, -37.16f, -1238.89f, 108456.59f, 512, 6, 6, false, true, false, true); - Item_Add_To_World(kItemShellCasingC, 966, kSetRC02_RC51, -62.86f, -1238.89f, 108437.52f, 625, 6, 6, false, true, false, true); + Item_Add_To_World(kItemShellCasingA, kModelAnimationShellCasings, kSetRC02_RC51, -52.88f, -1238.89f, 108467.74f, 256, 6, 6, false, true, false, true); + Item_Add_To_World(kItemShellCasingB, kModelAnimationShellCasings, kSetRC02_RC51, -37.16f, -1238.89f, 108456.59f, 512, 6, 6, false, true, false, true); + Item_Add_To_World(kItemShellCasingC, kModelAnimationShellCasings, kSetRC02_RC51, -62.86f, -1238.89f, 108437.52f, 625, 6, 6, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp index 66563a1235..d2bfb4ff53 100644 --- a/engines/bladerunner/script/scene/rc04.cpp +++ b/engines/bladerunner/script/scene/rc04.cpp @@ -238,7 +238,7 @@ void SceneScriptRC04::dialogueWithBulletBob() { Actor_Says(kActorBulletBob, 880, 34); Actor_Clue_Acquire(kActorBulletBob, kClueHoldensBadge, true, kActorMcCoy); Actor_Modify_Friendliness_To_Other(kActorBulletBob, kActorMcCoy, 8); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Increment(kVariableChinyen, 60); } break; @@ -259,10 +259,10 @@ void SceneScriptRC04::dialogueWithBulletBob() { } Actor_Says(kActorBulletBob, 2120, 31); if (Global_Variable_Query(kVariableChinyen) > 40 - || Query_Difficulty_Level() == 0 + || Query_Difficulty_Level() == kGameDifficultyEasy ) { Actor_Says(kActorMcCoy, 4940, 13); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Decrement(kVariableChinyen, 40); } Item_Pickup_Spin_Effect(995, 405, 192); @@ -363,14 +363,14 @@ bool SceneScriptRC04::ClickedOnActor(int actorId) { Delay(1000); Actor_Says(kActorBulletBob, 2010, 35); if (Global_Variable_Query(kVariableChinyen) > 50 - || Query_Difficulty_Level() == 0 + || Query_Difficulty_Level() == kGameDifficultyEasy ) { Actor_Says(kActorMcCoy, 8975, 16); - if (Query_Difficulty_Level() != 0) { + if (Query_Difficulty_Level() != kGameDifficultyEasy) { Global_Variable_Decrement(kVariableChinyen, 50); } Delay(3000); - Item_Pickup_Spin_Effect(941, 405, 192); + Item_Pickup_Spin_Effect(kModelAnimationDNADataDisc, 405, 192); Actor_Says(kActorBulletBob, 2030, 30); Game_Flag_Set(kFlagKIAPrivacyAddon); } else { diff --git a/engines/bladerunner/script/scene/rc51.cpp b/engines/bladerunner/script/scene/rc51.cpp index f8e30f0de0..369cf5d987 100644 --- a/engines/bladerunner/script/scene/rc51.cpp +++ b/engines/bladerunner/script/scene/rc51.cpp @@ -48,13 +48,13 @@ void SceneScriptRC51::SceneLoaded() { Unclickable_Object("GRL_DSKLEG"); Unclickable_Object("CURTAIN"); if (!Game_Flag_Query(kFlagRC51ChopstickWrapperTaken)) { - Item_Add_To_World(kItemChopstickWrapper, 937, kSetRC02_RC51, 47.56f, -1238.89f, 108048.61f, 0, 6, 18, false, true, false, true); + Item_Add_To_World(kItemChopstickWrapper, kModelAnimationChopstickWrapper, kSetRC02_RC51, 47.56f, -1238.89f, 108048.61f, 0, 6, 18, false, true, false, true); } if (!Game_Flag_Query(kFlagRC51CandyTaken)) { - Item_Add_To_World(kItemCandy, 933, kSetRC02_RC51, 67.28f, -1193.38f, 108011.27f, 0, 6, 6, false, true, false, true); + Item_Add_To_World(kItemCandy, kModelAnimationCandy, kSetRC02_RC51, 67.28f, -1193.38f, 108011.27f, 0, 6, 6, false, true, false, true); } if (!Game_Flag_Query(kFlagRC51ToyDogTaken)) { - Item_Add_To_World(kItemToyDog, 971, kSetRC02_RC51, -69.65f, -1238.89f, 107995.24f, 256, 18, 18, false, true, false, true); + Item_Add_To_World(kItemToyDog, kModelAnimationToyDog, kSetRC02_RC51, -69.65f, -1238.89f, 107995.24f, 256, 18, 18, false, true, false, true); } } @@ -93,7 +93,7 @@ bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) { Actor_Face_Item(kActorMcCoy, kItemCandy, true); Actor_Clue_Acquire(kActorMcCoy, kClueCandy, true, -1); Item_Remove_From_World(kItemCandy); - Item_Pickup_Spin_Effect(933, 445, 230); + Item_Pickup_Spin_Effect(kModelAnimationCandy, 445, 230); Actor_Says(kActorMcCoy, 8735, 3); Actor_Says(kActorMcCoy, 8529, 3); Game_Flag_Set(kFlagRC51CandyTaken); diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp index 2e67fa3d4b..4051501d25 100644 --- a/engines/bladerunner/script/scene/tb05.cpp +++ b/engines/bladerunner/script/scene/tb05.cpp @@ -52,15 +52,15 @@ void SceneScriptTB05::SceneLoaded() { Clickable_Object("MONITOR05"); Unclickable_Object("SMUDGE_GLASS01"); if (!Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring)) { - Item_Add_To_World(kItemDragonflyEarring, 940, kSetTB05, 76.16f, 147.36f, -235.15f, 0, 6, 6, false, true, false, true); + Item_Add_To_World(kItemDragonflyEarring, kModelAnimationDragonflyEarring, kSetTB05, 76.16f, 147.36f, -235.15f, 0, 6, 6, false, true, false, true); } - if (!Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphlet1) - && !Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphlet2) + if (!Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphletEntertainModel) + && !Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphletLolita) && (Game_Flag_Query(kFlagGordoIsReplicant) || Game_Flag_Query(kFlagLucyIsReplicant) ) ) { - Item_Add_To_World(kItemTyrellSalesPamphlet, 972, kSetTB05, 129.01f, 147.12f, -162.98f, 0, 8, 8, false, true, false, true); + Item_Add_To_World(kItemTyrellSalesPamphlet, kModelAnimationTyrellSalesPamphlet, kSetTB05, 129.01f, 147.12f, -162.98f, 0, 8, 8, false, true, false, true); } } @@ -93,7 +93,7 @@ bool SceneScriptTB05::ClickedOn3DObject(const char *objectName, bool a2) { ) { Actor_Clue_Acquire(kActorMcCoy, kClueDNAMarcus, true, -1); Actor_Voice_Over(2230, kActorVoiceOver); - Item_Pickup_Spin_Effect(941, 352, 333); + Item_Pickup_Spin_Effect(kModelAnimationDNADataDisc, 352, 333); Actor_Voice_Over(2240, kActorVoiceOver); Actor_Voice_Over(2250, kActorVoiceOver); Actor_Voice_Over(2260, kActorVoiceOver); @@ -114,7 +114,7 @@ bool SceneScriptTB05::ClickedOn3DObject(const char *objectName, bool a2) { ) { Actor_Clue_Acquire(kActorMcCoy, kClueDNAMarcus, true, -1); Actor_Voice_Over(2230, kActorVoiceOver); - Item_Pickup_Spin_Effect(941, 352, 333); + Item_Pickup_Spin_Effect(kModelAnimationDNADataDisc, 352, 333); Actor_Voice_Over(2240, kActorVoiceOver); Actor_Voice_Over(2250, kActorVoiceOver); Actor_Voice_Over(2260, kActorVoiceOver); @@ -158,14 +158,14 @@ bool SceneScriptTB05::ClickedOnItem(int itemId, bool a2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 107.89f, 147.12f, -156.26f, 0, true, false, 0)) { Actor_Face_Heading(kActorMcCoy, 126, false); Item_Remove_From_World(kItemTyrellSalesPamphlet); - Item_Pickup_Spin_Effect(972, 449, 431); + Item_Pickup_Spin_Effect(kModelAnimationTyrellSalesPamphlet, 449, 431); Actor_Voice_Over(4280, kActorVoiceOver); if (Game_Flag_Query(kFlagGordoIsReplicant)) { Actor_Voice_Over(4290, kActorVoiceOver); - Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSalesPamphlet1, true, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSalesPamphletEntertainModel, true, -1); } else { Actor_Voice_Over(4300, kActorVoiceOver); - Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSalesPamphlet2, true, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSalesPamphletLolita, true, -1); } } } diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp index b9ac39c5e1..0f24e87bc9 100644 --- a/engines/bladerunner/script/scene/tb06.cpp +++ b/engines/bladerunner/script/scene/tb06.cpp @@ -50,17 +50,17 @@ void SceneScriptTB06::SceneLoaded() { if (!Game_Flag_Query(kFlagTB06DogCollarTaken) && Actor_Query_Goal_Number(kActorPhotographer) != 199 ) { - Item_Add_To_World(kItemDogCollar, 942, kSetTB06, 36.54f, 149.48f, -565.67f, 0, 6, 6, false, true, false, true); + Item_Add_To_World(kItemDogCollar, kModelAnimationDogCollar, kSetTB06, 36.54f, 149.48f, -565.67f, 0, 6, 6, false, true, false, true); } if (!Game_Flag_Query(kFlagTB06KitchenBoxTaken)) { - Item_Add_To_World(kItemKitchenBox, 955, kSetTB06, 18.0f, 149.65f, -599.0f, 0, 6, 6, false, true, false, true); + Item_Add_To_World(kItemKitchenBox, kModelAnimationKingstonKitchenBox, kSetTB06, 18.0f, 149.65f, -599.0f, 0, 6, 6, false, true, false, true); } if (Actor_Query_Goal_Number(kActorPhotographer) != 199) { - Item_Add_To_World(kItemDeadDogA, 978, kSetTB06, -46.82f, 149.6f, -666.88f, 0, 12, 12, false, true, false, true); - Item_Add_To_World(kItemDeadDogB, 979, kSetTB06, -30.27f, 149.6f, -610.7f, 0, 15, 45, false, true, false, true); - Item_Add_To_World(kItemDeadDogC, 980, kSetTB06, 9.87f, 149.6f, -683.5f, 0, 12, 12, false, true, false, true); + Item_Add_To_World(kItemDeadDogA, kModelAnimationDeadDogA, kSetTB06, -46.82f, 149.6f, -666.88f, 0, 12, 12, false, true, false, true); + Item_Add_To_World(kItemDeadDogB, kModelAnimationDeadDogB, kSetTB06, -30.27f, 149.6f, -610.7f, 0, 15, 45, false, true, false, true); + Item_Add_To_World(kItemDeadDogC, kModelAnimationDeadDogC, kSetTB06, 9.87f, 149.6f, -683.5f, 0, 12, 12, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp index e3fc30d77c..0faa58d3ed 100644 --- a/engines/bladerunner/script/scene/tb07.cpp +++ b/engines/bladerunner/script/scene/tb07.cpp @@ -49,7 +49,7 @@ void SceneScriptTB07::InitializeScene() { if ( Global_Variable_Query(kVariableChapter) == 4 && !Actor_Clue_Query(kActorMcCoy, kClueDNATyrell) ) { - Item_Add_To_World(kItemDNATyrell, 941, kSetTB07, 9.7f, 48.7f, -174.22f, 0, 12, 12, false, true, false, true); + Item_Add_To_World(kItemDNATyrell, kModelAnimationDNADataDisc, kSetTB07, 9.7f, 48.7f, -174.22f, 0, 12, 12, false, true, false, true); } if (Game_Flag_Query(kFlagTB07ShadeDown)) { Scene_Loop_Set_Default(kTB07LoopMainShadeDown); @@ -79,7 +79,7 @@ bool SceneScriptTB07::ClickedOnItem(int itemId, bool a2) { if (!Loop_Actor_Walk_To_Item(kActorMcCoy, itemId, 36, true, false)) { Actor_Face_Item(kActorMcCoy, itemId, true); if (itemId == kItemDNATyrell) { - Item_Pickup_Spin_Effect(941, 331, 296); + Item_Pickup_Spin_Effect(kModelAnimationDNADataDisc, 331, 296); Actor_Clue_Acquire(kActorMcCoy, kClueDNATyrell, false, -1); } Item_Remove_From_World(itemId); diff --git a/engines/bladerunner/script/scene/ug02.cpp b/engines/bladerunner/script/scene/ug02.cpp index 266eb4b847..67d2d92612 100644 --- a/engines/bladerunner/script/scene/ug02.cpp +++ b/engines/bladerunner/script/scene/ug02.cpp @@ -73,7 +73,7 @@ void SceneScriptUG02::SceneLoaded() { if (!Game_Flag_Query(kFlagUG02RagiationGooglesTaken) && Game_Flag_Query(kFlagIzoIsReplicant) ) { - Item_Add_To_World(kItemRadiationGoogles, 963, kSetUG02, -300.37f, 120.16f, -81.31f, 0, 8, 8, false, true, false, true); + Item_Add_To_World(kItemRadiationGoogles, kModelAnimationRadiationGoggles, kSetUG02, -300.37f, 120.16f, -81.31f, 0, 8, 8, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp index 7d10a9845b..89f2e4b06c 100644 --- a/engines/bladerunner/script/scene/ug13.cpp +++ b/engines/bladerunner/script/scene/ug13.cpp @@ -92,7 +92,7 @@ void SceneScriptUG13::SceneLoaded() { || Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm) ) ) { - Item_Add_To_World(kItemWeaponsOrderForm, 958, 85, -209.01f, 70.76f, -351.79f, 0, 16, 12, false, true, false, true); + Item_Add_To_World(kItemWeaponsOrderForm, kModelAnimationOriginalRequisitionForm, 85, -209.01f, 70.76f, -351.79f, 0, 16, 12, false, true, false, true); } } diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp index a00aae36df..cfa141a7ff 100644 --- a/engines/bladerunner/script/scene/ug16.cpp +++ b/engines/bladerunner/script/scene/ug16.cpp @@ -90,7 +90,7 @@ bool SceneScriptUG16::ClickedOn3DObject(const char *objectName, bool a2) { Actor_Change_Animation_Mode(kActorMcCoy, 38); Sound_Play(kSfxDRAWER1, 100, 0, 0, 50); Delay(1000); - Item_Pickup_Spin_Effect(948, 460, 287); + Item_Pickup_Spin_Effect(kModelAnimationFolder, 460, 287); Actor_Voice_Over(2740, kActorVoiceOver); Actor_Voice_Over(2750, kActorVoiceOver); Actor_Voice_Over(2760, kActorVoiceOver); @@ -120,7 +120,7 @@ bool SceneScriptUG16::ClickedOn3DObject(const char *objectName, bool a2) { Delay(2000); Actor_Says(kActorMcCoy, 5725, 14); Delay(1000); - Item_Pickup_Spin_Effect(941, 418, 305); + Item_Pickup_Spin_Effect(kModelAnimationDNADataDisc, 418, 305); Actor_Clue_Acquire(kActorMcCoy, kClueDNALutherLance, true, -1); return true; } @@ -386,7 +386,7 @@ void SceneScriptUG16::dialogueWithLuther() { Actor_Says(kActorLance, 420, 17); Actor_Says(kActorMcCoy, 5835, 13); Delay(1000); - Item_Pickup_Spin_Effect(948, 239, 454); + Item_Pickup_Spin_Effect(kModelAnimationFolder, 239, 454); Actor_Voice_Over(2740, kActorVoiceOver); Actor_Voice_Over(2750, kActorVoiceOver); Actor_Voice_Over(2760, kActorVoiceOver); diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp index 3b9d7c0d89..3fc49e80da 100644 --- a/engines/bladerunner/script/scene/ug18.cpp +++ b/engines/bladerunner/script/scene/ug18.cpp @@ -90,7 +90,7 @@ void SceneScriptUG18::SceneLoaded() { && !Game_Flag_Query(kFlagUG18GuzzaScene) && Global_Variable_Query(kVariableChapter) == 4 ) { - Item_Add_To_World(kItemBriefcase, 987, kSetUG18, -55.21f, 0.0f, -302.17f, 0, 12, 12, false, true, false, true); + Item_Add_To_World(kItemBriefcase, kModelAnimationBriefcase, kSetUG18, -55.21f, 0.0f, -302.17f, 0, 12, 12, false, true, false, true); } } |