[Scummvm-git-logs] scummvm master -> 4dd0713fddb2589a7a23ec62f083994f384140c1
sev-
sev at scummvm.org
Sun Mar 18 16:54:07 CET 2018
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
acdb8d055c BLADERUNNER: Added FreeSlotA actor
4dd0713fdd BLADERUNNER: Added FreeSlotB actor
Commit: acdb8d055c76a9237bf32be447acb34f3b66030d
https://github.com/scummvm/scummvm/commit/acdb8d055c76a9237bf32be447acb34f3b66030d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-18T16:53:45+01:00
Commit Message:
BLADERUNNER: Added FreeSlotA actor
Changed paths:
A engines/bladerunner/script/ai/free_slot_a.cpp
engines/bladerunner/module.mk
engines/bladerunner/script/ai_script.cpp
engines/bladerunner/script/ai_script.h
diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk
index 124148e..8e2794f 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -64,6 +64,7 @@ MODULE_OBJS = \
script/ai/early_q.o \
script/ai/early_q_bartender.o \
script/ai/fish_dealer.o \
+ script/ai/free_slot_a.o \
script/ai/gaff.o \
script/ai/general_doll.o \
script/ai/generic_walker_a.o \
diff --git a/engines/bladerunner/script/ai/free_slot_a.cpp b/engines/bladerunner/script/ai/free_slot_a.cpp
new file mode 100644
index 0000000..ea197c4
--- /dev/null
+++ b/engines/bladerunner/script/ai/free_slot_a.cpp
@@ -0,0 +1,658 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "bladerunner/script/ai_script.h"
+
+namespace BladeRunner {
+
+AIScriptFreeSlotA::AIScriptFreeSlotA(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _var1 = 0;
+ _var2 = 1;
+ _var3 = 0.0f;
+ _var4 = 0.0f; // not initialized in original
+ _var5 = 0.0f; // not initialized in original
+}
+
+void AIScriptFreeSlotA::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _var1 = 0;
+ _var2 = 1;
+ _var3 = 0.0f;
+ _var4 = 0.0f; // not initialized in original
+ _var5 = 0.0f; // not initialized in original
+
+ World_Waypoint_Set(525, 45, -780.0f, -615.49f, 2611.0f);
+ World_Waypoint_Set(526, 45, -780.0f, -615.49f, 2759.0f);
+}
+
+bool AIScriptFreeSlotA::Update() {
+ switch (Global_Variable_Query(kVariableChapter)) {
+ case 4:
+ if (Actor_Query_Which_Set_In(kActorMcCoy) == kSceneUG02 && Actor_Query_Which_Set_In(kActorFreeSlotA) == kSceneUG02) {
+ int goal = Actor_Query_Goal_Number(kActorFreeSlotA);
+ if ((goal == 302 || goal == 303) && Actor_Query_Inch_Distance_From_Actor(kActorFreeSlotA, kActorMcCoy) <= 48) {
+ Actor_Set_Goal_Number(kActorFreeSlotA, 304);
+ } else if (goal == 309) {
+ float x, y, z;
+
+ Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
+ _var4 += _var3;
+ if (_var5 < _var4) {
+ _var3 -= 0.2f;
+ } else {
+ _var4 = _var5;
+ Actor_Set_Goal_Number(kActorFreeSlotA, 0);
+ }
+ Actor_Set_At_XYZ(kActorFreeSlotA, x, _var4, z, Actor_Query_Facing_1024(kActorFreeSlotA));
+ }
+ } else {
+ switch (Actor_Query_Goal_Number(kActorFreeSlotA)) {
+ case 306:
+ if (Actor_Query_Which_Set_In(kActorFreeSlotA) == Player_Query_Current_Set()
+ && Actor_Query_Inch_Distance_From_Actor(kActorFreeSlotA, kActorMcCoy) <= 48) {
+ Actor_Set_Goal_Number(kActorFreeSlotA, 308);
+ }
+ break;
+
+ case 308:
+ if (Actor_Query_Which_Set_In(kActorFreeSlotA) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorFreeSlotA, 306);
+ }
+ break;
+
+ case 599:
+ if (Actor_Query_Which_Set_In(kActorFreeSlotA) != Player_Query_Current_Set()) {
+ Game_Flag_Reset(631);
+ Game_Flag_Reset(677);
+ Actor_Set_Goal_Number(kActorFreeSlotA, 0);
+ }
+
+ default:
+ if (!Game_Flag_Query(631)) {
+ Game_Flag_Set(631);
+ Actor_Set_Goal_Number(kActorFreeSlotA, 306);
+ Actor_Set_Targetable(kActorFreeSlotA, 1);
+ }
+ }
+ }
+ return true;
+
+ case 5:
+ if (Actor_Query_Goal_Number(kActorFreeSlotA) < 400) {
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ Actor_Set_Goal_Number(kActorFreeSlotA, 400);
+ } else if (Actor_Query_Goal_Number(kActorFreeSlotA) == 405 && Actor_Query_Which_Set_In(kActorMcCoy) == kSceneKP05) {
+ Actor_Set_Targetable(kActorFreeSlotA, 1);
+ Actor_Set_Goal_Number(kActorFreeSlotA, 406);
+ }
+ return true;
+
+ default:
+ return false;
+ }
+}
+
+void AIScriptFreeSlotA::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptFreeSlotA::CompletedMovementTrack() {
+ switch (Actor_Query_Goal_Number(kActorFreeSlotA)) {
+ case 301:
+ Actor_Set_Goal_Number(kActorFreeSlotA, 302);
+ break;
+
+ case 302:
+ Actor_Set_Goal_Number(kActorFreeSlotA, 303);
+ break;
+
+ case 303:
+ Actor_Set_Goal_Number(kActorFreeSlotA, 300);
+ break;
+
+ case 306:
+ Actor_Set_Goal_Number(kActorFreeSlotA, 307);
+ break;
+
+ case 307:
+ Actor_Set_Goal_Number(kActorFreeSlotA, 306);
+ break;
+
+ case 400:
+ Actor_Set_Goal_Number(kActorFreeSlotA, 405);
+ break;
+
+ case 406:
+ Non_Player_Actor_Combat_Mode_On(kActorFreeSlotA, 0, 0, 0, 8, 4, 7, 8, 0, 0, 100, 5, 300, 0);
+ break;
+
+ default:
+ return; //false;
+ }
+
+ return; //true;
+}
+
+void AIScriptFreeSlotA::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptFreeSlotA::ClickedByPlayer() {
+ if (Actor_Query_Goal_Number(kActorFreeSlotA) != 599) {
+ return; //false;
+ }
+
+ Actor_Face_Actor(kActorMcCoy, kActorFreeSlotA, 1);
+ if (Random_Query(1, 2) == 1) {
+ Actor_Says(kActorMcCoy, 8655, 16);
+ } else {
+ Actor_Says(kActorMcCoy, 8665, 16);
+ }
+}
+
+void AIScriptFreeSlotA::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptFreeSlotA::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptFreeSlotA::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptFreeSlotA::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptFreeSlotA::ShotAtAndMissed() {
+ if (Actor_Query_In_Set(kActorFreeSlotA, kSetUG15) == 1)
+ calcHit();
+}
+
+bool AIScriptFreeSlotA::ShotAtAndHit() {
+ if (Actor_Query_In_Set(kActorFreeSlotA, kSetUG15) == 1) {
+ calcHit();
+ Actor_Set_Goal_Number(kActorFreeSlotA, 305);
+ return true;
+ }
+
+ return false;
+}
+
+void AIScriptFreeSlotA::Retired(int byActorId) {
+ Actor_Set_Goal_Number(kActorFreeSlotA, 599);
+}
+
+int AIScriptFreeSlotA::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptFreeSlotA::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 300:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ Actor_Change_Animation_Mode(kActorFreeSlotA, 0);
+ Actor_Set_Targetable(kActorFreeSlotA, 0);
+ break;
+
+ case 301:
+ Actor_Force_Stop_Walking(kActorMcCoy);
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ World_Waypoint_Set(444, 87, -48.75f, 44.66f, 87.57f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 444, 1);
+ AI_Movement_Track_Repeat(kActorFreeSlotA);
+ break;
+
+ case 302:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ World_Waypoint_Set(444, 87, -237.0f, 48.07f, 208.0f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 444, 1);
+ AI_Movement_Track_Repeat(kActorFreeSlotA);
+ Actor_Set_Targetable(kActorFreeSlotA, 1);
+ break;
+
+ case 303:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ World_Waypoint_Set(444, 87, 3.52f, 52.28f, 90.68f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 444, 0);
+ AI_Movement_Track_Repeat(kActorFreeSlotA);
+ break;
+
+ case 304:
+ Player_Loses_Control();
+ Actor_Force_Stop_Walking(kActorMcCoy);
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ Actor_Face_Actor(kActorFreeSlotA, kActorMcCoy, 1);
+ Actor_Change_Animation_Mode(kActorFreeSlotA, 6);
+ Actor_Change_Animation_Mode(kActorMcCoy, 48);
+ break;
+
+ case 305:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ Actor_Set_Targetable(kActorFreeSlotA, 0);
+ Game_Flag_Set(676);
+ _animationState = 7;
+ _animationFrame = 0;
+ break;
+
+ case 306:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ processGoal306();
+ AI_Movement_Track_Repeat(kActorFreeSlotA);
+ break;
+
+ case 307:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ AI_Movement_Track_Append(kActorFreeSlotA, 39, 1);
+ AI_Movement_Track_Repeat(kActorFreeSlotA);
+ break;
+
+ case 308:
+ Actor_Set_Targetable(kActorFreeSlotA, 1);
+ Non_Player_Actor_Combat_Mode_On(kActorFreeSlotA, 0, 0, 0, 8, 4, 7, 8, 25, 0, 75, 5, 300, 0);
+ break;
+
+ case 309:
+ Actor_Force_Stop_Walking(kActorFreeSlotA);
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ _var4 = 52.46f;
+ _var3 = -4.0f;
+ _var5 = -10.0f;
+ if (_animationState != 7 && _animationState != 8) {
+ _animationState = 7;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 310:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ Actor_Put_In_Set(kActorFreeSlotA, kSetUG15);
+ Actor_Set_At_XYZ(kActorFreeSlotA, 3.52f, 52.28f, 90.68f, 700);
+ Actor_Set_Goal_Number(kActorFreeSlotA, 300);
+ break;
+
+ case 400:
+ AI_Movement_Track_Append(kActorFreeSlotA, 39, 0);
+ AI_Movement_Track_Repeat(kActorFreeSlotA);
+ break;
+
+ case 406:
+ AI_Movement_Track_Flush(kActorFreeSlotA);
+ AI_Movement_Track_Append(kActorFreeSlotA, 525, 0);
+ AI_Movement_Track_Repeat(kActorFreeSlotA);
+ break;
+
+ case 599:
+ Actor_Set_Health(kActorFreeSlotA, 20, 20);
+ Actor_Set_Friendliness_To_Other(kActorFreeSlotA, kActorMcCoy, 40);
+ break;
+
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 861;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(861)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ *animation = 862;
+ if (_var1) {
+ _var1--;
+ } else {
+ _animationFrame += _var2;
+ if (_animationFrame < 8) {
+ _var2 = 1;
+ } else {
+ if (_animationFrame > 8) {
+ _var2 = -1;
+ } else if (Random_Query(0, 4)) {
+ _var2 = -_var2;
+ }
+ }
+ if (_animationFrame >= 7 && _animationFrame <= 9) {
+ _var1 = Random_Query(0, 1);
+ }
+ }
+ break;
+
+ case 2:
+ *animation = 862;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(862) - 1) {
+ *animation = 861;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ case 3:
+ *animation = 858;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(858)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 4:
+ *animation = 857;
+ _animationFrame++;
+ if (_animationFrame == 1) {
+ int snd;
+ if (Random_Query(1, 2) == 1) {
+ snd = 9010;
+ } else {
+ snd = 9015;
+ }
+ Sound_Play_Speech_Line(64, snd, 75, 0, 99);
+ }
+ if (_animationFrame == 3) {
+ Ambient_Sounds_Play_Sound(438, 99, 0, 0, 20);
+ Actor_Combat_AI_Hit_Attempt(kActorFreeSlotA);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(857)) {
+ _animationState = 0;
+ _animationFrame = 0;
+ Actor_Change_Animation_Mode(kActorFreeSlotA, 4);
+ }
+ break;
+
+ case 5:
+ *animation = 874;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) { // bug? shuld not be '-1'
+ Actor_Change_Animation_Mode(kActorFreeSlotA, 0);
+ }
+ break;
+
+ case 6:
+ if (_animationFrame == 1) {
+ Ambient_Sounds_Play_Sound(437, 99, 0, 0, 20);
+ }
+ *animation = 860;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(860)) {
+ _animationFrame = 0;
+ _animationState = 0;
+ Actor_Change_Animation_Mode(kActorFreeSlotA, 0);
+ }
+ break;
+
+ case 7:
+ *animation = 859;
+ _animationFrame++;
+ if (_animationFrame == 0) {
+ Ambient_Sounds_Play_Sound(439, 99, 0, 0, 25);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(859) - 1) { // bug? shuld not be '-1'
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ _animationState = 8;
+ Actor_Set_Goal_Number(kActorFreeSlotA, 599);
+ }
+ break;
+
+ case 8:
+ *animation = 859;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+ return true;
+}
+
+bool AIScriptFreeSlotA::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if ((unsigned int)(_animationState - 1) > 1) {
+ _animationState = 0;
+ _animationFrame = 0;
+ } else if (_animationState == 1) {
+ _animationState = 2;
+ }
+ break;
+
+ case 1:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 4:
+ if ((unsigned int)(_animationState - 1) > 1) {
+ _animationState = 0;
+ _animationFrame = 0;
+ } else if (_animationState == 1) {
+ _animationState = 2;
+ }
+ break;
+
+ case 6:
+ _animationState = 4;
+ _animationFrame = 0;
+ break;
+
+ case 7:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 8:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 21:
+ _animationState = 6;
+ _animationFrame = 0;
+ break;
+
+ case 43:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+
+ case 48:
+ _animationState = 7;
+ _animationFrame = 0;
+ break;
+ }
+ return true;
+}
+
+void AIScriptFreeSlotA::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptFreeSlotA::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptFreeSlotA::ReachedMovementTrackWaypoint(int waypointId) {
+ if (Actor_Query_Which_Set_In(kActorFreeSlotA) == kSetUG01) {
+ if (waypointId == 465) {
+ Actor_Change_Animation_Mode(kActorFreeSlotA, 43);
+ }
+ } else if (Actor_Query_Goal_Number(kActorFreeSlotA) == 302) {
+ Actor_Face_Actor(kActorFreeSlotA, kActorMcCoy, 1);
+ }
+
+ return true;
+}
+
+void AIScriptFreeSlotA::FledCombat() {
+ // return false;
+}
+
+void AIScriptFreeSlotA::calcHit() {
+ float x, y, z;
+
+ Actor_Query_XYZ(kActorFreeSlotA, &x, &y, &z);
+
+ if (x >= -30.0f && x < -150.0f) {
+ Game_Flag_Set(677);
+ }
+}
+
+void AIScriptFreeSlotA::processGoal306() {
+ switch (Random_Query(1, 14)) {
+ case 1:
+ AI_Movement_Track_Append(kActorFreeSlotA, 450, 1);
+ AI_Movement_Track_Append(kActorFreeSlotA, 451, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 450, 0);
+ break;
+
+ case 2:
+ World_Waypoint_Set(463, 74, 144.98f, -50.13f, -175.75f);
+ World_Waypoint_Set(464, 74, 105.6f, -50.13f, -578.46f);
+ World_Waypoint_Set(465, 74, 62.0f, -50.13f, -574.0f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 1);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 1);
+ AI_Movement_Track_Append(kActorFreeSlotA, 465, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 5);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorFreeSlotA, 446, 15);
+ AI_Movement_Track_Append(kActorFreeSlotA, 447, 1);
+ AI_Movement_Track_Append(kActorFreeSlotA, 449, 1);
+ AI_Movement_Track_Append(kActorFreeSlotA, 448, 2);
+ AI_Movement_Track_Append(kActorFreeSlotA, 449, 0);
+ break;
+
+ case 4:
+ World_Waypoint_Set(463, 77, -22.7f, 6.39f, 33.12f);
+ World_Waypoint_Set(464, 77, -6.70f, -1.74f, -362.88f);
+ World_Waypoint_Set(465, 77, 164.0f, 11.87f, -1013.0f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 2);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 0);
+ AI_Movement_Track_Append(kActorFreeSlotA, 465, 0);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorFreeSlotA, 457, 15);
+ AI_Movement_Track_Append(kActorFreeSlotA, 458, 0);
+ AI_Movement_Track_Append(kActorFreeSlotA, 459, 15);
+ break;
+
+ case 6:
+ AI_Movement_Track_Append(kActorFreeSlotA, 460, 15);
+ AI_Movement_Track_Append(kActorFreeSlotA, 461, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 460, 15);
+ break;
+
+ case 7:
+ if (Actor_Query_In_Set(kActorClovis, kSetUG07)) {
+ AI_Movement_Track_Append(kActorFreeSlotA, 39, 10);
+ } else {
+ World_Waypoint_Set(463, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(464, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(465, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 1);
+ }
+ break;
+
+ case 8:
+ World_Waypoint_Set(463, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(464, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(465, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 1);
+ break;
+
+ case 9:
+ World_Waypoint_Set(463, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(464, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(465, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 465, 1);
+ break;
+
+ case 10:
+ World_Waypoint_Set(463, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(464, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(465, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 465, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 1);
+ break;
+
+ case 11:
+ World_Waypoint_Set(463, 82, 91.0f, 156.94f, -498.0f);
+ World_Waypoint_Set(464, 82, -149.0f, 156.94f, -498.0f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 1);
+ break;
+
+ case 12:
+ World_Waypoint_Set(463, 82, 91.0f, 156.94f, -498.0f);
+ World_Waypoint_Set(464, 82, -149.0f, 156.94f, -498.0f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 5);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 1);
+ break;
+
+ case 13:
+ World_Waypoint_Set(463, 82, -152.51f, 277.31f, 311.98f);
+ World_Waypoint_Set(464, 82, -124.51f, 275.08f, 319.98f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 1);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 8);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 1);
+ break;
+
+ case 14:
+ World_Waypoint_Set(463, 84, -360.67f, 21.39f, 517.55f);
+ World_Waypoint_Set(464, 84, -250.67f, 21.39f, 477.55f);
+ World_Waypoint_Set(465, 84, -248.67f, 21.39f, -1454.45f);
+ AI_Movement_Track_Append(kActorFreeSlotA, 463, 1);
+ AI_Movement_Track_Append(kActorFreeSlotA, 464, 8);
+ AI_Movement_Track_Append(kActorFreeSlotA, 465, 1);
+ break;
+
+ default:
+ AI_Movement_Track_Append(kActorFreeSlotA, 39, Random_Query(1, 10));
+ break;
+ }
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index e6cb37a..299feb2 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -103,6 +103,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm); // 61
_AIScripts[kActorLeon] = new AIScriptLeon(_vm); // 62
_AIScripts[kActorMaleAnnouncer] = new AIScriptMaleAnnouncer(_vm); // 63
+ _AIScripts[kActorFreeSlotA] = new AIScriptFreeSlotA(_vm); // 64
_AIScripts[kActorMaggie] = new AIScriptMaggie(_vm); // 66
_AIScripts[kActorGenwalkerA] = new AIScriptGenericWalkerA(_vm); // 67
_AIScripts[kActorGenwalkerB] = new AIScriptGenericWalkerB(_vm); // 68
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index f645704..6221176 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -459,6 +459,17 @@ END_SCRIPT
DECLARE_SCRIPT(MaleAnnouncer)
END_SCRIPT
+DECLARE_SCRIPT(FreeSlotA)
+ int _var1;
+ int _var2;
+ float _var3;
+ float _var4;
+ float _var5;
+
+ void calcHit();
+ void processGoal306();
+END_SCRIPT
+
DECLARE_SCRIPT(Maggie)
int var_45F3F8;
int var_45F3FC;
Commit: 4dd0713fddb2589a7a23ec62f083994f384140c1
https://github.com/scummvm/scummvm/commit/4dd0713fddb2589a7a23ec62f083994f384140c1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-18T16:53:45+01:00
Commit Message:
BLADERUNNER: Added FreeSlotB actor
Changed paths:
A engines/bladerunner/script/ai/free_slot_b.cpp
engines/bladerunner/module.mk
engines/bladerunner/script/ai_script.cpp
engines/bladerunner/script/ai_script.h
diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk
index 8e2794f..57fdcc1 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -65,6 +65,7 @@ MODULE_OBJS = \
script/ai/early_q_bartender.o \
script/ai/fish_dealer.o \
script/ai/free_slot_a.o \
+ script/ai/free_slot_b.o \
script/ai/gaff.o \
script/ai/general_doll.o \
script/ai/generic_walker_a.o \
diff --git a/engines/bladerunner/script/ai/free_slot_b.cpp b/engines/bladerunner/script/ai/free_slot_b.cpp
new file mode 100644
index 0000000..431b27a
--- /dev/null
+++ b/engines/bladerunner/script/ai/free_slot_b.cpp
@@ -0,0 +1,541 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "bladerunner/script/ai_script.h"
+
+namespace BladeRunner {
+
+AIScriptFreeSlotB::AIScriptFreeSlotB(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _var1 = 0;
+ _var2 = 1;
+}
+
+void AIScriptFreeSlotB::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _var1 = 0;
+ _var2 = 1;
+
+ World_Waypoint_Set(527, 45, -468.46f, -616.58f, 2840.60f);
+ World_Waypoint_Set(528, 45, -1024.46f, -615.49f, 2928.60f);
+ World_Waypoint_Set(529, 45, -1024.46f, -615.49f, 2788.60f);
+}
+
+bool AIScriptFreeSlotB::Update() {
+ if (Global_Variable_Query(kVariableChapter) > 5) {
+ return false;
+ }
+
+ if (Global_Variable_Query(kVariableChapter) == 4) {
+ switch (Actor_Query_Goal_Number(kActorFreeSlotB)) {
+ case 300:
+ Actor_Set_Goal_Number(kActorFreeSlotB, 301);
+ Actor_Set_Targetable(kActorFreeSlotB, 1);
+ break;
+
+ case 301:
+ if (Actor_Query_Which_Set_In(kActorFreeSlotB) == Player_Query_Current_Set()
+ && Actor_Query_Inch_Distance_From_Actor(kActorFreeSlotB, kActorMcCoy) <= 48) {
+ Actor_Set_Goal_Number(kActorFreeSlotB, 302);
+ }
+ break;
+
+ case 302:
+ if (Actor_Query_Which_Set_In(kActorFreeSlotB) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorFreeSlotB, 301);
+ }
+ break;
+
+ case 599:
+ if (Actor_Query_Which_Set_In(kActorFreeSlotB) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorFreeSlotB, 300);
+ }
+ break;
+
+ default:
+ Actor_Set_Goal_Number(kActorFreeSlotB, 300);
+ break;
+ }
+
+ return false;
+ }
+ if (Actor_Query_Goal_Number(kActorFreeSlotB) < 400) {
+ AI_Movement_Track_Flush(kActorFreeSlotB);
+ Actor_Set_Goal_Number(kActorFreeSlotB, 400);
+ return true;
+ } else {
+ if (Actor_Query_Goal_Number(kActorFreeSlotB) != 405 || Actor_Query_Which_Set_In(kActorMcCoy) != kSetKP02) {
+ if (Actor_Query_Goal_Number(kActorFreeSlotB) == 599) {
+ if (Actor_Query_Which_Set_In(kActorFreeSlotB) != Player_Query_Current_Set()) {
+ Non_Player_Actor_Combat_Mode_Off(kActorFreeSlotB);
+ Actor_Set_Goal_Number(kActorFreeSlotB, 400);
+ return true;
+ }
+ }
+ return false;
+ }
+ Actor_Set_Goal_Number(kActorFreeSlotB, 406);
+ Actor_Set_Targetable(kActorFreeSlotB, 1);
+ return true;
+ }
+}
+
+void AIScriptFreeSlotB::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptFreeSlotB::CompletedMovementTrack() {
+ switch (Actor_Query_Goal_Number(kActorFreeSlotB)) {
+ case 300:
+ Actor_Set_Goal_Number(kActorFreeSlotB, 301);
+ break;
+
+ case 301:
+ Actor_Set_Goal_Number(kActorFreeSlotB, 300);
+ break;
+
+ case 400:
+ Actor_Set_Goal_Number(kActorFreeSlotB, 405);
+ break;
+
+ case 406:
+ Non_Player_Actor_Combat_Mode_On(kActorFreeSlotB, 0, 0, 0, 8, 4, 7, 8, 0, 0, 100, 5, 300, 0);
+ break;
+
+ default:
+ return; //false;
+ }
+
+ return; //true;
+}
+
+void AIScriptFreeSlotB::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptFreeSlotB::ClickedByPlayer() {
+ if (Actor_Query_Goal_Number(kActorFreeSlotB) != 599)
+ return; //false;
+
+ Actor_Face_Actor(kActorMcCoy, kActorFreeSlotB, 1);
+ if (Random_Query(1, 2) == 1) {
+ Actor_Says(kActorMcCoy, 8655, 16);
+ } else {
+ Actor_Says(kActorMcCoy, 8665, 16);
+ }
+}
+
+void AIScriptFreeSlotB::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptFreeSlotB::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptFreeSlotB::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptFreeSlotB::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptFreeSlotB::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptFreeSlotB::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptFreeSlotB::Retired(int byActorId) {
+ Actor_Set_Goal_Number(kActorFreeSlotB, 599);
+}
+
+int AIScriptFreeSlotB::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptFreeSlotB::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 300:
+ AI_Movement_Track_Flush(kActorFreeSlotB);
+ AI_Movement_Track_Append(kActorFreeSlotB, 39, 2);
+ AI_Movement_Track_Repeat(kActorFreeSlotB);
+ break;
+
+ case 301:
+ AI_Movement_Track_Flush(kActorFreeSlotB);
+ processGoal301();
+ AI_Movement_Track_Repeat(kActorFreeSlotB);
+ break;
+
+ case 302:
+ Actor_Set_Targetable(kActorFreeSlotB, 1);
+ Non_Player_Actor_Combat_Mode_On(kActorFreeSlotB, 0, 0, 0, 8, 4, 7, 8, 25, 0, 75, 5, 300, 0);
+ break;
+
+ case 400:
+ AI_Movement_Track_Append(kActorFreeSlotB, 39, 0);
+ AI_Movement_Track_Repeat(kActorFreeSlotB);
+ break;
+
+ case 406:
+ AI_Movement_Track_Flush(kActorFreeSlotB);
+ AI_Movement_Track_Append(kActorFreeSlotB, 527, 0);
+ AI_Movement_Track_Repeat(kActorFreeSlotB);
+ break;
+
+ case 599:
+ Actor_Set_Health(kActorFreeSlotB, 20, 20);
+ break;
+
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 861;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(861)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ *animation = 862;
+ if (_var1) {
+ _var1--;
+ } else {
+ _animationFrame += _var2;
+ if (_animationFrame < 8) {
+ _var2 = 1;
+ } else {
+ if (_animationFrame > 8) {
+ _var2 = -1;
+ } else if (Random_Query(0, 4)) {
+ _var2 = -_var2;
+ }
+ }
+ if (_animationFrame >= 7 && _animationFrame <= 9) {
+ _var1 = Random_Query(0, 1);
+ }
+ }
+ break;
+
+ case 2:
+ *animation = 862;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(862) - 1) {
+ *animation = 861;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ case 3:
+ *animation = 858;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(858)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 4:
+ *animation = 857;
+ _animationFrame++;
+ if (_animationFrame == 3) {
+ int snd;
+ if (Random_Query(1, 2) == 1) {
+ snd = 9010;
+ } else {
+ snd = 9015;
+ }
+ Sound_Play_Speech_Line(kActorFreeSlotB, snd, 75, 0, 99);
+ }
+ if (_animationFrame == 3) {
+ Actor_Combat_AI_Hit_Attempt(kActorFreeSlotB);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+ *animation = 861;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ case 5:
+ *animation = 874;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) {
+ _animationState = 8;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(874) - 1;
+ }
+ break;
+
+ case 6:
+ if (_animationFrame == 1) {
+ Ambient_Sounds_Play_Sound(437, 99, 0, 0, 20);
+ }
+ *animation = 860;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(860)) {
+ _animationFrame = 0;
+ _animationState = 0;
+ Actor_Change_Animation_Mode(kActorFreeSlotB, 0);
+ }
+ break;
+
+ case 7:
+ *animation = 859;
+ _animationFrame++;
+ if (_animationFrame == 1) {
+ Ambient_Sounds_Play_Sound(439, 99, 0, 0, 25);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(859)) {
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(859);
+ }
+ _animationState = 8;
+ break;
+
+ case 8:
+ *animation = 859;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+ return true;
+}
+
+bool AIScriptFreeSlotB::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if ((unsigned int)(_animationState - 1) > 1) {
+ _animationState = 0;
+ _animationFrame = 0;
+ } else if (_animationState == 1) {
+ _animationState = 2;
+ }
+ break;
+
+ case 1:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 4:
+ if ((unsigned int)(_animationState - 1) > 1) {
+ _animationState = 0;
+ _animationFrame = 0;
+ } else if (_animationState == 1) {
+ _animationState = 2;
+ }
+ break;
+
+ case 6:
+ _animationState = 4;
+ _animationFrame = 0;
+ break;
+
+ case 7:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 8:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 21:
+ _animationState = 6;
+ _animationFrame = 0;
+ break;
+
+ case 43:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+
+ case 48:
+ _animationState = 7;
+ _animationFrame = 0;
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptFreeSlotB::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptFreeSlotB::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptFreeSlotB::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptFreeSlotB::FledCombat() {
+ // return false;
+}
+
+void AIScriptFreeSlotB::processGoal301() {
+ switch (Random_Query(1, 14)) {
+ case 1:
+ AI_Movement_Track_Append(kActorFreeSlotB, 450, 1);
+ AI_Movement_Track_Append(kActorFreeSlotB, 451, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 450, 0);
+ break;
+
+ case 2:
+ World_Waypoint_Set(466, 74, 144.98f, -50.13f, -175.75f);
+ World_Waypoint_Set(547, 74, 105.6f, -50.13f, -578.46f);
+ World_Waypoint_Set(548, 74, 62.0f, -50.13f, -574.0f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 1);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 1);
+ AI_Movement_Track_Append(kActorFreeSlotB, 548, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 5);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorFreeSlotB, 446, 15);
+ AI_Movement_Track_Append(kActorFreeSlotB, 447, 1);
+ AI_Movement_Track_Append(kActorFreeSlotB, 449, 1);
+ AI_Movement_Track_Append(kActorFreeSlotB, 448, 2);
+ AI_Movement_Track_Append(kActorFreeSlotB, 449, 0);
+ break;
+
+ case 4:
+ World_Waypoint_Set(466, 77, -22.70f, 6.39f, 33.12f);
+ World_Waypoint_Set(547, 77, -6.70f, -1.74f, -362.88f);
+ World_Waypoint_Set(548, 77, 164.0f, 11.87f, -1013.0f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 2);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 0);
+ AI_Movement_Track_Append(kActorFreeSlotB, 548, 0);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorFreeSlotB, 457, 15);
+ AI_Movement_Track_Append(kActorFreeSlotB, 458, 0);
+ AI_Movement_Track_Append(kActorFreeSlotB, 459, 15);
+ break;
+
+ case 6:
+ AI_Movement_Track_Append(kActorFreeSlotB, 460, 15);
+ AI_Movement_Track_Append(kActorFreeSlotB, 461, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 460, 15);
+ break;
+
+ case 7:
+ if (Actor_Query_In_Set(kActorClovis, kSetUG07)) {
+ AI_Movement_Track_Append(kActorFreeSlotB, 39, 10);
+ } else {
+ World_Waypoint_Set(466, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(547, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(548, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 1);
+ }
+ break;
+
+ case 8:
+ World_Waypoint_Set(466, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(547, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(548, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 1);
+ break;
+
+ case 9:
+ World_Waypoint_Set(466, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(547, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(548, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 548, 1);
+ break;
+
+ case 10:
+ World_Waypoint_Set(466, 80, -88.78f, -12.21f, -184.08f);
+ World_Waypoint_Set(547, 80, 250.0f, -12.21f, -342.0f);
+ World_Waypoint_Set(548, 80, -164.78f, -12.21f, -832.08f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 548, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 1);
+ break;
+
+ case 11:
+ World_Waypoint_Set(466, 82, 91.0f, 156.94f, -498.0f);
+ World_Waypoint_Set(547, 82, -149.0f, 156.94f, -498.0f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 1);
+ break;
+
+ case 12:
+ World_Waypoint_Set(466, 82, 91.0f, 156.94f, -498.0f);
+ World_Waypoint_Set(547, 82, -149.0f, 156.94f, -498.0f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 5);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 1);
+ break;
+
+ case 13:
+ World_Waypoint_Set(466, 82, -152.51f, 277.31f, 311.98f);
+ World_Waypoint_Set(547, 82, -124.51f, 275.08f, 319.98f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 1);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 8);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 1);
+ break;
+
+ case 14:
+ World_Waypoint_Set(466, 84, -360.67f, 21.39f, 517.55f);
+ World_Waypoint_Set(547, 84, -250.67f, 21.39f, 477.55f);
+ World_Waypoint_Set(548, 84, -248.67f, 21.39f, -1454.45f);
+ AI_Movement_Track_Append(kActorFreeSlotB, 466, 1);
+ AI_Movement_Track_Append(kActorFreeSlotB, 547, 8);
+ AI_Movement_Track_Append(kActorFreeSlotB, 548, 1);
+ break;
+
+ default:
+ AI_Movement_Track_Append(kActorFreeSlotB, 39, Random_Query(1, 10));
+ break;
+ }
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 299feb2..c960ff1 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -104,6 +104,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorLeon] = new AIScriptLeon(_vm); // 62
_AIScripts[kActorMaleAnnouncer] = new AIScriptMaleAnnouncer(_vm); // 63
_AIScripts[kActorFreeSlotA] = new AIScriptFreeSlotA(_vm); // 64
+ _AIScripts[kActorFreeSlotB] = new AIScriptFreeSlotB(_vm); // 65
_AIScripts[kActorMaggie] = new AIScriptMaggie(_vm); // 66
_AIScripts[kActorGenwalkerA] = new AIScriptGenericWalkerA(_vm); // 67
_AIScripts[kActorGenwalkerB] = new AIScriptGenericWalkerB(_vm); // 68
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 6221176..cfd3fe5 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -470,6 +470,13 @@ DECLARE_SCRIPT(FreeSlotA)
void processGoal306();
END_SCRIPT
+DECLARE_SCRIPT(FreeSlotB)
+ int _var1;
+ int _var2;
+
+ void processGoal301();
+END_SCRIPT
+
DECLARE_SCRIPT(Maggie)
int var_45F3F8;
int var_45F3FC;
More information about the Scummvm-git-logs
mailing list