[Scummvm-cvs-logs] scummvm master -> 8b71a631ea392496f618b3f7bddb29963ced3592

[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:
8b71a631ea TSAGE: Further fixes for R2R landing bay


Commit: 8b71a631ea392496f618b3f7bddb29963ced3592
    https://github.com/scummvm/scummvm/commit/8b71a631ea392496f618b3f7bddb29963ced3592
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-11T06:05:50-07:00

Commit Message:
TSAGE: Further fixes for R2R landing bay

Changed paths:
    engines/tsage/globals.cpp
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 4589a92..372b9b0 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 288ba6e..41e356e 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;