[Scummvm-cvs-logs] scummvm master -> 6633232467168fc4f4341a2cc03a53d79f0553b1

[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:
6633232467 TSAGE: Fix for R2R bridge character conversations


Commit: 6633232467168fc4f4341a2cc03a53d79f0553b1
    https://github.com/scummvm/scummvm/commit/6633232467168fc4f4341a2cc03a53d79f0553b1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-07T15:22:03-07:00

Commit Message:
TSAGE: Fix for R2R bridge character conversations

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 fb7e42f..1626c4a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3005,7 +3005,7 @@ bool Scene300::Miranda::startAction(CursorType action, Event &event) {
 				if (!R2_GLOBALS.getFlag(57)) {
 					R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 					scene->_stripManager.start3(434, scene, R2_GLOBALS._stripManager_lookupList);
-				} else if (R2_GLOBALS._player._characterScene[R2_MIRANDA] != 500) {
+				} else if (R2_GLOBALS._player._characterScene[R2_SEEKER] != 500) {
 					R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 					scene->_stripManager.start3(407, scene, R2_GLOBALS._stripManager_lookupList);
 				} else {
@@ -3138,17 +3138,15 @@ bool Scene300::Quinn::startAction(CursorType action, Event &event) {
 			if (R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500)
 				scene->_stripId = 442;
 			else if (!R2_GLOBALS.getFlag(44))
-				scene->_stripId = 177 + R2_GLOBALS._randomSource.getRandomNumber(2);
+				scene->_stripId = 125 + R2_GLOBALS._randomSource.getRandomNumber(2);
 			else if (!R2_GLOBALS.getFlag(55))
-				scene->_stripId = 208;
+				scene->_stripId = 439;
 			else
-				scene->_stripId = 441;
-		} else if (R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500) {
-			scene->_stripId = 442;
+				scene->_stripId = 210;
 		} else if (R2_GLOBALS.getFlag(44)) {
-			scene->_stripId = R2_GLOBALS.getFlag(55) ? 441 : 208;
+			scene->_stripId = R2_GLOBALS.getFlag(55) ? 439 : 210;
 		} else {
-			scene->_stripId = 125 + R2_GLOBALS._randomSource.getRandomNumber(2);
+			scene->_stripId = 177 + R2_GLOBALS._randomSource.getRandomNumber(2);
 		}
 
 		scene->_stripManager.start3(scene->_stripId, scene, R2_GLOBALS._stripManager_lookupList);