[Scummvm-cvs-logs] scummvm master -> dcbc2f23998cefeee3bfb1a998f017fcf073a0c7

[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:
dcbc2f2399 TSAGE: Fixes for R2R Bridge and Landing bay


Commit: dcbc2f23998cefeee3bfb1a998f017fcf073a0c7
    https://github.com/scummvm/scummvm/commit/dcbc2f23998cefeee3bfb1a998f017fcf073a0c7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-10T19:07:16-07:00

Commit Message:
TSAGE: Fixes for R2R Bridge and Landing bay

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



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ebb09a7..77856c6 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -90,6 +90,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 600:
 		return new Scene600();
 	case 700:
+		// Lander Bay 2
 		return new Scene700();
 	case 800:
 		// Sick bay
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 2c944f2..288ba6e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2743,7 +2743,7 @@ void Scene250::signal() {
 			R2_GLOBALS._sceneManager.changeScene(300);
 			break;
 		case 139:
-			R2_GLOBALS._sceneManager.changeScene(139);
+			R2_GLOBALS._sceneManager.changeScene(700);
 			break;
 		case 91:
 			R2_GLOBALS._sceneManager.changeScene(850);
@@ -4989,7 +4989,7 @@ bool Scene500::SonicStunner::startAction(CursorType action, Event &event) {
 	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = R2_GLOBALS.getFlag(26) ? 520 : 502;
-		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, this, NULL);
 		return true;
 	} else {
 		return SceneActor::startAction(action, event);
@@ -5078,7 +5078,7 @@ void Scene500::postInit(SceneObjectList *OwnerList) {
 		}
 	}
 
-	if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) != 500) && R2_GLOBALS.getFlag(27)) {
+	if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) == 500) && R2_GLOBALS.getFlag(27)) {
 		_tanks1.postInit();
 		_tanks1.setup(502, 7, 1);
 		_tanks1.setPosition(Common::Point(281, 120));
@@ -5233,7 +5233,7 @@ void Scene500::signal() {
 		R2_GLOBALS._sceneManager.changeScene(700);
 		break;
 	case 501:
-		if (R2_GLOBALS._player._characterScene[R2_QUINN] == 500) {
+		if (R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500) {
 			_stripNumber = 1100;
 			_sceneMode = 523;
 			setAction(&_sequenceManager1, this, 523, &R2_GLOBALS._player, NULL);
@@ -5806,7 +5806,7 @@ void Scene600::dispatch() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 700 -
+ * Scene 700 - Lander Bay 2
  *
  *--------------------------------------------------------------------------*/
 Scene700::Scene700() {