5 files changed, 156 insertions, 17 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index 6ddb96a8e5..848c737b62 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -20,6 +20,7 @@ MODULE_OBJS := \
 	objects/game_object.o \
 	objects/list.o \
 	objects/message_target.o \
+	objects/movie_clip.o \
 	objects/named_item.o \
 	objects/pet_control.o \
 	objects/project_item.o \
diff --git a/engines/titanic/objects/movie_clip.cpp b/engines/titanic/objects/movie_clip.cpp
new file mode 100644
index 0000000000..2910051ce8
--- /dev/null
+++ b/engines/titanic/objects/movie_clip.cpp
@@ -0,0 +1,68 @@
+/* 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/objects/movie_clip.h"
+
+namespace Titanic {
+
+CMovieClip::CMovieClip() {
+}
+
+void CMovieClip::save(SimpleFile *file, int indent) const {
+	file->writeNumberLine(2, indent);
+	file->writeQuotedLine("Clip", indent);
+	file->writeQuotedLine(_string1, indent);
+	file->writeNumberLine(_field18, indent);
+	file->writeNumberLine(_field1C, indent);
+
+	ListItem::save(file, indent);
+}
+
+void CMovieClip::load(SimpleFile *file) {
+	int val = file->readNumber();
+
+	switch (val) {
+	case 1:
+		_string1 = file->readString();
+		_field18 = file->readNumber();
+		_field1C = file->readNumber();
+		_field20 = file->readNumber();
+		_field24 = file->readNumber();
+		_field28 = file->readNumber();
+		_field2C = file->readNumber();
+		_field30 = file->readNumber();
+		break;
+
+	case 2:
+		_string1 = file->readString();
+		_field18 = file->readNumber();
+		_field1C = file->readNumber();
+		break;
+
+	default:
+		break;
+	}
+
+	ListItem::load(file);
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/objects/movie_clip.h b/engines/titanic/objects/movie_clip.h
new file mode 100644
index 0000000000..18446c6dc2
--- /dev/null
+++ b/engines/titanic/objects/movie_clip.h
@@ -0,0 +1,82 @@
+/* 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_MOVIE_CLIP_H
+#define TITANIC_MOVIE_CLIP_H
+
+#include "titanic/objects/list.h"
+
+namespace Titanic {
+
+/**
+ * Movie clip item
+ */
+class CMovieClipItem : public ListItem {
+public:
+	virtual const char *getClassName() const { return "CMovieClipItem"; }
+};
+
+/**
+ * Movie clip list
+ */
+class CMovieClipList: public List<CMovieClipItem> {
+public:
+	virtual const char *getClassName() const { return "CMovieClipList"; }
+};
+
+/**
+ * Movie clip
+ */
+class CMovieClip : public ListItem {
+private:
+	CString _string1;
+	int _field18;
+	int _field1C;
+	int _field20;
+	int _field24;
+	int _field28;
+	int _field2C;
+	int _field30;
+	CString _string2;
+	CString _string3;
+public:
+	CMovieClip();
+
+	/**
+	 * Return the class name
+	 */
+	virtual const char *getClassName() const { return "CMovieClip"; }
+
+	/**
+	 * 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_MOVIE_CLIP_H */
diff --git a/engines/titanic/objects/saveable_object.cpp b/engines/titanic/objects/saveable_object.cpp
index f2f38f3dfb..adc03697a5 100644
--- a/engines/titanic/objects/saveable_object.cpp
+++ b/engines/titanic/objects/saveable_object.cpp
@@ -24,6 +24,7 @@
 #include "titanic/objects/file_item.h"
 #include "titanic/objects/list.h"
 #include "titanic/objects/message_target.h"
+#include "titanic/objects/movie_clip.h"
 #include "titanic/objects/project_item.h"
 #include "titanic/objects/tree_item.h"
 #include "titanic/rooms/room_item.h"
@@ -42,6 +43,7 @@ DEFFN(CTreeItem);
 DEFFN(CFileItem);
 DEFFN(CProjectItem);
 DEFFN(CRoomItem);
+DEFFN(CMovieClip);
 DEFFN(CMovieClipItem);
 DEFFN(CMovieClipList);
 
@@ -53,6 +55,7 @@ void CSaveableObject::initClassList() {
 	ADDFN(CFileItem);
 	ADDFN(CProjectItem);
 	ADDFN(CRoomItem);
+	ADDFN(CMovieClip);
 	ADDFN(CMovieClipItem);
 	ADDFN(CMovieClipList);
 }
diff --git a/engines/titanic/rooms/room_item.h b/engines/titanic/rooms/room_item.h
index bb8bbb8619..4df14aae7d 100644
--- a/engines/titanic/rooms/room_item.h
+++ b/engines/titanic/rooms/room_item.h
@@ -25,27 +25,12 @@
 
 #include "common/rect.h"
 #include "titanic/objects/list.h"
-#include "titanic/objects/resource_key.h"
+#include "titanic/objects/movie_clip.h"
 #include "titanic/objects/named_item.h"
+#include "titanic/objects/resource_key.h"
 
 namespace Titanic {
 
-/**
- * Movie clip item
- */
-class CMovieClipItem : public ListItem {
-public:
-	virtual const char *getClassName() const { return "CMovieClipItem"; }
-};
-
-/**
- * Movie clip list
- */
-class CMovieClipList: public List<CMovieClipItem> {
-public:
-	virtual const char *getClassName() const { return "CMovieClipList"; }
-};
-
 class CRoomItem : public CNamedItem {
 private:
 	Common::Rect _roomRect;