[Scummvm-git-logs] scummvm master -> adf0dfe37ce9bb6ca056ff72abc0a7e91a652cd0
sev-
sev at scummvm.org
Thu Mar 8 22:20:33 CET 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2dcbfe8056 BLADERUNNER: Added HysteriaPatron1 actor
c1ae4ecb9d BLADERUNNER: Added HysteriaPatron2 actor
adf0dfe37c BLADERUNNER: Added HysteriaPatron3 actor
Commit: 2dcbfe805686c3a35a229b70249e1af3321da642
https://github.com/scummvm/scummvm/commit/2dcbfe805686c3a35a229b70249e1af3321da642
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-08T22:06:32+01:00
Commit Message:
BLADERUNNER: Added HysteriaPatron1 actor
Changed paths:
A engines/bladerunner/script/ai/hysteria_patron1.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 7cbda0b..83a597c 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -55,6 +55,7 @@ MODULE_OBJS = \
script/ai/generic_walker_b.o \
script/ai/generic_walker_c.o \
script/ai/howie_lee.o \
+ script/ai/hysteria_patron1.o \
script/ai/klein.o \
script/ai/leon.o \
script/ai/maggie.o \
diff --git a/engines/bladerunner/script/ai/hysteria_patron1.cpp b/engines/bladerunner/script/ai/hysteria_patron1.cpp
new file mode 100644
index 0000000..44278ac
--- /dev/null
+++ b/engines/bladerunner/script/ai/hysteria_patron1.cpp
@@ -0,0 +1,145 @@
+/* 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 {
+
+AIScriptHysteriaPatron1::AIScriptHysteriaPatron1(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptHysteriaPatron1::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ Actor_Put_In_Set(kActorHysteriaPatron1, kSetNR03);
+ Actor_Set_At_XYZ(kActorHysteriaPatron1, 50.0f, -6.5900002f, -1030.0f, 524);
+}
+
+bool AIScriptHysteriaPatron1::Update() {
+ return false;
+}
+
+void AIScriptHysteriaPatron1::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptHysteriaPatron1::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptHysteriaPatron1::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptHysteriaPatron1::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptHysteriaPatron1::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron1::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron1::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron1::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron1::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptHysteriaPatron1::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptHysteriaPatron1::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptHysteriaPatron1::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptHysteriaPatron1::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+const int animationList[27] = {
+ 877, 878, 877, 883, 880, 881, 882, 884, 878, 877,
+ 883, 881, 880, 884, 877, 877, 878, 883, 882, 884,
+ 878, 877, 883, 882, 880, 881, 884
+};
+
+bool AIScriptHysteriaPatron1::UpdateAnimation(int *animation, int *frame) {
+ *animation = animationList[_animationState];
+
+ if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+ _animationFrame = 0;
+
+ if (++_animationState >= 27)
+ _animationState = 0;
+
+ *animation = animationList[_animationState];
+ }
+
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptHysteriaPatron1::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptHysteriaPatron1::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptHysteriaPatron1::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptHysteriaPatron1::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptHysteriaPatron1::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 59efd90..1be9e9c 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -46,6 +46,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorHowieLee] = new AIScriptHowieLee(_vm);
_AIScripts[kActorKlein] = new AIScriptKlein(_vm);
_AIScripts[kActorSergeantWalls] = new AIScriptSergeantWalls(_vm);
+ _AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm);
_AIScripts[kActorGaff] = new AIScriptGaff(_vm);
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm);
_AIScripts[kActorLeon] = new AIScriptLeon(_vm);
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 67e9b7d..ad00b68 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -156,6 +156,9 @@ END_SCRIPT
DECLARE_SCRIPT(SergeantWalls)
END_SCRIPT
+DECLARE_SCRIPT(HysteriaPatron1)
+END_SCRIPT
+
DECLARE_SCRIPT(Gaff)
END_SCRIPT
Commit: c1ae4ecb9d784269c61a0209265d7ecc8300c74e
https://github.com/scummvm/scummvm/commit/c1ae4ecb9d784269c61a0209265d7ecc8300c74e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-08T22:16:16+01:00
Commit Message:
BLADERUNNER: Added HysteriaPatron2 actor
Changed paths:
A engines/bladerunner/script/ai/hysteria_patron2.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 83a597c..dde4f56 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -56,6 +56,7 @@ MODULE_OBJS = \
script/ai/generic_walker_c.o \
script/ai/howie_lee.o \
script/ai/hysteria_patron1.o \
+ script/ai/hysteria_patron2.o \
script/ai/klein.o \
script/ai/leon.o \
script/ai/maggie.o \
diff --git a/engines/bladerunner/script/ai/hysteria_patron2.cpp b/engines/bladerunner/script/ai/hysteria_patron2.cpp
new file mode 100644
index 0000000..6a284bd
--- /dev/null
+++ b/engines/bladerunner/script/ai/hysteria_patron2.cpp
@@ -0,0 +1,146 @@
+/* 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 {
+
+AIScriptHysteriaPatron2::AIScriptHysteriaPatron2(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptHysteriaPatron2::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ Actor_Put_In_Set(kActorHysteriaPatron2, kSetNR05_NR08);
+ Actor_Set_At_XYZ(kActorHysteriaPatron2, -516.0f, 0.0f, -190.0f, 452);
+}
+
+bool AIScriptHysteriaPatron2::Update() {
+ return false;
+}
+
+void AIScriptHysteriaPatron2::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptHysteriaPatron2::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptHysteriaPatron2::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptHysteriaPatron2::ClickedByPlayer() {
+ Actor_Face_Actor(kActorMcCoy, kActorHysteriaPatron2, true);
+ Actor_Says(kActorMcCoy, 8935, kAnimationModeTalk);
+}
+
+void AIScriptHysteriaPatron2::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron2::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron2::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron2::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron2::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptHysteriaPatron2::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptHysteriaPatron2::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptHysteriaPatron2::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptHysteriaPatron2::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+const int animationList[30] = {
+ 885, 886, 887, 891, 888, 889, 890, 892, 886, 885,
+ 885, 885, 885, 886, 891, 889, 888, 890, 892, 887,
+ 885, 885, 885, 885, 885, 891, 888, 888, 890, 892
+};
+
+bool AIScriptHysteriaPatron2::UpdateAnimation(int *animation, int *frame) {
+ *animation = animationList[_animationState];
+
+ if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+ _animationFrame = 0;
+
+ if (++_animationState >= 30)
+ _animationState = 0;
+
+ *animation = animationList[_animationState];
+ }
+
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptHysteriaPatron2::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptHysteriaPatron2::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptHysteriaPatron2::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptHysteriaPatron2::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptHysteriaPatron2::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 1be9e9c..1a7c876 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -47,6 +47,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorKlein] = new AIScriptKlein(_vm);
_AIScripts[kActorSergeantWalls] = new AIScriptSergeantWalls(_vm);
_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm);
+ _AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm);
_AIScripts[kActorGaff] = new AIScriptGaff(_vm);
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm);
_AIScripts[kActorLeon] = new AIScriptLeon(_vm);
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index ad00b68..3324fc2 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -159,6 +159,9 @@ END_SCRIPT
DECLARE_SCRIPT(HysteriaPatron1)
END_SCRIPT
+DECLARE_SCRIPT(HysteriaPatron2)
+END_SCRIPT
+
DECLARE_SCRIPT(Gaff)
END_SCRIPT
Commit: adf0dfe37ce9bb6ca056ff72abc0a7e91a652cd0
https://github.com/scummvm/scummvm/commit/adf0dfe37ce9bb6ca056ff72abc0a7e91a652cd0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-08T22:20:03+01:00
Commit Message:
BLADERUNNER: Added HysteriaPatron3 actor
Changed paths:
A engines/bladerunner/script/ai/hysteria_patron3.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 dde4f56..2dff113 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -57,6 +57,7 @@ MODULE_OBJS = \
script/ai/howie_lee.o \
script/ai/hysteria_patron1.o \
script/ai/hysteria_patron2.o \
+ script/ai/hysteria_patron3.o \
script/ai/klein.o \
script/ai/leon.o \
script/ai/maggie.o \
diff --git a/engines/bladerunner/script/ai/hysteria_patron3.cpp b/engines/bladerunner/script/ai/hysteria_patron3.cpp
new file mode 100644
index 0000000..3d953c0
--- /dev/null
+++ b/engines/bladerunner/script/ai/hysteria_patron3.cpp
@@ -0,0 +1,123 @@
+/* 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 {
+
+AIScriptHysteriaPatron3::AIScriptHysteriaPatron3(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptHysteriaPatron3::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptHysteriaPatron3::Update() {
+ return false;
+}
+
+void AIScriptHysteriaPatron3::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptHysteriaPatron3::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptHysteriaPatron3::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptHysteriaPatron3::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptHysteriaPatron3::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron3::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron3::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron3::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptHysteriaPatron3::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptHysteriaPatron3::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptHysteriaPatron3::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptHysteriaPatron3::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptHysteriaPatron3::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptHysteriaPatron3::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptHysteriaPatron3::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptHysteriaPatron3::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptHysteriaPatron3::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptHysteriaPatron3::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptHysteriaPatron3::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 1a7c876..2780e41 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -48,6 +48,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorSergeantWalls] = new AIScriptSergeantWalls(_vm);
_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm);
_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm);
+ _AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm);
_AIScripts[kActorGaff] = new AIScriptGaff(_vm);
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm);
_AIScripts[kActorLeon] = new AIScriptLeon(_vm);
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 3324fc2..54385d0 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -162,6 +162,9 @@ END_SCRIPT
DECLARE_SCRIPT(HysteriaPatron2)
END_SCRIPT
+DECLARE_SCRIPT(HysteriaPatron3)
+END_SCRIPT
+
DECLARE_SCRIPT(Gaff)
END_SCRIPT
More information about the Scummvm-git-logs
mailing list