aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-07-11 09:05:50 -0400
committerPaul Gilbert2013-07-11 09:05:50 -0400
commit8b71a631ea392496f618b3f7bddb29963ced3592 (patch)
tree99dd784cf0f24d82670c16373496a441f4f26c44
parentdcbc2f23998cefeee3bfb1a998f017fcf073a0c7 (diff)
downloadscummvm-rg350-8b71a631ea392496f618b3f7bddb29963ced3592.tar.gz
scummvm-rg350-8b71a631ea392496f618b3f7bddb29963ced3592.tar.bz2
scummvm-rg350-8b71a631ea392496f618b3f7bddb29963ced3592.zip
TSAGE: Further fixes for R2R landing bay
-rw-r--r--engines/tsage/globals.cpp3
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes0.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 4589a926c9..372b9b0e82 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -374,6 +374,9 @@ void Ringworld2Globals::reset() {
T2_GLOBALS._uiElements.updateInventory();
T2_GLOBALS._uiElements._active = false;
+ // Set the screen to track the player
+ _scrollFollower = &_player;
+
// Reset fields
Common::fill(&_v1000[0], &_v1000[0x1000], 0);
_v1000Flag = false;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 288ba6eaf7..41e356e013 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4911,7 +4911,7 @@ bool Scene500::Doorway::startAction(CursorType action, Event &event) {
scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL);
} else {
scene->_sceneMode = 500;
- scene->setAction(&scene->_sequenceManager1, scene, 500, &R2_GLOBALS._player, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 500, &R2_GLOBALS._player, this, NULL);
}
return true;