ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

BLADERUNNER: Named constants for model animations P02

Browse Source
This commit is contained in:
Thanasis Antoniou
2019-04-24 15:13:26 +03:00
parent c84943cbc7
commit 0ba4e56168
29 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/bladerunner/game_constants.h
+4 -2
View File
@@ -1759,8 +1759,10 @@ enum GameModelAnimations {
kModelAnimationDNAEvidenceTwoParts = 990,
kModelAnimationDNAEvidenceThreeParts = 991,
// kModelAnimation = 992, // unused?
kModelAnimationDNAEvidenceComplete = 993
// kModelAnimation = 994-996
kModelAnimationDNAEvidenceComplete = 993,
// kModelAnimation = 994, // unused?
kModelAnimationAmmoType01 = 995, // from Bullet Bob's
kModelAnimationAmmoType02 = 996 // from Izo stash (Act 4)
};
enum Elevators {
engines/bladerunner/script/scene/ar02.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ bool SceneScriptAR02::ClickedOnActor(int actorId) {
Actor_Says(kActorInsectDealer, 230, 14);
Actor_Says(kActorMcCoy, 115, 18);
Actor_Says(kActorInsectDealer, 240, 14);
Item_Pickup_Spin_Effect(956, 288, 257);
Item_Pickup_Spin_Effect(kModelAnimationMaggieBracelet, 288, 257);
Actor_Says(kActorInsectDealer, 250, 14);
Player_Gains_Control();
dialogueWithInsectDealer2();
engines/bladerunner/script/scene/ct04.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ bool SceneScriptCT04::ClickedOn3DObject(const char *objectName, bool a2) {
Actor_Face_Heading(kActorMcCoy, 707, false);
Actor_Change_Animation_Mode(kActorMcCoy, 38);
Actor_Clue_Acquire(kActorMcCoy, kClueLicensePlate, true, -1);
Item_Pickup_Spin_Effect(952, 392, 225);
Item_Pickup_Spin_Effect(kModelAnimationLicensePlate, 392, 225);
Game_Flag_Set(kFlagCT04LicensePlaceFound);
return true;
}
engines/bladerunner/script/scene/ct08.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ bool SceneScriptCT08::ClickedOnItem(int itemId, bool a2) {
if (!Loop_Actor_Walk_To_Item(kActorMcCoy, kItemCheese, 36, true, false)) {
if (!Game_Flag_Query(kFlagMcCoyTiedDown)) {
Actor_Clue_Acquire(kActorMcCoy, kClueCheese, true, -1);
Item_Pickup_Spin_Effect(936, 266, 328);
Item_Pickup_Spin_Effect(kModelAnimationCheese, 266, 328);
Item_Remove_From_World(kItemCheese);
Actor_Voice_Over(480, kActorVoiceOver);
Actor_Voice_Over(490, kActorVoiceOver);
engines/bladerunner/script/scene/ct10.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ bool SceneScriptCT10::ClickedOn3DObject(const char *objectName, bool a2) {
Actor_Voice_Over(3700, kActorVoiceOver);
} else {
Actor_Clue_Acquire(kActorMcCoy, kClueStrangeScale1, true, -1);
Item_Pickup_Spin_Effect(969, 364, 214);
Item_Pickup_Spin_Effect(kModelAnimationStrangeScale, 364, 214);
}
Delay(1000);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -41.0f, 0.0f, -82.0f, 0, 0, false, 1);
engines/bladerunner/script/scene/ct11.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ bool SceneScriptCT11::ClickedOn2DRegion(int region) {
Actor_Face_Heading(kActorMcCoy, 47, false);
Item_Remove_From_World(kItemDogWrapper);
Actor_Clue_Acquire(kActorMcCoy, kClueLichenDogWrapper, false, -1);
Item_Pickup_Spin_Effect(951, 510, 319);
Item_Pickup_Spin_Effect(kModelAnimationLichenDogWrapper, 510, 319);
Game_Flag_Reset(kFlagCT11DogWrapperAvailable);
Game_Flag_Set(kFlagCT11DogWrapperTaken);
Actor_Voice_Over(550, kActorVoiceOver);
engines/bladerunner/script/scene/ct51.cpp
+2 -2
View File
@@ -59,7 +59,7 @@ bool SceneScriptCT51::MouseClick(int x, int y) {
bool SceneScriptCT51::ClickedOn3DObject(const char *objectName, bool a2) {
if (Object_Query_Click("BED02", objectName)) {
if (!Actor_Clue_Query(kActorMcCoy, kClueHysteriaToken)) {
Item_Pickup_Spin_Effect(970, 203, 200);
Item_Pickup_Spin_Effect(kModelAnimationHysteriaToken, 203, 200);
Actor_Clue_Acquire(kActorMcCoy, kClueHysteriaToken, true, -1);
Actor_Voice_Over(420, kActorVoiceOver);
return true;
@@ -76,7 +76,7 @@ bool SceneScriptCT51::ClickedOnActor(int actorId) {
bool SceneScriptCT51::ClickedOnItem(int itemId, bool a2) {
if (itemId == kItemRagDoll) {
Actor_Clue_Acquire(kActorMcCoy, kClueRagDoll, true, -1);
Item_Pickup_Spin_Effect(943, 260, 200);
Item_Pickup_Spin_Effect(kModelAnimationRagDoll, 260, 200);
Ambient_Sounds_Play_Sound(kSfxBABYCRY2, 40, 99, 0, 0);
Item_Remove_From_World(kItemRagDoll);
return true;
engines/bladerunner/script/scene/dr06.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
Sound_Play(kSfxCEMENTL1, 100, 0, 0, 50);
if (!Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
Actor_Voice_Over(850, kActorVoiceOver);
Item_Pickup_Spin_Effect(944, 171, 280);
Item_Pickup_Spin_Effect(kModelAnimationEnvelope, 171, 280);
Actor_Voice_Over(860, kActorVoiceOver);
Actor_Voice_Over(870, kActorVoiceOver);
Actor_Voice_Over(880, kActorVoiceOver);
engines/bladerunner/script/scene/hc02.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ bool SceneScriptHC02::ClickedOnActor(int actorId) {
Actor_Says(kActorHawkersBarkeep, 120, 12);
Actor_Says(kActorHawkersBarkeep, 180, 13);
Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityDisc, true, kActorHawkersBarkeep);
Item_Pickup_Spin_Effect(975, 229, 215);
Item_Pickup_Spin_Effect(kModelAnimationVideoDisc, 229, 215);
} else if ( Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview1)
&& !Actor_Clue_Query(kActorMcCoy, kClueFlaskOfAbsinthe)
&& (Global_Variable_Query(kVariableChinyen) > 20
@@ -124,7 +124,7 @@ bool SceneScriptHC02::ClickedOnActor(int actorId) {
Actor_Says(kActorHawkersBarkeep, 30, 15);
Actor_Says(kActorMcCoy, 1240, 13);
Actor_Says(kActorHawkersBarkeep, 40, 14);
Item_Pickup_Spin_Effect(945, 229, 215);
Item_Pickup_Spin_Effect(kModelAnimationFlaskOfAbsinthe, 229, 215);
Actor_Set_Goal_Number(kActorHawkersBarkeep, 2);
Actor_Change_Animation_Mode(kActorMcCoy, 23);
Delay(1500);
engines/bladerunner/script/scene/hf01.cpp
+1 -1
View File
@@ -123,7 +123,7 @@ bool SceneScriptHF01::ClickedOnActor(int actorId) {
Actor_Says(kActorMurray, 40, 13);
Actor_Says(kActorMcCoy, 1460, 13);
Actor_Says(kActorMurray, 50, 12);
Item_Pickup_Spin_Effect(951, 396, 359);
Item_Pickup_Spin_Effect(kModelAnimationLichenDogWrapper, 396, 359);
Actor_Face_Heading(kActorMurray, 271, false);
Actor_Says(kActorMurray, 60, 12);
Actor_Says(kActorMcCoy, 1465, 15);
engines/bladerunner/script/scene/hf05.cpp
+2 -2
View File
@@ -547,7 +547,7 @@ void SceneScriptHF05::dialogueWithCrazylegs2() { // cut feature? it is impossibl
if (answer == 1250) { // ARREST
Actor_Says(kActorMcCoy, 1955, 17);
Actor_Says(kActorMcCoy, 1960, 23);
Item_Pickup_Spin_Effect(986, 315, 327);
Item_Pickup_Spin_Effect(kModelAnimationSpinnerKeys, 315, 327);
Delay(2000);
Actor_Says(kActorMcCoy, 1980, 23);
Actor_Says(kActorMcCoy, 1985, kAnimationModeTalk);
@@ -661,7 +661,7 @@ void SceneScriptHF05::talkWithCrazylegs3(int affectionTowardsActor) {
Actor_Says(kActorCrazylegs, 70, 13);
Actor_Says(kActorMcCoy, 1730, kAnimationModeTalk);
Loop_Actor_Walk_To_Actor(kActorCrazylegs, kActorMcCoy, 28, false, false);
Item_Pickup_Spin_Effect(986, 315, 327);
Item_Pickup_Spin_Effect(kModelAnimationSpinnerKeys, 315, 327);
Actor_Says(kActorCrazylegs, 80, 23);
Actor_Clue_Acquire(kActorMcCoy, kClueSpinnerKeys, true, kActorCrazylegs);
Actor_Says(kActorCrazylegs, 90, 15);
engines/bladerunner/script/scene/hf06.cpp
+1 -1
View File
@@ -188,7 +188,7 @@ void SceneScriptHF06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
Actor_Voice_Over(1000, kActorVoiceOver);
Actor_Voice_Over(1010, kActorVoiceOver);
Loop_Actor_Walk_To_Actor(kActorMcCoy, otherActorId, 24, false, false);
Item_Pickup_Spin_Effect(932, 355, 200);
Item_Pickup_Spin_Effect(kModelAnimationBomb, 355, 200);
Actor_Voice_Over(1020, kActorVoiceOver);
Actor_Voice_Over(1030, kActorVoiceOver);
Actor_Voice_Over(1040, kActorVoiceOver);
engines/bladerunner/script/scene/kp05.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ bool SceneScriptKP05::ClickedOnItem(int itemId, bool a2) {
Actor_Face_Item(kActorMcCoy, kItemPowerSource, true);
Actor_Clue_Acquire(kActorMcCoy, kCluePowerSource, true, -1);
Item_Remove_From_World(kItemPowerSource);
Item_Pickup_Spin_Effect(960, 58, 321);
Item_Pickup_Spin_Effect(kModelAnimationPowerSource, 58, 321);
}
}
return false;
engines/bladerunner/script/scene/ma02.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ bool SceneScriptMA02::ClickedOn3DObject(const char *objectName, bool a2) {
&& !Actor_Clue_Query(kActorMcCoy, kClueCrystalsCigarette)
) {
Overlay_Remove("MA02OVER");
Item_Pickup_Spin_Effect(985, 480, 240);
Item_Pickup_Spin_Effect(kModelAnimationCrystalsCigarette, 480, 240);
Actor_Voice_Over(1150, kActorVoiceOver);
Actor_Voice_Over(1160, kActorVoiceOver);
Actor_Voice_Over(1170, kActorVoiceOver);
engines/bladerunner/script/scene/nr02.cpp
+2 -2
View File
@@ -122,13 +122,13 @@ bool SceneScriptNR02::ClickedOnItem(int itemId, bool a2) {
Actor_Face_Heading(kActorMcCoy, 423, false);
if (itemId == kItemGordosLighterReplicant) {
Item_Remove_From_World(kItemGordosLighterReplicant);
Item_Pickup_Spin_Effect(953, 214, 380);
Item_Pickup_Spin_Effect(kModelAnimationGordosLighterReplicant, 214, 380);
Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighterReplicant, true, -1);
}
if (itemId == kItemGordosLighterHuman) {
Item_Remove_From_World(kItemGordosLighterHuman);
Item_Pickup_Spin_Effect(954, 214, 380);
Item_Pickup_Spin_Effect(kModelAnimationGordosLighterHuman, 214, 380);
Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighterHuman, true, -1);
}
}
engines/bladerunner/script/scene/nr04.cpp
+2 -2
View File
@@ -95,7 +95,7 @@ bool SceneScriptNR04::ClickedOn3DObject(const char *objectName, bool a2) {
Actor_Voice_Over(1610, kActorVoiceOver);
} else if (!Actor_Clue_Query(kActorMcCoy, kClueCollectionReceipt)) {
Actor_Clue_Acquire(kActorMcCoy, kClueCollectionReceipt, false, -1);
Item_Pickup_Spin_Effect(961, 247, 141);
Item_Pickup_Spin_Effect(kModelAnimationCollectionReceipt, 247, 141);
Actor_Voice_Over(1560, kActorVoiceOver);
Actor_Voice_Over(1570, kActorVoiceOver);
Actor_Voice_Over(1580, kActorVoiceOver);
@@ -122,7 +122,7 @@ bool SceneScriptNR04::ClickedOn3DObject(const char *objectName, bool a2) {
Player_Loses_Control();
Game_Flag_Set(kFlagNR04DiscFound);
Actor_Face_Object(kActorMcCoy, "TORUS01", true);
Item_Pickup_Spin_Effect(975, 358, 160);
Item_Pickup_Spin_Effect(kModelAnimationVideoDisc, 358, 160);
Actor_Voice_Over(1620, kActorVoiceOver);
Actor_Voice_Over(1630, kActorVoiceOver);
Actor_Clue_Acquire(kActorMcCoy, kClueEarlyQsClub, false, -1);
engines/bladerunner/script/scene/nr07.cpp
+1 -1
View File
@@ -267,7 +267,7 @@ void SceneScriptNR07::clickedOnVase() {
Actor_Clue_Acquire(kActorMcCoy, kClueDektorasCard, true, -1);
Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "VASE", 100, true, false);
Actor_Change_Animation_Mode(kActorMcCoy, 23);
Item_Pickup_Spin_Effect(935, 526, 268);
Item_Pickup_Spin_Effect(kModelAnimationDektorasCard, 526, 268);
Actor_Voice_Over(1690, kActorVoiceOver);
Actor_Voice_Over(1700, kActorVoiceOver);
} else {
engines/bladerunner/script/scene/ps04.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ bool SceneScriptPS04::ClickedOnItem(int itemId, bool a2) {
Actor_Says(kActorGuzza, 560, 30);
} else if (!Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm)) {
Item_Remove_From_World(kItemWeaponsOrderForm);
Item_Pickup_Spin_Effect(958, 464, 362);
Item_Pickup_Spin_Effect(kModelAnimationOriginalRequisitionForm, 464, 362);
Actor_Says(kActorMcCoy, 4485, kAnimationModeTalk);
Actor_Clue_Acquire(kActorMcCoy, kClueWeaponsOrderForm, true, kActorMcCoy);
}
engines/bladerunner/script/scene/ps15.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ bool SceneScriptPS15::ClickedOnActor(int actorId) {
Actor_Says(kActorMcCoy, 4475, 18);
Actor_Says(kActorMcCoy, 4480, 13);
Actor_Says(kActorSergeantWalls, 140, 16);
Item_Pickup_Spin_Effect(965, 211, 239);
Item_Pickup_Spin_Effect(kModelAnimationWeaponsOrderForm, 211, 239);
Actor_Says(kActorSergeantWalls, 150, 14);
Actor_Clue_Acquire(kActorMcCoy, kClueShippingForm, true, kActorSergeantWalls);
if (!Game_Flag_Query(kFlagPS04WeaponsOrderForm)) {
engines/bladerunner/script/scene/rc01.cpp
+1 -1
View File
@@ -390,7 +390,7 @@ bool SceneScriptRC01::ClickedOnItem(int itemId, bool a2) {
Actor_Says(kActorOfficerLeary, 20, 12);
Game_Flag_Set(kFlagRC01ChromeDebrisTaken);
Item_Remove_From_World(kItemChromeDebris);
Item_Pickup_Spin_Effect(938, 426, 316);
Item_Pickup_Spin_Effect(kModelAnimationChromeDebris, 426, 316);
I_Sez("JM: Chrome...is that what that is?");
Actor_Says(kActorMcCoy, 4505, 13);
ADQ_Flush();
engines/bladerunner/script/scene/rc02.cpp
+6 -6
View File
@@ -118,7 +118,7 @@ bool SceneScriptRC02::ClickedOn3DObject(const char *objectName, bool a2) {
Delay(2000);
Loop_Actor_Walk_To_Waypoint(kActorRunciter, 89, 0, 0, false);
Loop_Actor_Walk_To_Actor(kActorRunciter, kActorMcCoy, 24, 0, false);
Item_Pickup_Spin_Effect(975, 357, 228);
Item_Pickup_Spin_Effect(kModelAnimationVideoDisc, 357, 228);
Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
Actor_Says(kActorRunciter, 30, 23);
@@ -138,14 +138,14 @@ bool SceneScriptRC02::ClickedOn3DObject(const char *objectName, bool a2) {
void SceneScriptRC02::dialogueWithRunciter() {
Dialogue_Menu_Clear_List();
DM_Add_To_List_Never_Repeat_Once_Selected( 0, 5, 6, 2); // MOTIVES
DM_Add_To_List_Never_Repeat_Once_Selected(10, 5, 4, 8); // LUCY
DM_Add_To_List_Never_Repeat_Once_Selected( 0, 5, 6, 2); // MOTIVES
DM_Add_To_List_Never_Repeat_Once_Selected(10, 5, 4, 8); // LUCY
if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB1)
|| Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB2)
) {
DM_Add_To_List_Never_Repeat_Once_Selected(20, 6, 4, 5); // REFERENCE
}
Dialogue_Menu_Add_DONE_To_List(30); // DONE
Dialogue_Menu_Add_DONE_To_List(30); // DONE
Dialogue_Menu_Appear(320, 240);
int answer = Dialogue_Menu_Query_Input();
@@ -202,7 +202,7 @@ void SceneScriptRC02::dialogueWithRunciter() {
Loop_Actor_Walk_To_Actor(kActorRunciter, kActorMcCoy, 24, false, false);
Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
Item_Pickup_Spin_Effect(964, 357, 228);
Item_Pickup_Spin_Effect(kModelAnimationReferenceLetter, 357, 228);
Actor_Says(kActorRunciter, 1700, 13);
Actor_Clue_Acquire(kActorMcCoy, kClueReferenceLetter, true, kActorRunciter);
break;
@@ -330,7 +330,7 @@ bool SceneScriptRC02::ClickedOnItem(int itemId, bool a2) {
Item_Remove_From_World(kItemShellCasingA);
Item_Remove_From_World(kItemShellCasingB);
Item_Remove_From_World(kItemShellCasingC);
Item_Pickup_Spin_Effect(966, 395, 352);
Item_Pickup_Spin_Effect(kModelAnimationShellCasings, 395, 352);
Actor_Voice_Over(1960, kActorVoiceOver);
}
return true;
engines/bladerunner/script/scene/rc04.cpp
+1 -1
View File
@@ -265,7 +265,7 @@ void SceneScriptRC04::dialogueWithBulletBob() {
if (Query_Difficulty_Level() != kGameDifficultyEasy) {
Global_Variable_Decrement(kVariableChinyen, 40);
}
Item_Pickup_Spin_Effect(995, 405, 192);
Item_Pickup_Spin_Effect(kModelAnimationAmmoType01, 405, 192);
Give_McCoy_Ammo(1, 24);
} else {
Actor_Says(kActorMcCoy, 125, 13);
engines/bladerunner/script/scene/rc51.cpp
+2 -2
View File
@@ -81,7 +81,7 @@ bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) {
Actor_Face_Item(kActorMcCoy, kItemChopstickWrapper, true);
Actor_Clue_Acquire(kActorMcCoy, kClueChopstickWrapper, true, -1);
Item_Remove_From_World(kItemChopstickWrapper);
Item_Pickup_Spin_Effect(937, 437, 407);
Item_Pickup_Spin_Effect(kModelAnimationChopstickWrapper, 437, 407);
Actor_Voice_Over(2010, kActorVoiceOver);
Game_Flag_Set(kFlagRC51ChopstickWrapperTaken);
return true;
@@ -106,7 +106,7 @@ bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) {
Actor_Face_Item(kActorMcCoy, kItemToyDog, true);
Actor_Clue_Acquire(kActorMcCoy, kClueToyDog, true, -1);
Item_Remove_From_World(kItemToyDog);
Item_Pickup_Spin_Effect(971, 55, 376);
Item_Pickup_Spin_Effect(kModelAnimationToyDog, 55, 376);
Actor_Says(kActorMcCoy, 8525, 3);
Actor_Says(kActorMcCoy, 8740, 3);
Game_Flag_Set(kFlagRC51ToyDogTaken);
engines/bladerunner/script/scene/tb02.cpp
+1 -1
View File
@@ -321,7 +321,7 @@ void SceneScriptTB02::PlayerWalkedIn() {
Actor_Says(kActorTyrellGuard, 0, 50);
Actor_Says(kActorMcCoy, 5130, 13);
Actor_Says(kActorTyrellGuard, 10, 15);
Item_Pickup_Spin_Effect(975, 351, 315);
Item_Pickup_Spin_Effect(kModelAnimationVideoDisc, 351, 315);
Actor_Says(kActorTyrellGuard, 20, 23);
Actor_Says(kActorMcCoy, 5140, 17);
Actor_Says(kActorTyrellGuard, 30, 14);
engines/bladerunner/script/scene/tb05.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ bool SceneScriptTB05::ClickedOnItem(int itemId, bool a2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 54.0f, 147.12f, -209.0f, 0, true, false, 0)) {
Actor_Face_Heading(kActorMcCoy, 126, false);
Item_Remove_From_World(kItemDragonflyEarring);
Item_Pickup_Spin_Effect(940, 295, 408);
Item_Pickup_Spin_Effect(kModelAnimationDragonflyEarring, 295, 408);
Actor_Voice_Over(2140, kActorVoiceOver);
Actor_Voice_Over(2150, kActorVoiceOver);
Actor_Voice_Over(2160, kActorVoiceOver);
engines/bladerunner/script/scene/tb06.cpp
+3 -3
View File
@@ -78,7 +78,7 @@ bool SceneScriptTB06::ClickedOnActor(int actorId) {
if (!Actor_Clue_Query(kActorMcCoy, kClueDetonatorWire)) {
Actor_Voice_Over(2300, kActorVoiceOver);
Actor_Voice_Over(2310, kActorVoiceOver);
Item_Pickup_Spin_Effect(974, 66, 397);
Item_Pickup_Spin_Effect(kModelAnimationDetonatorWire, 66, 397);
Actor_Voice_Over(2320, kActorVoiceOver);
if (Game_Flag_Query(kFlagSadikIsReplicant)) {
Actor_Voice_Over(2330, kActorVoiceOver);
@@ -100,7 +100,7 @@ bool SceneScriptTB06::ClickedOnItem(int itemId, bool a2) {
if (!Loop_Actor_Walk_To_Item(kActorMcCoy, kItemDogCollar, 12, true, false)) {
Actor_Face_Item(kActorMcCoy, kItemDogCollar, true);
Actor_Clue_Acquire(kActorMcCoy, kClueDogCollar1, true, -1);
Item_Pickup_Spin_Effect(942, 341, 368);
Item_Pickup_Spin_Effect(kModelAnimationDogCollar, 341, 368);
Item_Remove_From_World(kItemDogCollar);
Actor_Voice_Over(4160, kActorVoiceOver);
Game_Flag_Set(kFlagTB06DogCollarTaken);
@@ -112,7 +112,7 @@ bool SceneScriptTB06::ClickedOnItem(int itemId, bool a2) {
Actor_Face_Item(kActorMcCoy, kItemKitchenBox, true);
Actor_Clue_Acquire(kActorMcCoy, kClueKingstonKitchenBox1, true, -1);
Item_Remove_From_World(kItemKitchenBox);
Item_Pickup_Spin_Effect(955, 390, 368);
Item_Pickup_Spin_Effect(kModelAnimationKingstonKitchenBox, 390, 368);
Actor_Says(kActorMcCoy, 8775, kAnimationModeTalk);
Game_Flag_Set(kFlagTB06KitchenBoxTaken);
return true;
engines/bladerunner/script/scene/ug02.cpp
+2 -2
View File
@@ -139,7 +139,7 @@ bool SceneScriptUG02::ClickedOn3DObject(const char *objectName, bool a2) {
//Actor_Voice_Over(2530, kActorVoiceOver); // But there was no way to tell what was missing without Izo standing there checking his inventory.
#endif // BLADERUNNER_ORIGINAL_BUGS
} else if (!Game_Flag_Query(kFlagUG02AmmoTaken)) {
Item_Pickup_Spin_Effect(996, 360, 440);
Item_Pickup_Spin_Effect(kModelAnimationAmmoType02, 360, 440);
Actor_Says(kActorMcCoy, 8525, 14);
Give_McCoy_Ammo(2, 18);
Game_Flag_Set(kFlagUG02AmmoTaken);
@@ -164,7 +164,7 @@ bool SceneScriptUG02::ClickedOnItem(int itemId, bool a2) {
Actor_Clue_Acquire(kActorMcCoy, kClueRadiationGoggles, true, -1);
Game_Flag_Set(kFlagUG02RagiationGooglesTaken);
Item_Remove_From_World(kItemRadiationGoogles);
Item_Pickup_Spin_Effect(963, 426, 316);
Item_Pickup_Spin_Effect(kModelAnimationRadiationGoggles, 426, 316);
return true;
}
return false;
engines/bladerunner/script/scene/ug13.cpp
+2 -2
View File
@@ -177,7 +177,7 @@ bool SceneScriptUG13::ClickedOnItem(int itemId, bool a2) {
Actor_Face_Item(kActorMcCoy, kItemWeaponsOrderForm, true);
Actor_Clue_Acquire(kActorMcCoy, kClueOriginalRequisitionForm, true, -1);
Item_Remove_From_World(kItemWeaponsOrderForm);
Item_Pickup_Spin_Effect(958, 426, 316);
Item_Pickup_Spin_Effect(kModelAnimationOriginalRequisitionForm, 426, 316);
Actor_Voice_Over(3950, kActorVoiceOver);
Actor_Voice_Over(3960, kActorVoiceOver);
Actor_Voice_Over(3970, kActorVoiceOver);
@@ -385,7 +385,7 @@ void SceneScriptUG13::dialogueWithHomeless1() {
case 1350: // GIVE FLASK
Actor_Clue_Acquire(kActorTransient, kClueFlaskOfAbsinthe, false, kActorMcCoy);
Actor_Says_With_Pause(kActorMcCoy, 5595, 1.0f, 23);
Item_Pickup_Spin_Effect(945, 193, 325);
Item_Pickup_Spin_Effect(kModelAnimationFlaskOfAbsinthe, 193, 325);
Actor_Says(kActorTransient, 290, 33);
Actor_Says(kActorMcCoy, 5660, 13);
Actor_Clue_Lose(kActorMcCoy, kClueFlaskOfAbsinthe);
engines/bladerunner/script/scene/ug18.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ bool SceneScriptUG18::ClickedOnItem(int itemId, bool combatMode) {
if (combatMode) {
Item_Remove_From_World(kItemBriefcase);
} else if (!Loop_Actor_Walk_To_Item(kActorMcCoy, kItemBriefcase, 12, true, false)) {
Item_Pickup_Spin_Effect(987, 368, 243);
Item_Pickup_Spin_Effect(kModelAnimationBriefcase, 368, 243);
Item_Remove_From_World(itemId);
Game_Flag_Set(kFlagUG18BriefcaseTaken);
Actor_Clue_Acquire(kActorMcCoy, kClueBriefcase, true, kActorGuzza);