diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index a367ce540c5..260308a7843 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 c3e47af4e43..798a4fadde4 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 _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 3facab40ea5..e398dc3c98a 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 95cf6037286..cc3d472fab6 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);