aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/script/scene
diff options
context:
space:
mode:
Diffstat (limited to 'engines/bladerunner/script/scene')
-rw-r--r--engines/bladerunner/script/scene/hf01.cpp8
-rw-r--r--engines/bladerunner/script/scene/hf02.cpp2
-rw-r--r--engines/bladerunner/script/scene/hf05.cpp10
-rw-r--r--engines/bladerunner/script/scene/hf06.cpp16
-rw-r--r--engines/bladerunner/script/scene/hf07.cpp4
-rw-r--r--engines/bladerunner/script/scene/kp07.cpp8
-rw-r--r--engines/bladerunner/script/scene/ma04.cpp2
-rw-r--r--engines/bladerunner/script/scene/nr01.cpp2
-rw-r--r--engines/bladerunner/script/scene/nr08.cpp2
-rw-r--r--engines/bladerunner/script/scene/nr10.cpp4
-rw-r--r--engines/bladerunner/script/scene/nr11.cpp22
-rw-r--r--engines/bladerunner/script/scene/ps04.cpp2
-rw-r--r--engines/bladerunner/script/scene/ug05.cpp4
13 files changed, 43 insertions, 43 deletions
diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp
index b466794b20..c0e5530e69 100644
--- a/engines/bladerunner/script/scene/hf01.cpp
+++ b/engines/bladerunner/script/scene/hf01.cpp
@@ -344,14 +344,14 @@ void SceneScriptHF01::PlayerWalkedIn() {
) {
if (Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy1)
&& Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
Actor_Put_In_Set(kActorLucy, kSetHF01);
Actor_Set_At_XYZ(kActorLucy, -5.0f, 8.0f, -622.0f, 419);
Actor_Set_Targetable(kActorLucy, true);
} else if (Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora1)
&& Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsDektora
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
Actor_Put_In_Set(kActorDektora, kSetHF01);
Actor_Set_At_XYZ(kActorDektora, -5.0f, 8.0f, -622.0f, 419);
@@ -421,13 +421,13 @@ void SceneScriptHF01::PlayerWalkedOut() {
if (Actor_Query_Goal_Number(kActorLucy) == 450) {
Actor_Put_In_Set(kActorLucy, kSetFreeSlotG);
Actor_Set_At_Waypoint(kActorLucy, 39, 0);
- Actor_Set_Goal_Number(kActorLucy, kGoalLucyDead);
+ Actor_Set_Goal_Number(kActorLucy, kGoalLucyGone);
}
if (Actor_Query_Goal_Number(kActorDektora) == 450) {
Actor_Put_In_Set(kActorDektora, kSetFreeSlotG);
Actor_Set_At_Waypoint(kActorDektora, 39, 0);
- Actor_Set_Goal_Number(kActorDektora, kGoalDektoraDead);
+ Actor_Set_Goal_Number(kActorDektora, kGoalDektoraGone);
}
}
diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp
index c3d3b5a0a2..a4be7591e8 100644
--- a/engines/bladerunner/script/scene/hf02.cpp
+++ b/engines/bladerunner/script/scene/hf02.cpp
@@ -132,7 +132,7 @@ void SceneScriptHF02::PlayerWalkedIn() {
}
if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleHF02LucyRanAway) {
- if (Actor_Query_Goal_Number(kActorLucy) == kGoalLucyDead) {
+ if (Actor_Query_Goal_Number(kActorLucy) == kGoalLucyGone) {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyShotByMcCoy);
} else {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyLostByMcCoy);
diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index 3f94212b59..e5afa3c98b 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -384,7 +384,7 @@ void SceneScriptHF05::dialogueWithCrazylegs1() {
DM_Add_To_List_Never_Repeat_Once_Selected(1200, 5, 5, 3); // WOMAN'S PHOTO
}
if (Actor_Clue_Query(kActorMcCoy, kClueLucy)
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
DM_Add_To_List_Never_Repeat_Once_Selected(1210, 4, 6, 2); // LUCY'S PHOTO
}
@@ -560,12 +560,12 @@ void SceneScriptHF05::dialogueWithCrazylegs2() { // cut feature? it is impossibl
int SceneScriptHF05::getAffectionTowardsActor() {
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsDektora
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
return kActorDektora;
}
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
return kActorLucy;
}
@@ -744,13 +744,13 @@ void SceneScriptHF05::addAmbientSounds() {
int SceneScriptHF05::sub_4048C0() {
if (Actor_Query_In_Set(kActorDektora, kSetHF05)
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
return kActorDektora;
}
if (Actor_Query_In_Set(kActorLucy, kSetHF05)
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
return kActorLucy;
}
diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp
index c89d82bcd7..83d96a5d3f 100644
--- a/engines/bladerunner/script/scene/hf06.cpp
+++ b/engines/bladerunner/script/scene/hf06.cpp
@@ -71,13 +71,13 @@ bool SceneScriptHF06::ClickedOn3DObject(const char *objectName, bool a2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 14.33f, 367.93f, 399.0f, 0, true, false, 0)) {
Actor_Face_Heading(kActorMcCoy, 486, true);
if (Actor_Query_In_Set(kActorDektora, kSetHF06)
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
Actor_Says(kActorDektora, 210, 12);
Actor_Says(kActorMcCoy, 2125, 12);
} else if (Actor_Query_In_Set(kActorLucy, kSetHF06)
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
Actor_Face_Actor(kActorLucy, kActorMcCoy, true);
Actor_Says(kActorLucy, 490, 18);
@@ -111,7 +111,7 @@ bool SceneScriptHF06::ClickedOn3DObject(const char *objectName, bool a2) {
bool SceneScriptHF06::ClickedOnActor(int actorId) {
if (actorId == kActorLucy
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
Actor_Face_Actor(kActorLucy, kActorMcCoy, true);
Actor_Face_Actor(kActorMcCoy, kActorLucy, true);
@@ -120,7 +120,7 @@ bool SceneScriptHF06::ClickedOnActor(int actorId) {
Actor_Says(kActorMcCoy, 2115, 17);
}
} else if (actorId == kActorDektora
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
@@ -171,11 +171,11 @@ void SceneScriptHF06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
int otherActorId = -1;
if (Actor_Query_In_Set(kActorDektora, kSetHF06)
- && Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraGone
) {
otherActorId = kActorDektora;
} else if (Actor_Query_In_Set(kActorLucy, kSetHF06)
- && Actor_Query_Goal_Number(kActorLucy) == kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) == kGoalLucyGone
) {
otherActorId = kActorLucy;
}
@@ -211,11 +211,11 @@ void SceneScriptHF06::PlayerWalkedIn() {
if (Game_Flag_Query(662)) {
int actorId = -1;
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
actorId = kActorLucy;
} else if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsDektora
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
actorId = kActorDektora;
}
diff --git a/engines/bladerunner/script/scene/hf07.cpp b/engines/bladerunner/script/scene/hf07.cpp
index 12593ed4ba..11593fb7d4 100644
--- a/engines/bladerunner/script/scene/hf07.cpp
+++ b/engines/bladerunner/script/scene/hf07.cpp
@@ -143,12 +143,12 @@ void SceneScriptHF07::DialogueQueueFlushed(int a1) {
int SceneScriptHF07::getAffectionTowardsActor() {
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsDektora
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
return kActorDektora;
}
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
return kActorLucy;
}
diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp
index 972a18b7d4..486120f0ea 100644
--- a/engines/bladerunner/script/scene/kp07.cpp
+++ b/engines/bladerunner/script/scene/kp07.cpp
@@ -30,7 +30,7 @@ void SceneScriptKP07::InitializeScene() {
Scene_Exit_Add_2D_Exit(0, 315, 185, 381, 285, 0);
if (Game_Flag_Query(653)) {
if (Game_Flag_Query(kFlagDektoraIsReplicant)
- && Actor_Query_Goal_Number(kActorDektora) < kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) < kGoalDektoraGone
) {
Actor_Set_Targetable(kActorDektora, true);
Global_Variable_Increment(kVariableReplicants, 1);
@@ -38,7 +38,7 @@ void SceneScriptKP07::InitializeScene() {
Actor_Set_At_XYZ(kActorDektora, -52.0f, -41.52f, -5.0f, 289);
}
- if (Actor_Query_Goal_Number(kActorZuben) < kGoalZubenDead) {
+ if (Actor_Query_Goal_Number(kActorZuben) < kGoalZubenGone) {
Global_Variable_Increment(kVariableReplicants, 1);
Actor_Set_Targetable(kActorZuben, true);
Actor_Put_In_Set(kActorZuben, kSetKP07);
@@ -55,7 +55,7 @@ void SceneScriptKP07::InitializeScene() {
}
if (Game_Flag_Query(kFlagGordoIsReplicant)
- && Actor_Query_Goal_Number(kActorGordo) < kGoalGordoDead
+ && Actor_Query_Goal_Number(kActorGordo) < kGoalGordoGone
) {
Global_Variable_Increment(kVariableReplicants, 1);
Actor_Set_Targetable(kActorGordo, true);
@@ -64,7 +64,7 @@ void SceneScriptKP07::InitializeScene() {
}
if (Game_Flag_Query(kFlagLucyIsReplicant)
- && Actor_Query_Goal_Number(kActorLucy) < kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) < kGoalLucyGone
) {
Global_Variable_Increment(kVariableReplicants, 1);
Actor_Put_In_Set(kActorLucy, kSetKP07);
diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp
index 6ebdae5bb1..c3c26f6166 100644
--- a/engines/bladerunner/script/scene/ma04.cpp
+++ b/engines/bladerunner/script/scene/ma04.cpp
@@ -564,7 +564,7 @@ void SceneScriptMA04::sleep() {
Player_Loses_Control();
Game_Flag_Set(kFlagMA04McCoySleeping);
if ((Game_Flag_Query(kFlagZubenRetired) || Game_Flag_Query(kFlagZubenSpared)) && Global_Variable_Query(kVariableChapter) == 1) {
- if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead) {
+ if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenGone) {
Actor_Put_In_Set(kActorZuben, kSetFreeSlotA);
Actor_Set_At_Waypoint(kActorZuben, 33, 0);
}
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp
index 6c619aca3e..b7548d228a 100644
--- a/engines/bladerunner/script/scene/nr01.cpp
+++ b/engines/bladerunner/script/scene/nr01.cpp
@@ -106,7 +106,7 @@ void SceneScriptNR01::SceneLoaded() {
bool SceneScriptNR01::MouseClick(int x, int y) {
if (Actor_Query_Goal_Number(kActorMcCoy) == kGoalMcCoyNR01LayDrugged) {
- Global_Variable_Increment(47, 4);
+ Global_Variable_Increment(kVariableNR01GetUpCounter, 4);
return true;
}
return false;
diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp
index 7070e4d190..b2f62f7461 100644
--- a/engines/bladerunner/script/scene/nr08.cpp
+++ b/engines/bladerunner/script/scene/nr08.cpp
@@ -221,7 +221,7 @@ void SceneScriptNR08::PlayerWalkedIn() {
Actor_Says(kActorSteele, 1670, 13);
Actor_Says(kActorSteele, 1680, 14);
Actor_Says(kActorSteele, 1690, 15);
- Actor_Set_Goal_Number(kActorSteele, 235);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR08WalkOut);
return; // true;
}
diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp
index 3f745bbe8c..6031952f27 100644
--- a/engines/bladerunner/script/scene/nr10.cpp
+++ b/engines/bladerunner/script/scene/nr10.cpp
@@ -155,7 +155,7 @@ void SceneScriptNR10::PlayerWalkedIn() {
return;
}
- if (Actor_Query_Goal_Number(kActorSteele) == 236) {
+ if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleNR10Wait) {
Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 150, 13);
Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
@@ -165,7 +165,7 @@ void SceneScriptNR10::PlayerWalkedIn() {
Actor_Says(kActorSteele, 1160, 16);
Delay(1000);
Actor_Says(kActorSteele, 1290, 14);
- Actor_Set_Goal_Number(kActorSteele, 275);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNRxxGoToSpinner);
}
// return false;
}
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index d0d3ff1867..447dfda1ab 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -139,7 +139,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
|| Object_Query_Click("BUST BUST", objectName)
) {
if (combatMode) {
- Actor_Set_Goal_Number(kActorSteele, 211);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR11StopWaiting);
Scene_Exits_Disable();
untargetEverything();
Player_Loses_Control();
@@ -153,7 +153,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 24.0f, 0.33f, 0.0f, 0, true, false, 0)) {
Actor_Face_XYZ(kActorMcCoy, -180.0f, 0.0f, -170.0f, true);
untargetEverything();
- Actor_Set_Goal_Number(kActorSteele, 211);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR11StopWaiting);
if (Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy) < 30) {
Actor_Set_At_XYZ(kActorDektora, 0.5f, 0.33f, -162.0f, 0);
Loop_Actor_Walk_To_XYZ(kActorDektora, -24.0f, 0.33f, -35.4f, 0, false, true, 0);
@@ -209,7 +209,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
Music_Stop(4);
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11WalkAway);
if (Global_Variable_Query(kVariableHollowayArrest) == 1) {
- Actor_Set_Goal_Number(kActorSteele, 236);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR10Wait);
}
Game_Flag_Set(kFlagDektoraRanAway);
}
@@ -310,14 +310,14 @@ void SceneScriptNR11::SceneFrameAdvanced(int frame) {
return;
}
actorSweepArea(kActorMcCoy, frame);
- if (Actor_Query_Goal_Number(kActorSteele) == 215) {
+ if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleNR11Shoot) {
actorSweepArea(kActorSteele, frame);
}
if (frame == 120) {
Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyDefault);
Player_Gains_Control();
- if (Actor_Query_Goal_Number(kActorSteele) == 215) {
- Actor_Set_Goal_Number(kActorSteele, 216);
+ if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleNR11Shoot) {
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR11StopShooting);
}
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11PrepareBurning);
}
@@ -332,7 +332,7 @@ void SceneScriptNR11::PlayerWalkedIn() {
if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR11Hiding) {
Player_Set_Combat_Mode(true);
if (Game_Flag_Query(kFlagDektoraIsReplicant)) {
- Actor_Set_Goal_Number(kActorSteele, 210);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR11StartWaiting);
}
}
@@ -345,14 +345,14 @@ void SceneScriptNR11::PlayerWalkedIn() {
Player_Set_Combat_Mode(false);
Player_Gains_Control();
if (Game_Flag_Query(kFlagDektoraIsReplicant)) {
- if (Actor_Query_Goal_Number(kActorSteele) == 211) {
+ if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleNR11StopWaiting) {
Actor_Set_At_XYZ(kActorMcCoy, -37.41f, 0.33f, -86.0f, 26);
Delay(500);
Actor_Face_Current_Camera(kActorMcCoy, true);
Delay(750);
Actor_Says(kActorMcCoy, 5290, 12);
Delay(1000);
- Actor_Set_Goal_Number(kActorSteele, 212);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR11Enter);
Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
} else {
Actor_Set_At_XYZ(kActorMcCoy, -15.53f, 0.33f, 73.49f, 954);
@@ -365,10 +365,10 @@ void SceneScriptNR11::PlayerWalkedIn() {
Actor_Says(kActorMcCoy, 3810, 16);
Actor_Says_With_Pause(kActorSteele, 1730, 0.2f, 14);
Actor_Says(kActorSteele, 1740, 15);
- Actor_Set_Goal_Number(kActorDektora, kGoalDektoraDead);
+ Actor_Set_Goal_Number(kActorDektora, kGoalDektoraGone);
Actor_Put_In_Set(kActorDektora, kSetFreeSlotI);
Actor_Set_At_Waypoint(kActorDektora, 41, 0);
- Actor_Set_Goal_Number(kActorSteele, 275);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNRxxGoToSpinner);
}
} else {
Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyArrested);
diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp
index d5eda1f971..10f26d23f4 100644
--- a/engines/bladerunner/script/scene/ps04.cpp
+++ b/engines/bladerunner/script/scene/ps04.cpp
@@ -186,7 +186,7 @@ void SceneScriptPS04::dialogueWithGuzza() {
Actor_Says(kActorMcCoy, 4065, 18);
Actor_Says(kActorGuzza, 560, 34);
if (Query_Difficulty_Level() != 0) {
- Global_Variable_Increment(2, 100);
+ Global_Variable_Increment(kVariableChinyen, 100);
}
break;
diff --git a/engines/bladerunner/script/scene/ug05.cpp b/engines/bladerunner/script/scene/ug05.cpp
index f107699940..1c7edb5897 100644
--- a/engines/bladerunner/script/scene/ug05.cpp
+++ b/engines/bladerunner/script/scene/ug05.cpp
@@ -227,12 +227,12 @@ void SceneScriptUG05::DialogueQueueFlushed(int a1) {
int SceneScriptUG05::getAffectionTowardsActor() {
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsDektora
- && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraDead
+ && Actor_Query_Goal_Number(kActorDektora) != kGoalDektoraGone
) {
return kActorDektora;
}
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy
- && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyDead
+ && Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone
) {
return kActorLucy;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-07 20:11:45 +0000