TSAGE: Reverted change to SceneItemList class

2 files changed, 3 insertions, 2 deletions

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 95eefacd2d..f7a5a43b16 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -782,7 +782,7 @@ public:
 
 /*--------------------------------------------------------------------------*/
 
-class SceneItemList : public SynchronizedList<EventHandler *> {
+class SceneItemList : public SynchronizedList<SceneItem *> {
 public:
 	void addItems(SceneItem *first, ...);
 };
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e007081c8f..a409a30a86 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1429,7 +1429,8 @@ void SceneExit::process(Event &event) {
 /*--------------------------------------------------------------------------*/
 
 void SceneAreaObject::remove() {
-	R2_GLOBALS._sceneItems.remove(this);
+	// TODO: This needs to be investigated.. SceneArea doesn't derive from SceneItem??
+//	R2_GLOBALS._sceneItems.remove(this);
 	_object1.remove();
 	SceneArea::remove();
 	--R2_GLOBALS._insetUp;