[Scummvm-cvs-logs] scummvm master -> 9df846afc393dc00ba954bc058abb5cb9869c3dc

[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:
9df846afc3 TSAGE: Bugfixes for R2R space scenes to be full screen


Commit: 9df846afc393dc00ba954bc058abb5cb9869c3dc
    https://github.com/scummvm/scummvm/commit/9df846afc393dc00ba954bc058abb5cb9869c3dc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-09T17:38:04-07:00

Commit Message:
TSAGE: Bugfixes for R2R space scenes to be full screen

Changed paths:
    engines/tsage/ringworld2/ringworld2_logic.cpp
    engines/tsage/ringworld2/ringworld2_scenes1.cpp
    engines/tsage/saveload.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 1e9d622..f0d7739 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -114,6 +114,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1020:
 		return new Scene1020();
 	case 1100:
+		// Canyon
 		return new Scene1100();
 	case 1200:
 		// ARM Base - Air Ducts Maze
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 29bef2c..2a38d00 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -478,10 +478,11 @@ void Scene1000::dispatch() {
  *--------------------------------------------------------------------------*/
 
 void Scene1010::postInit(SceneObjectList *OwnerList) {
-	SceneExt::postInit();
 	loadScene(1010);
-
+	SceneExt::postInit();
+	R2_GLOBALS._interfaceY = 200;
 	R2_GLOBALS._uiElements._active = false;
+
 	setZoomPercents(100, 1, 160, 100);
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.setObjectWrapper(NULL);
@@ -537,12 +538,13 @@ void Scene1010::signal() {
  *
  *--------------------------------------------------------------------------*/
 void Scene1020::postInit(SceneObjectList *OwnerList) {
-	SceneExt::postInit();
 	loadScene(1020);
+	SceneExt::postInit();
 
 	if (R2_GLOBALS._sceneManager._previousScene == 1010)
-		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+		_sceneBounds = Rect(160, 0, SCREEN_WIDTH + 160, 200);
 
+	R2_GLOBALS._interfaceY = 200;
 	R2_GLOBALS._v558B6.set(160, 0, 160, 161);
 	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._player.postInit();
diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp
index 7143305..dbc122e 100644
--- a/engines/tsage/saveload.cpp
+++ b/engines/tsage/saveload.cpp
@@ -151,8 +151,9 @@ Common::Error Saver::save(int slot, const Common::String &saveName) {
 
 	// Save each registered SaveObject descendant object into the savegame file
 	for (SynchronizedList<SavedObject *>::iterator i = _objList.begin(); i != _objList.end(); ++i) {
-		serializer.validate((*i)->getClassName());
-		(*i)->synchronize(serializer);
+		SavedObject *so = *i;
+		serializer.validate(so->getClassName());
+		so->synchronize(serializer);
 	}
 
 	// Save file complete