[Scummvm-cvs-logs] scummvm master -> 50a34599f384d72c73493da1a10ad5f03575fb05

[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:
50a34599f3 TSAGE: Further bugfixes for R2R Bridge conversations


Commit: 50a34599f384d72c73493da1a10ad5f03575fb05
    https://github.com/scummvm/scummvm/commit/50a34599f384d72c73493da1a10ad5f03575fb05
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-06T12:06:44-07:00

Commit Message:
TSAGE: Further bugfixes for R2R Bridge conversations

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



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 9828ca7..4927e02 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -836,6 +836,17 @@ void StripManager::signal() {
 				break;
 			}
 		}
+
+		// If no entry found, get the default response
+		if (!delayFlag) {
+			int idx = 0; 
+			while (obj44._list[idx + 1]._id)
+				++idx;
+
+			choiceList.push_back((const char *)&_script[0] + obj44._list[idx]._scriptOffset);
+			strIndex = idx;
+			delayFlag = true;
+		}
 	} else {
 		// Standard choices loading
 		for (idx = 0; idx < OBJ0A_LIST_SIZE; ++idx) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index c6d590e..fd62575 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3514,7 +3514,7 @@ void Scene300::signal() {
 				R2_GLOBALS.setFlag(40);
 			break;
 		case 5:
-			if (R2_GLOBALS._stripManager_lookupList[1] == 6)
+			if (R2_GLOBALS._stripManager_lookupList[0] == 6)
 				R2_GLOBALS.setFlag(40);
 			break;
 		case 6:
@@ -3686,6 +3686,8 @@ void Scene300::signal() {
 }
 
 void Scene300::signal309() {
+	// Sets up what conversation items will be available when to talking to the
+	// others on the Bridge, and will be set dependent on game flags
 	if (R2_GLOBALS.getFlag(2))
 		R2_GLOBALS._stripManager_lookupList[0] = (R2_INVENTORY.getObjectScene(R2_READER) == 1) ? 3 : 2;