[Scummvm-cvs-logs] scummvm master -> d58efe38185885548e7bc4d334deebffd152e8be

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d58efe3818 TSAGE: Reverted change to SceneItemList class


Commit: d58efe38185885548e7bc4d334deebffd152e8be
    https://github.com/scummvm/scummvm/commit/d58efe38185885548e7bc4d334deebffd152e8be
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-08-18T13:58:04-07:00

Commit Message:
TSAGE: Reverted change to SceneItemList class

Changed paths:
    engines/tsage/core.h
    engines/tsage/ringworld2/ringworld2_logic.cpp



diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 95eefac..f7a5a43 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 e007081..a409a30 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;