TITANIC: Further setup of List class

4 files changed, 8 insertions, 29 deletions

diff --git a/engines/titanic/list.cpp b/engines/titanic/list.cpp
deleted file mode 100644
index 2b6496f3b2..0000000000
--- a/engines/titanic/list.cpp
+++ /dev/null
@@ -1,27 +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 "titanic/list.h"
-
-namespace Titanic {
-
-} // End of namespace Titanic
diff --git a/engines/titanic/list.h b/engines/titanic/list.h
index d94ccb99ac..0d3c62e3d2 100644
--- a/engines/titanic/list.h
+++ b/engines/titanic/list.h
@@ -24,11 +24,16 @@
 #define TITANIC_LIST_H
 
 #include "common/scummsys.h"
+#include "common/list.h"
 #include "titanic/saveable_object.h"
 
 namespace Titanic {
 
-class List : public CSaveableObject {
+class ListItem: public CSaveableObject {
+};
+
+class List : public CSaveableObject, Common::List<ListItem *> {
+public:
 
 };
 
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index a2a7722592..bc37fba5ec 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -5,7 +5,6 @@ MODULE_OBJS := \
 	direct_draw.o \
 	font.o \
 	image.o \
-	list.o \
 	main_game_window.o \
 	saveable_object.o \
 	screen_manager.o \
diff --git a/engines/titanic/saveable_object.cpp b/engines/titanic/saveable_object.cpp
index c1b6612d59..8d0e75bef8 100644
--- a/engines/titanic/saveable_object.cpp
+++ b/engines/titanic/saveable_object.cpp
@@ -32,10 +32,12 @@ Common::HashMap<Common::String, CSaveableObject::CreateFunction> *
 #define ADDFN(T) (*_classList)["TEST"] = Function##T
 
 DEFFN(List);
+DEFFN(ListItem);
 
 void CSaveableObject::initClassList() {
 	_classList = new Common::HashMap<Common::String, CreateFunction>();
 	ADDFN(List);
+	ADDFN(ListItem);
 }
 
 void CSaveableObject::freeClassList() {