TSAGE: Reverted change to SceneItemList class

scummvm · Aug 18, 2013 · d58efe3 · d58efe3
1 parent 3bdc857
commit d58efe3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
@@ -782,7 +782,7 @@ class ScenePriorities : public Common::List<Region> {
 
 /*--------------------------------------------------------------------------*/
 
-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
@@ -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;