diff options
author | Thanasis Antoniou | 2019-03-29 13:07:18 +0200 |
---|---|---|
committer | Thanasis Antoniou | 2019-03-30 01:32:50 +0200 |
commit | 39a8235acc28f4048fdea3e971d25ff213efa96a (patch) | |
tree | 86387af7e06592d382907fab0521573d5d26dc22 /engines/bladerunner | |
parent | 3209bfb730807d4a82e535525c3612fe7786133b (diff) | |
download | scummvm-rg350-39a8235acc28f4048fdea3e971d25ff213efa96a.tar.gz scummvm-rg350-39a8235acc28f4048fdea3e971d25ff213efa96a.tar.bz2 scummvm-rg350-39a8235acc28f4048fdea3e971d25ff213efa96a.zip |
BLADERUNNER: Fix spelling of kVariableReplicantsSurvivorsAtMoonbus
Diffstat (limited to 'engines/bladerunner')
-rw-r--r-- | engines/bladerunner/game_constants.h | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/clovis.cpp | 12 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/dektora.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/gordo.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/izo.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/lucy.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/luther.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/sadik.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/zuben.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/kp07.cpp | 14 |
10 files changed, 28 insertions, 28 deletions
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h index 00d424d00d..bfcd922806 100644 --- a/engines/bladerunner/game_constants.h +++ b/engines/bladerunner/game_constants.h @@ -1209,7 +1209,7 @@ enum Variables { kVariableDNAEvidence = 48, kVariableCorruptedGuzzaEvidence = 49, kVariableTaffyLewisMusic = 50, - kVariableReplicantsSurvivorsAtMoobus = 51, + kVariableReplicantsSurvivorsAtMoonbus = 51, kVariableNextTvNews = 52, kVariableEarlyQFrontMusic = 53, kVariableEarlyQBackMusic = 54 diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp index a912c654f2..9557bbbd2a 100644 --- a/engines/bladerunner/script/ai/clovis.cpp +++ b/engines/bladerunner/script/ai/clovis.cpp @@ -188,10 +188,10 @@ bool AIScriptClovis::ShotAtAndHit() { void AIScriptClovis::Retired(int byActorId) { if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) { if (Actor_Query_In_Set(kActorClovis, kSetKP07)) { - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Goal_Number(kActorClovis, kGoalClovisGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); @@ -390,8 +390,8 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Put_In_Set(kActorClovis, kSetKP07); Actor_Set_Targetable(kActorClovis, true); if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) { - Global_Variable_Set(kVariableReplicantsSurvivorsAtMoobus, 0); - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Set(kVariableReplicantsSurvivorsAtMoonbus, 0); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_At_XYZ(kActorClovis, 45.0f, -41.52f, -85.0f, 750); } else { Actor_Set_At_XYZ(kActorClovis, 84.85f, -50.56f, -68.87f, 800); @@ -461,7 +461,7 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) { // Lucy's retirement on the moonbus should be handled in her ai script AIScriptLucy::Retired() // like the others - even if she won't attack McCoy, she should be retired immediately (with one shot) Actor_Set_Goal_Number(kActorLucy, kGoalLucyGone); - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); #else // This is her code if she's attacked when escaping with McCoy // will this work? @@ -476,7 +476,7 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) { // Luther's retirement on the moonbus should be handled in his ai script AIScriptLuther:Retired() // like the others - even if he won't attack McCoy, he should be retired immediately (with one shot) Actor_Set_Goal_Number(kActorLuther, kGoalLutherGone); - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); #endif // BLADERUNNER_ORIGINAL_BUGS } diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp index 01d769b935..54fa6d6c30 100644 --- a/engines/bladerunner/script/ai/dektora.cpp +++ b/engines/bladerunner/script/ai/dektora.cpp @@ -294,10 +294,10 @@ void AIScriptDektora::Retired(int byActorId) { } if (Actor_Query_In_Set(kActorDektora, kSetKP07)) { - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Goal_Number(kActorDektora, kGoalDektoraGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp index 3d2dcd2a7a..a2573d11ac 100644 --- a/engines/bladerunner/script/ai/gordo.cpp +++ b/engines/bladerunner/script/ai/gordo.cpp @@ -288,9 +288,9 @@ void AIScriptGordo::Retired(int byActorId) { } if (Actor_Query_In_Set(kActorGordo, kSetKP07)) { - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Goal_Number(kActorGordo, kGoalGordoGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp index d02145b10f..ec7bb30e37 100644 --- a/engines/bladerunner/script/ai/izo.cpp +++ b/engines/bladerunner/script/ai/izo.cpp @@ -238,10 +238,10 @@ void AIScriptIzo::Retired(int byActorId) { return; //false; } - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Goal_Number(kActorIzo, kGoalIzoGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp index 928a425db1..ab007e1468 100644 --- a/engines/bladerunner/script/ai/lucy.cpp +++ b/engines/bladerunner/script/ai/lucy.cpp @@ -252,10 +252,10 @@ void AIScriptLucy::Retired(int byActorId) { #if BLADERUNNER_ORIGINAL_BUGS #else if (Actor_Query_In_Set(kActorLucy, kSetKP07)) { - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Goal_Number(kActorLucy, kGoalLucyGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); diff --git a/engines/bladerunner/script/ai/luther.cpp b/engines/bladerunner/script/ai/luther.cpp index c3db51951d..f868953ccb 100644 --- a/engines/bladerunner/script/ai/luther.cpp +++ b/engines/bladerunner/script/ai/luther.cpp @@ -194,10 +194,10 @@ void AIScriptLuther::Retired(int byActorId) { #if BLADERUNNER_ORIGINAL_BUGS #else if (Actor_Query_In_Set(kActorLuther, kSetKP07)) { - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Goal_Number(kActorLuther, kGoalLutherGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp index 2b223649a1..fb34ae4ade 100644 --- a/engines/bladerunner/script/ai/sadik.cpp +++ b/engines/bladerunner/script/ai/sadik.cpp @@ -234,10 +234,10 @@ void AIScriptSadik::Retired(int byActorId) { } if (Actor_Query_In_Set(kActorSadik, kSetKP07)) { - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); // can't Sadik still be human (Rep-sympathiser here? A bug? + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); // can't Sadik still be human (Rep-sympathiser here? A bug? Actor_Set_Goal_Number(kActorSadik, kGoalSadikGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp index 777433fe41..b80baa323b 100644 --- a/engines/bladerunner/script/ai/zuben.cpp +++ b/engines/bladerunner/script/ai/zuben.cpp @@ -295,9 +295,9 @@ void AIScriptZuben::Retired(int byActorId) { // return false; return; } - Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Decrement(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Goal_Number(kActorZuben, kGoalZubenGone); - if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoobus) == 0) { + if (Global_Variable_Query(kVariableReplicantsSurvivorsAtMoonbus) == 0) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp index 5d6143ff59..020d496b6f 100644 --- a/engines/bladerunner/script/scene/kp07.cpp +++ b/engines/bladerunner/script/scene/kp07.cpp @@ -36,13 +36,13 @@ void SceneScriptKP07::InitializeScene() { && Actor_Query_Goal_Number(kActorDektora) < kGoalDektoraGone ) { Actor_Set_Targetable(kActorDektora, true); - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Put_In_Set(kActorDektora, kSetKP07); Actor_Set_At_XYZ(kActorDektora, -52.0f, -41.52f, -5.0f, 289); } if (Actor_Query_Goal_Number(kActorZuben) < kGoalZubenGone) { - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Targetable(kActorZuben, true); Actor_Put_In_Set(kActorZuben, kSetKP07); Actor_Set_At_XYZ(kActorZuben, -26.0f, -41.52f, -135.0f, 0); @@ -51,7 +51,7 @@ void SceneScriptKP07::InitializeScene() { if (Game_Flag_Query(kFlagIzoIsReplicant) && Actor_Query_Goal_Number(kActorIzo) < 599 ) { - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Targetable(kActorIzo, true); Actor_Put_In_Set(kActorIzo, kSetKP07); Actor_Set_At_XYZ(kActorIzo, -38.0f, -41.52f, -175.0f, 500); @@ -60,7 +60,7 @@ void SceneScriptKP07::InitializeScene() { if (Game_Flag_Query(kFlagGordoIsReplicant) && Actor_Query_Goal_Number(kActorGordo) < kGoalGordoGone ) { - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_Targetable(kActorGordo, true); Actor_Put_In_Set(kActorGordo, kSetKP07); Actor_Set_At_XYZ(kActorGordo, 61.0f, -41.52f, -3.0f, 921); @@ -69,13 +69,13 @@ void SceneScriptKP07::InitializeScene() { if (Game_Flag_Query(kFlagLucyIsReplicant) && Actor_Query_Goal_Number(kActorLucy) < kGoalLucyGone ) { - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Put_In_Set(kActorLucy, kSetKP07); Actor_Set_At_XYZ(kActorLucy, 78.0f, -41.52f, -119.0f, 659); } if (Actor_Query_Goal_Number(kActorLuther) < kGoalLutherGone) { - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Put_In_Set(kActorLuther, kSetKP07); Actor_Set_At_XYZ(kActorLuther, -47.0f, 0.0f, 151.0f, 531); } @@ -180,7 +180,7 @@ void SceneScriptKP07::PlayerWalkedIn() { Actor_Says(kActorClovis, 1250, 3); if (Actor_Query_Goal_Number(kActorSadik) == kGoalSadikUG18NeedsReactorCoreFromMcCoy) { Actor_Put_In_Set(kActorSadik, kSetKP07); - Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoobus, 1); + Global_Variable_Increment(kVariableReplicantsSurvivorsAtMoonbus, 1); Actor_Set_At_XYZ(kActorSadik, -12.0f, -41.58f, 72.0f, 0); Actor_Face_Actor(kActorSadik, kActorClovis, true); } |