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

dreammaster dreammaster at scummvm.org
Sun May 1 12:40:05 CEST 2011


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

Summary:
77161e231a TSAGE: Fixed NamedHotspot fields to be synchronised to savegames
e1d6b9602c TSAGE: Bugfixes for movement in Scene #9100


Commit: 77161e231a047da4e9f9dc5912bed28729e8d87d
    https://github.com/scummvm/scummvm/commit/77161e231a047da4e9f9dc5912bed28729e8d87d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-01T03:38:24-07:00

Commit Message:
TSAGE: Fixed NamedHotspot fields to be synchronised to savegames

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



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 3196499..c1f1887 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1593,6 +1593,13 @@ void NamedHotspot::setup(const int ys, const int xe, const int ye, const int xs,
 	_globals->_sceneItems.addItems(this, NULL);
 }
 
+void NamedHotspot::synchronise(Serialiser &s) {
+	SceneHotspot::synchronise(s);
+	s.syncAsSint16LE(_resnum);
+	s.syncAsSint16LE(_lookLineNum);
+	s.syncAsSint16LE(_useLineNum);
+}
+
 /*--------------------------------------------------------------------------*/
 
 void SceneObjectWrapper::setSceneObject(SceneObject *so) {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 868649f..c836264 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -435,6 +435,7 @@ public:
 	void setup(const int ys, const int xe, const int ye, const int xs, const int resnum, const int lookLineNum, const int useLineNum);
 	virtual void doAction(int action);
 	virtual Common::String getClassName() { return "NamedHotspot"; }
+	virtual void synchronise(Serialiser &s);
 };
 
 enum AnimateMode {ANIM_MODE_NONE = 0, ANIM_MODE_1 = 1, ANIM_MODE_2 = 2, ANIM_MODE_3 = 3,


Commit: e1d6b9602c1519bb17386771f1ac5b3cb32e847f
    https://github.com/scummvm/scummvm/commit/e1d6b9602c1519bb17386771f1ac5b3cb32e847f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-01T03:38:24-07:00

Commit Message:
TSAGE: Bugfixes for movement in Scene #9100

Changed paths:
    engines/tsage/ringworld_scenes10.cpp



diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index b33a199..5bceddc 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -77,16 +77,16 @@ void Scene9100::dispatch() {
 
 	if (!_action) {
 		if (_globals->_player._position.x < 25) {
-			if (!_globals->getFlag(11)) {
-				scene->_sceneMode = 9106;
-			} else {
-				scene->_sceneMode = 9108;
+			_globals->_player.disableControl();
+			if (!_globals->getFlag(23) || _globals->getFlag(11))
+				_sceneMode = 9106;
+			else {
+				_sceneMode = 9108;
 				_globals->setFlag(11);
 			}
-		} else {
-			scene->_sceneMode = 9106;
+
+			scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &_globals->_player, NULL);
 		}
-		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &_globals->_player, 0);
 	} else {
 		Scene::dispatch();
 	}
@@ -115,8 +115,6 @@ void Scene9100::signal() {
 }
 
 void Scene9100::postInit(SceneObjectList *OwnerList) {
-	Scene9100 *scene = (Scene9100 *)_globals->_sceneManager._scene;
-
 	Scene::postInit();
 	setZoomPercents(0, 100, 200, 100);
 	_object1.postInit();
@@ -146,7 +144,7 @@ void Scene9100::postInit(SceneObjectList *OwnerList) {
 		_object6.setVisage(9111);
 		_object6.setStrip(6);
 		_object6.setFrame(1);
-		_object6.setPosition(Common::Point(138, 166), 0);
+		_object6.setPosition(Common::Point(138, 166));
 		_sceneHotspot3.setup(145, 125, 166, 156, 9100, 40, 43);
 	}
 	_sceneHotspot1.setup(140, 176, 185, 215, 9100, 36, 37);
@@ -163,17 +161,17 @@ void Scene9100::postInit(SceneObjectList *OwnerList) {
 				_sceneMode = 9107;
 			else
 				_sceneMode = 9109;
-			setAction(&scene->_sequenceManager, scene, _sceneMode, &_globals->_player, &_object5, 0);
+			setAction(&_sequenceManager, this, _sceneMode, &_globals->_player, &_object5, NULL);
 		} else {
 			_sceneMode = 9103;
 			_globals->_player.disableControl();
-			setAction(&scene->_sequenceManager, scene, _sceneMode, &_globals->_player, &_object2, &_object3, &_object4, &_object5, 0);
+			setAction(&_sequenceManager, this, _sceneMode, &_globals->_player, &_object2, &_object3, &_object4, &_object5, NULL);
 			_globals->setFlag(20);
 		}
 	} else {
 		_sceneMode = 9102;
 		_globals->_player.disableControl();
-		setAction(&scene->_sequenceManager, scene, _sceneMode, &_globals->_player, &_object2, &_object3, &_object4, &_object5, 0);
+		setAction(&_sequenceManager, this, _sceneMode, &_globals->_player, &_object2, &_object3, &_object4, &_object5, NULL);
 	}
 }
 






More information about the Scummvm-git-logs mailing list