[Scummvm-cvs-logs] scummvm master -> 16c5c6e516a3d03125750e6146cbebc17adc68b3

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8693af39ee TSAGE: Further fix for R2R conversations
16c5c6e516 TSAGE: Scene fixes for R2R Medbay


Commit: 8693af39ee1db3cef71825d179de8e20acafa1eb
    https://github.com/scummvm/scummvm/commit/8693af39ee1db3cef71825d179de8e20acafa1eb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-30T05:59:29-07:00

Commit Message:
TSAGE: Further fix for R2R conversations

Changed paths:
    engines/tsage/converse.cpp



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 7e6c1b3..ec14ff3 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -755,6 +755,8 @@ void StripManager::remove() {
 }
 
 void StripManager::signal() {
+	int strIndex = 0;
+
 	if (_textShown) {
 		_activeSpeaker->removeText();
 		_textShown = false;
@@ -823,6 +825,7 @@ void StripManager::signal() {
 			if (entry._id == entryId) {
 				// Get the next one
 				choiceList.push_back((const char *)&_script[0] + entry._scriptOffset);
+				strIndex = idx;
 				delayFlag = true;
 				break;
 			}
@@ -876,7 +879,6 @@ void StripManager::signal() {
 		}
 	}
 
-	int strIndex = 0;
 	if (choiceList.size() > 1)
 		// Get the user to select a conversation option
 		strIndex = _choiceDialog.execute(choiceList);


Commit: 16c5c6e516a3d03125750e6146cbebc17adc68b3
    https://github.com/scummvm/scummvm/commit/16c5c6e516a3d03125750e6146cbebc17adc68b3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-30T06:00:06-07:00

Commit Message:
TSAGE: Scene fixes for R2R Medbay

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 fd3b01c..9cfa53e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -6351,12 +6351,26 @@ bool Scene800::DeviceSlot::startAction(CursorType action, Event &event) {
 			break;
 
 		R2_GLOBALS._player.disableControl();
-		scene->_reader.postInit();
+		_lookLineNum = 27;
+		scene->_sceneMode = 809;
 
 		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800)
-			scene->setAction(&scene->_sequenceManager1, scene, 814, &R2_GLOBALS._player, &scene->_reader, &scene->_opticalFibre, NULL);
+			scene->setAction(&scene->_sequenceManager1, scene, 815, &R2_GLOBALS._player, &scene->_reader, &scene->_opticalFibre, NULL);
 		else
-			scene->setAction(&scene->_sequenceManager1, scene, 804, &R2_GLOBALS._player, &scene->_reader, NULL);
+			scene->setAction(&scene->_sequenceManager1, scene, 809, &R2_GLOBALS._player, &scene->_reader, NULL);
+		return true;
+	case R2_READER:
+		R2_GLOBALS._player.disableControl();
+		scene->_reader.postInit();
+		scene->_sceneMode = 804;
+
+		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
+			scene->setAction(&scene->_sequenceManager1, scene, 814, &R2_GLOBALS._player, 
+				&scene->_reader, &scene->_opticalFibre, NULL);
+		} else {
+			scene->setAction(&scene->_sequenceManager1, scene, 804, &R2_GLOBALS._player, 
+				&scene->_reader, NULL);
+		}
 		return true;
 	default:
 		break;