From dbacaa90a4cc5a35c642130cc3ee3d774566a566 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Apr 2011 10:37:32 +1000
Subject: TSAGE: Compilation fixes for GCC

---
 engines/tsage/converse.cpp          | 2 +-
 engines/tsage/core.cpp              | 5 ++---
 engines/tsage/ringworld_scenes1.cpp | 5 -----
 engines/tsage/ringworld_scenes1.h   | 5 -----
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index a367ce540c..260308a784 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -252,7 +252,7 @@ void SequenceManager::signal() {
 			break;
 		case 30:
 			v1 = getNextValue();
-			_globals->_scrollFollower = (v1 == 0xffff) ? NULL : _objectList[v1];
+			_globals->_scrollFollower = (v1 == -1) ? NULL : _objectList[v1];
 			break;
 		case 31:
 			_sceneObject->setObjectWrapper(new SceneObjectWrapper());
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index c3e47af4e4..798a4fadde 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -145,9 +145,8 @@ InvObjectList::InvObjectList():
 }
 
 void InvObjectList::synchronise(Serialiser &s) {
+	SavedObject::synchronise(s);
 	SYNC_POINTER(_selectedItem);
-
-List<InvObject *> _itemList;
 }
 
 /*--------------------------------------------------------------------------*/
@@ -280,7 +279,7 @@ void ObjectMover::dispatch() {
 	if (dontMove())
 		return;
 
-	_sceneObject->_field6E = NULL;
+	_sceneObject->_field6E = 0;
 	if (_moveDelta.x >= _moveDelta.y) {
 		int xAmount = _moveSign.x * _sceneObject->_moveDiff.x * _sceneObject->_percent / 100;
 		if (!xAmount)
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 3facab40ea..e398dc3c98 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -2108,11 +2108,6 @@ void Scene60::Object6::doAction(int action) {
 	}	
 }
 
-void Scene60::SceneObjectExt::synchronise(Serialiser &s) {
-	s.syncAsUint16LE(_state);
-}
-
-
 void Scene60::SlaveObject::doAction(int action) {
 	Scene60 *scene = (Scene60 *)_globals->_sceneManager._scene;
 
diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index 95cf603728..cc3d472fab 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -368,11 +368,6 @@ class Scene60: public Scene {
 	public:
 		virtual void doAction(int action);
 	};
-	class SceneObjectExt: public SceneObject {
-	public:
-		int _state;
-		virtual void synchronise(Serialiser &s);
-	};
 	class Object8: public SceneObjectExt {
 	public:
 		virtual void doAction(int action);
-- 
cgit v1.2.3