From 6e322ebfc5279ee16076b07b82a1dc2c44122b26 Mon Sep 17 00:00:00 2001
From: Matthew Stewart
Date: Thu, 14 Jun 2018 02:19:14 -0400
Subject: STARTREK: TUG3 (mission 2 finished)

---
 engines/startrek/rooms/tug0.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'engines/startrek/rooms/tug0.cpp')

diff --git a/engines/startrek/rooms/tug0.cpp b/engines/startrek/rooms/tug0.cpp
index e90544d57e..4461b226d5 100644
--- a/engines/startrek/rooms/tug0.cpp
+++ b/engines/startrek/rooms/tug0.cpp
@@ -142,14 +142,19 @@ void Room::tug0SpockFinishedUsingWire() {
 
 	showText(TX_SPEAKER_KIRK,  TX_TUG0_010);
 	showText(TX_SPEAKER_MCCOY, TX_TUG0_022);
-	showText(TX_SPEAKER_KIRK,  TX_TUG0_002);
-	showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L009);
-	showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L008);
-
-	if (_vm->_awayMission.tug.haveBomb) {
-		showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L010);
-		showText(TX_SPEAKER_MCCOY,       TX_TUG0_021);
-		showText(TX_SPEAKER_SPOCK,       TX_TUG0_041);
+
+	// BUGFIX: check if the redshirt is dead.
+	if (!_vm->_awayMission.redshirtDead) {
+		showText(TX_SPEAKER_KIRK,  TX_TUG0_002);
+
+		showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L009);
+		showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L008);
+
+		if (_vm->_awayMission.tug.haveBomb) {
+			showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L010);
+			showText(TX_SPEAKER_MCCOY,       TX_TUG0_021);
+			showText(TX_SPEAKER_SPOCK,       TX_TUG0_041);
+		}
 	}
 }
 
-- 
cgit v1.2.3