aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2013-10-09 20:38:04 -0400
committerPaul Gilbert2013-10-09 20:38:04 -0400
commit9df846afc393dc00ba954bc058abb5cb9869c3dc (patch)
treecbec2cff71a74a926f5f6fe404cd525b59ead2e2 /engines
parent51cb75572667b5a4e6c96fcb8741fedf12bb6056 (diff)
downloadscummvm-rg350-9df846afc393dc00ba954bc058abb5cb9869c3dc.tar.gz
scummvm-rg350-9df846afc393dc00ba954bc058abb5cb9869c3dc.tar.bz2
scummvm-rg350-9df846afc393dc00ba954bc058abb5cb9869c3dc.zip
TSAGE: Bugfixes for R2R space scenes to be full screen
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/ringworld2/ringworld2_logic.cpp1
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp10
-rw-r--r--engines/tsage/saveload.cpp5
3 files changed, 10 insertions, 6 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 1e9d6229e7..f0d7739f54 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 29bef2ccb2..2a38d0009c 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 7143305586..dbc122e6e4 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