From a3e5c990058e780c9eb92c2fc7b6f13caa0ca14a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 29 Jul 2013 22:24:25 -0400
Subject: TSAGE: Fixes for R2R extended conversations

---
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_speakers.cpp')

diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index bff61bafc4..b8d593b90a 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -252,8 +252,8 @@ void VisualSpeaker::proc16() {
 	_speakerMode = 0;
 	_object1.remove();
 
-	assert(_object2);
-	_object2->show();
+	if (_object2)
+		_object2->show();
 	_object2 = NULL;
 	_fieldF8 = 0;
 }
@@ -1948,7 +1948,7 @@ void SpeakerSeeker300::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) {
+		if (R2_GLOBALS._player._characterIndex == 2) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
-- 
cgit v1.2.3