[Scummvm-cvs-logs] scummvm master -> 3c6aaaa1fb51698f1663237e7732e3efcf2b0931

[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:
3c6aaaa1fb TSAGE: Fix for leaving bridge in R2R scene 300


Commit: 3c6aaaa1fb51698f1663237e7732e3efcf2b0931
    https://github.com/scummvm/scummvm/commit/3c6aaaa1fb51698f1663237e7732e3efcf2b0931
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-08-17T19:12:54-07:00

Commit Message:
TSAGE: Fix for leaving bridge in R2R scene 300

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 8d35fc7..e64e910 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3142,7 +3142,7 @@ bool Scene300::Doorway::startAction(CursorType action, Event &event) {
 
 	if (action == CURSOR_USE) {
 		if ((R2_GLOBALS._player._characterIndex == R2_QUINN) &&
-				(!R2_GLOBALS.getFlag(44) || R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500)) {
+				(!R2_GLOBALS.getFlag(44) || R2_GLOBALS._player._characterScene[R2_SEEKER] == 500)) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 301;
 			scene->setAction(&scene->_sequenceManager1, scene, 301, &R2_GLOBALS._player, this, NULL);
@@ -3559,7 +3559,7 @@ void Scene300::signal() {
 		break;
 
 	case 16:
-		if (_stripManager._field2E8 == 1) {
+		if (_stripManager._exitMode == 1) {
 			R2_GLOBALS._player.setAction(NULL);
 			R2_GLOBALS._sceneManager.changeScene(1000);
 		} else {