[Scummvm-git-logs] scummvm master -> 49b22d5b02cc484efe63789dc5755fa1b003c9a0
sev-
sev at scummvm.org
Thu Mar 8 21:43:01 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:
0cc3b2a1fa BLADERUNNER: Follow engine file name conventions
49b22d5b02 BLADERUNNER: Added Newscaster actor
Commit: 0cc3b2a1faa0ff2234905c4f46c64df9241ad54d
https://github.com/scummvm/scummvm/commit/0cc3b2a1faa0ff2234905c4f46c64df9241ad54d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-08T21:38:55+01:00
Commit Message:
BLADERUNNER: Follow engine file name conventions
Changed paths:
A engines/bladerunner/script/ai/male_announcer.cpp
R engines/bladerunner/script/ai/maleAnnouncer.cpp
engines/bladerunner/module.mk
diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk
index 085fd63..36aabdd 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -58,7 +58,7 @@ MODULE_OBJS = \
script/ai/klein.o \
script/ai/leon.o \
script/ai/maggie.o \
- script/ai/maleAnnouncer.o \
+ script/ai/male_announcer.o \
script/ai/mccoy.o \
script/ai/officer_leary.o \
script/ai/runciter.o \
diff --git a/engines/bladerunner/script/ai/maleAnnouncer.cpp b/engines/bladerunner/script/ai/maleAnnouncer.cpp
deleted file mode 100644
index 5c904cd..0000000
--- a/engines/bladerunner/script/ai/maleAnnouncer.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/* 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 {
-
-AIScriptMaleAnnouncer::AIScriptMaleAnnouncer(BladeRunnerEngine *vm) : AIScriptBase(vm) {
-}
-
-void AIScriptMaleAnnouncer::Initialize() {
- _animationFrame = 0;
- _animationState = 0;
- _animationStateNext = 0;
- _animationNext = 0;
-}
-
-bool AIScriptMaleAnnouncer::Update() {
- return false;
-}
-
-void AIScriptMaleAnnouncer::TimerExpired(int timer) {
- //return false;
-}
-
-void AIScriptMaleAnnouncer::CompletedMovementTrack() {
- //return false;
-}
-
-void AIScriptMaleAnnouncer::ReceivedClue(int clueId, int fromActorId) {
- //return false;
-}
-
-void AIScriptMaleAnnouncer::ClickedByPlayer() {
- //return false;
-}
-
-void AIScriptMaleAnnouncer::EnteredScene(int sceneId) {
- // return false;
-}
-
-void AIScriptMaleAnnouncer::OtherAgentEnteredThisScene(int otherActorId) {
- // return false;
-}
-
-void AIScriptMaleAnnouncer::OtherAgentExitedThisScene(int otherActorId) {
- // return false;
-}
-
-void AIScriptMaleAnnouncer::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
- // return false;
-}
-
-void AIScriptMaleAnnouncer::ShotAtAndMissed() {
- // return false;
-}
-
-bool AIScriptMaleAnnouncer::ShotAtAndHit() {
- return false;
-}
-
-void AIScriptMaleAnnouncer::Retired(int byActorId) {
- // return false;
-}
-
-int AIScriptMaleAnnouncer::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
- return 0;
-}
-
-bool AIScriptMaleAnnouncer::GoalChanged(int currentGoalNumber, int newGoalNumber) {
- return false;
-}
-
-bool AIScriptMaleAnnouncer::UpdateAnimation(int *animation, int *frame) {
- return true;
-}
-
-bool AIScriptMaleAnnouncer::ChangeAnimationMode(int mode) {
- return true;
-}
-
-void AIScriptMaleAnnouncer::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
- *animationState = _animationState;
- *animationFrame = _animationFrame;
- *animationStateNext = _animationStateNext;
- *animationNext = _animationNext;
-}
-
-void AIScriptMaleAnnouncer::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
- _animationState = animationState;
- _animationFrame = animationFrame;
- _animationStateNext = animationStateNext;
- _animationNext = animationNext;
-}
-
-bool AIScriptMaleAnnouncer::ReachedMovementTrackWaypoint(int waypointId) {
- return true;
-}
-
-void AIScriptMaleAnnouncer::FledCombat() {
- // return false;
-}
-
-} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai/male_announcer.cpp b/engines/bladerunner/script/ai/male_announcer.cpp
new file mode 100644
index 0000000..5c904cd
--- /dev/null
+++ b/engines/bladerunner/script/ai/male_announcer.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 {
+
+AIScriptMaleAnnouncer::AIScriptMaleAnnouncer(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptMaleAnnouncer::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptMaleAnnouncer::Update() {
+ return false;
+}
+
+void AIScriptMaleAnnouncer::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptMaleAnnouncer::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptMaleAnnouncer::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptMaleAnnouncer::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptMaleAnnouncer::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptMaleAnnouncer::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMaleAnnouncer::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMaleAnnouncer::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptMaleAnnouncer::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptMaleAnnouncer::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptMaleAnnouncer::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptMaleAnnouncer::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptMaleAnnouncer::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptMaleAnnouncer::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptMaleAnnouncer::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptMaleAnnouncer::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptMaleAnnouncer::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptMaleAnnouncer::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptMaleAnnouncer::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
Commit: 49b22d5b02cc484efe63789dc5755fa1b003c9a0
https://github.com/scummvm/scummvm/commit/49b22d5b02cc484efe63789dc5755fa1b003c9a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-08T21:42:34+01:00
Commit Message:
BLADERUNNER: Added Newscaster actor
Changed paths:
A engines/bladerunner/script/ai/newscaster.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 36aabdd..7cbda0b 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -60,6 +60,7 @@ MODULE_OBJS = \
script/ai/maggie.o \
script/ai/male_announcer.o \
script/ai/mccoy.o \
+ script/ai/newscaster.o \
script/ai/officer_leary.o \
script/ai/runciter.o \
script/ai/sergeant_walls.o \
diff --git a/engines/bladerunner/script/ai/newscaster.cpp b/engines/bladerunner/script/ai/newscaster.cpp
new file mode 100644
index 0000000..00829a6
--- /dev/null
+++ b/engines/bladerunner/script/ai/newscaster.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 {
+
+AIScriptNewscaster::AIScriptNewscaster(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptNewscaster::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptNewscaster::Update() {
+ return false;
+}
+
+void AIScriptNewscaster::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptNewscaster::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptNewscaster::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptNewscaster::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptNewscaster::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptNewscaster::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptNewscaster::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptNewscaster::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptNewscaster::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptNewscaster::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptNewscaster::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptNewscaster::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptNewscaster::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptNewscaster::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptNewscaster::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptNewscaster::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptNewscaster::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptNewscaster::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptNewscaster::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 3123b29..59efd90 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[kActorGaff] = new AIScriptGaff(_vm);
+ _AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm);
_AIScripts[kActorLeon] = new AIScriptLeon(_vm);
_AIScripts[kActorMaleAnnouncer] = new AIScriptMaleAnnouncer(_vm);
_AIScripts[kActorMaggie] = new AIScriptMaggie(_vm);
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 195de07..67e9b7d 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -159,6 +159,9 @@ END_SCRIPT
DECLARE_SCRIPT(Gaff)
END_SCRIPT
+DECLARE_SCRIPT(Newscaster)
+END_SCRIPT
+
DECLARE_SCRIPT(Leon)
int var_45EDAC;
float var_45EDA0_z;
More information about the Scummvm-git-logs
mailing list