aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-02-26 19:27:56 -0500
committerPaul Gilbert2016-02-26 19:27:56 -0500
commit1a98b49f607a9dcf133f54c0e133fb774def4a7c (patch)
treed767f61ba876436bb90c406aa05a3c8279bc3bf1
parentb361f2bf1484a54dd776f1b67cbd15037201348a (diff)
downloadscummvm-rg350-1a98b49f607a9dcf133f54c0e133fb774def4a7c.tar.gz
scummvm-rg350-1a98b49f607a9dcf133f54c0e133fb774def4a7c.tar.bz2
scummvm-rg350-1a98b49f607a9dcf133f54c0e133fb774def4a7c.zip
TITANIC: Implement CSummonBots and CRobotController
-rw-r--r--engines/titanic/core/saveable_object.cpp3
-rw-r--r--engines/titanic/module.mk2
-rw-r--r--engines/titanic/npcs/character.h2
-rw-r--r--engines/titanic/npcs/robot_controller.cpp44
-rw-r--r--engines/titanic/npcs/robot_controller.h54
-rw-r--r--engines/titanic/npcs/summon_bots.cpp49
-rw-r--r--engines/titanic/npcs/summon_bots.h56
7 files changed, 209 insertions, 1 deletions
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index 4eb905287e..1cbae873db 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -68,6 +68,7 @@
#include "titanic/npcs/parrot.h"
#include "titanic/npcs/starlings.h"
#include "titanic/npcs/succubus.h"
+#include "titanic/npcs/summon_bots.h"
#include "titanic/npcs/titania.h"
#include "titanic/sound/auto_music_player.h"
@@ -126,6 +127,7 @@ DEFFN(CMaitreD);
DEFFN(CMobile);
DEFFN(CParrot);
DEFFN(CStarlings);
+DEFFN(CSummonBots);
DEFFN(CSuccUBus);
DEFFN(CTitania);
@@ -180,6 +182,7 @@ void CSaveableObject::initClassList() {
ADDFN(CParrot);
ADDFN(CStarlings);
ADDFN(CSuccUBus);
+ ADDFN(CSummonBots);
ADDFN(CTitania);
ADDFN(CAutoMusicPlayer);
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index e1540c25ef..fb24d5018d 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -63,8 +63,10 @@ MODULE_OBJS := \
npcs/maitre_d.o \
npcs/mobile.o \
npcs/parrot.o \
+ npcs/robot_controller.o \
npcs/starlings.o \
npcs/succubus.o \
+ npcs/summon_bots.o \
npcs/titania.o \
npcs/true_talk_npc.o \
sound/auto_music_player.o \
diff --git a/engines/titanic/npcs/character.h b/engines/titanic/npcs/character.h
index 7f489d238f..8e1e87eb95 100644
--- a/engines/titanic/npcs/character.h
+++ b/engines/titanic/npcs/character.h
@@ -54,4 +54,4 @@ public:
} // End of namespace Titanic
-#endif /* TITANIC_SUCCUBUS_H */
+#endif /* TITANIC_CHARACTER_H */
diff --git a/engines/titanic/npcs/robot_controller.cpp b/engines/titanic/npcs/robot_controller.cpp
new file mode 100644
index 0000000000..c6ef4222ef
--- /dev/null
+++ b/engines/titanic/npcs/robot_controller.cpp
@@ -0,0 +1,44 @@
+/* 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 "titanic/npcs/robot_controller.h"
+
+namespace Titanic {
+
+CRobotController::CRobotController() : CGameObject(), _string1("BellBot") {
+}
+
+void CRobotController::save(SimpleFile *file, int indent) const {
+ file->writeNumberLine(1, indent);
+ file->writeQuotedLine(_string1, indent);
+
+ CGameObject::save(file, indent);
+}
+
+void CRobotController::load(SimpleFile *file) {
+ file->readNumber();
+ _string1 = file->readString();
+
+ CGameObject::load(file);
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/npcs/robot_controller.h b/engines/titanic/npcs/robot_controller.h
new file mode 100644
index 0000000000..876285e70d
--- /dev/null
+++ b/engines/titanic/npcs/robot_controller.h
@@ -0,0 +1,54 @@
+/* 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.
+ *
+ */
+
+#ifndef TITANIC_ROBOT_CONTROLLER_H
+#define TITANIC_ROBOT_CONTROLLER_H
+
+#include "titanic/core/game_object.h"
+
+namespace Titanic {
+
+class CRobotController : public CGameObject {
+protected:
+ CString _string1;
+public:
+ CRobotController();
+
+ /**
+ * Return the class name
+ */
+ virtual const char *getClassName() const { return "CRobotController"; }
+
+ /**
+ * Save the data for the class to file
+ */
+ virtual void save(SimpleFile *file, int indent) const;
+
+ /**
+ * Load the data for the class from file
+ */
+ virtual void load(SimpleFile *file);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_ROBOT_CONTROLLER_H */
diff --git a/engines/titanic/npcs/summon_bots.cpp b/engines/titanic/npcs/summon_bots.cpp
new file mode 100644
index 0000000000..661b3f0490
--- /dev/null
+++ b/engines/titanic/npcs/summon_bots.cpp
@@ -0,0 +1,49 @@
+/* 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 "titanic/npcs/summon_bots.h"
+
+namespace Titanic {
+
+CSummonBots::CSummonBots() : CRobotController(), _string2("NULL"),
+ _fieldC8(0), _fieldCC(0) {
+}
+
+void CSummonBots::save(SimpleFile *file, int indent) const {
+ file->writeNumberLine(1, indent);
+ file->writeNumberLine(_fieldC8, indent);
+ file->writeNumberLine(_fieldCC, indent);
+ file->writeQuotedLine(_string2, indent);
+
+ CRobotController::save(file, indent);
+}
+
+void CSummonBots::load(SimpleFile *file) {
+ file->readNumber();
+ _fieldC8 = file->readNumber();
+ _fieldCC = file->readNumber();
+ _string2 = file->readString();
+
+ CRobotController::load(file);
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/npcs/summon_bots.h b/engines/titanic/npcs/summon_bots.h
new file mode 100644
index 0000000000..d525ff69f3
--- /dev/null
+++ b/engines/titanic/npcs/summon_bots.h
@@ -0,0 +1,56 @@
+/* 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.
+ *
+ */
+
+#ifndef TITANIC_SUMMON_BOTS_H
+#define TITANIC_SUMMON_BOTS_H
+
+#include "titanic/npcs/robot_controller.h"
+
+namespace Titanic {
+
+class CSummonBots : public CRobotController {
+protected:
+ CString _string2;
+ int _fieldC8;
+ int _fieldCC;
+public:
+ CSummonBots();
+
+ /**
+ * Return the class name
+ */
+ virtual const char *getClassName() const { return "CSummonBots"; }
+
+ /**
+ * Save the data for the class to file
+ */
+ virtual void save(SimpleFile *file, int indent) const;
+
+ /**
+ * Load the data for the class from file
+ */
+ virtual void load(SimpleFile *file);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_SUMMON_BOTS_H */