STARTREK: Read most strings for the LOV mission from its RDF files

1 files changed, 91 insertions, 91 deletions

diff --git a/engines/startrek/rooms/love2.cpp b/engines/startrek/rooms/love2.cpp
index b4cbb3392d..8419db5c9c 100644
--- a/engines/startrek/rooms/love2.cpp
+++ b/engines/startrek/rooms/love2.cpp
@@ -195,65 +195,65 @@ void Room::love2DoorReachedOrOpened() {
 }
 
 void Room::love2LookAtCabinet() {
-	showDescription(TX_LOV2N027);
+	showDescription(27, true);
 }
 
 void Room::love2LookAtDoor() {
-	showDescription(TX_LOV2N001);
+	showDescription(1, true);
 }
 
 void Room::love2LookAtSynthesizer() {
-	showDescription(TX_LOV2N028);
+	showDescription(28, true);
 }
 
 void Room::love2LookAtAnywhere() {
-	showDescription(TX_LOV2N026);
+	showDescription(26, true);
 }
 
 void Room::love2LookAtAntigrav() {
-	showDescription(TX_LOV2N006);
+	showDescription(6, true);
 }
 
 void Room::love2LookAtMccoy() {
-	showDescription(TX_LOV2N011);
+	showDescription(11, true);
 }
 
 void Room::love2LookAtSpock() {
-	showDescription(TX_LOV2N014);
+	showDescription(14, true);
 }
 
 void Room::love2LookAtRedshirt() {
-	showDescription(TX_LOV2N010);
+	showDescription(10, true);
 }
 
 void Room::love2LookAtKirk() {
-	showDescription(TX_LOV2N009);
+	showDescription(9, true);
 }
 
 void Room::love2LookAtArdak() {
-	showDescription(TX_LOV2N045);
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_037);
+	showDescription(45, true);
+	showText(TX_SPEAKER_SPOCK, 37, true);
 }
 
 void Room::love2LookAtChamber() {
-	showDescription(TX_LOV2N029);
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_035);
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_019);
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_033);
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_016);
+	showDescription(29, true);
+	showText(TX_SPEAKER_SPOCK, 35, true);
+	showText(TX_SPEAKER_MCCOY, 19, true);
+	showText(TX_SPEAKER_SPOCK, 33, true);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::love2LookAtCan1() {
 	switch (_awayMission->love.canister1) {
 	case CANTYPE_O2:
-		showDescription(TX_LOV2N004);
+		showDescription(4, true);
 		break;
 	case CANTYPE_H2:
-		showDescription(TX_LOV2N002);
+		showDescription(2, true);
 		break;
 	case CANTYPE_N2:
 	default:
-		showDescription(TX_LOV2N003);
+		showDescription(3, true);
 		break;
 	}
 }
@@ -261,37 +261,37 @@ void Room::love2LookAtCan1() {
 void Room::love2LookAtCan2() {
 	switch (_awayMission->love.canister2) {
 	case CANTYPE_O2:
-		showDescription(TX_LOV2N004);
+		showDescription(4, true);
 		break;
 	case CANTYPE_H2:
-		showDescription(TX_LOV2N002);
+		showDescription(2, true);
 		break;
 	case CANTYPE_N2:
 	default:
-		showDescription(TX_LOV2N003);
+		showDescription(3, true);
 		break;
 	}
 }
 
 void Room::love2TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_LOV2_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::love2TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_029);
+	showText(TX_SPEAKER_SPOCK, 29, true);
 }
 
 void Room::love2TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_009);
+	showText(TX_SPEAKER_MCCOY, 9, true);
 }
 
 void Room::love2TalkToRedshirt() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV2_041);
+	showText(TX_SPEAKER_FERRIS, 41, true);
 }
 
 void Room::love2UseMTricorderAnywhere() {
 	if (_awayMission->love.knowAboutVirus)
-		mccoyScan(DIR_S, TX_LOV2_008, false);
+		mccoyScan(DIR_S, 8, false, true);
 	else
 		// BUGFIX: should be TX_LOV2_012, but the audio file is missing. Using equivalent
 		// audio from another room.
@@ -299,7 +299,7 @@ void Room::love2UseMTricorderAnywhere() {
 }
 
 void Room::love2UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_LOV2_027, false);
+	spockScan(DIR_S, 27, false, true);
 }
 
 void Room::love2UseKirkOnCabinet() {
@@ -359,11 +359,11 @@ void Room::love2ChangedGasFeed() {
 	if (_awayMission->love.gasFeedOn) {
 		_awayMission->love.gasFeedOn = false;
 		loadActorAnim2(OBJECT_GAS_FEED, "s3r3v2", 0xac, 0x75, 0);
-		showDescription(TX_LOV2N007);
+		showDescription(7, true);
 	} else {
 		_awayMission->love.gasFeedOn = true;
 		loadActorAnim2(OBJECT_GAS_FEED, "s3r3v1", 0xac, 0x75, 0);
-		showDescription(TX_LOV2N008);
+		showDescription(8, true);
 	}
 }
 
@@ -390,14 +390,14 @@ void Room::love2UseN2GasOnCanisterSlot() {
 
 void Room::love2ReachedCanisterSlot() {
 	if (_awayMission->love.gasFeedOn)
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_026);
+		showText(TX_SPEAKER_SPOCK, 26, true);
 	else {
 		if (_awayMission->love.canister1 == CANTYPE_NONE)
 			loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 13);
 		else if (_awayMission->love.canister2 == CANTYPE_NONE)
 			loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 14);
 		else
-			showDescription(TX_LOV2N024);
+			showDescription(24, true);
 	}
 }
 
@@ -405,7 +405,7 @@ void Room::love2PutCanisterInSlot1() {
 	playVoc("SE6FOOD");
 	loadActorAnim(OBJECT_CAN1, _roomVar.love.canisterAnim, 0xa7, 0xae, 0);
 	_awayMission->love.canister1 = _roomVar.love.canisterType;
-	showDescription(TX_LOV2N034);
+	showDescription(34, true);
 	loseItem(_roomVar.love.canisterItem);
 }
 
@@ -413,7 +413,7 @@ void Room::love2PutCanisterInSlot2() {
 	playVoc("SE6FOOD");
 	loadActorAnim(OBJECT_CAN2, _roomVar.love.canisterAnim, 0xb1, 0xaf, 0);
 	_awayMission->love.canister2 = _roomVar.love.canisterType;
-	showDescription(TX_LOV2N035);
+	showDescription(35, true);
 	loseItem(_roomVar.love.canisterItem);
 }
 
@@ -423,7 +423,7 @@ void Room::love2UseAntigravOnCanister1() {
 
 void Room::love2ReachedCanisterSlot1ToGet() {
 	if (_awayMission->love.gasFeedOn)
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_025);
+		showText(TX_SPEAKER_SPOCK, 25, true);
 	else {
 		loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 15);
 		// BUGFIX: original game only played this for canister 2
@@ -432,7 +432,7 @@ void Room::love2ReachedCanisterSlot1ToGet() {
 }
 
 void Room::love2TookCanister1() {
-	showDescription(TX_LOV2N030);
+	showDescription(30, true);
 	loadActorStandAnim(OBJECT_CAN1);
 
 	switch (_awayMission->love.canister1) {
@@ -457,7 +457,7 @@ void Room::love2UseAntigravOnCanister2() {
 
 void Room::love2ReachedCanisterSlot2ToGet() {
 	if (_awayMission->love.gasFeedOn)
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_025);
+		showText(TX_SPEAKER_SPOCK, 25, true);
 	else {
 		loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 16);
 		playVoc("SE3PLBAT");
@@ -465,7 +465,7 @@ void Room::love2ReachedCanisterSlot2ToGet() {
 }
 
 void Room::love2TookCanister2() {
-	showDescription(TX_LOV2N031);
+	showDescription(31, true);
 	loadActorStandAnim(OBJECT_CAN2);
 
 	switch (_awayMission->love.canister2) {
@@ -515,13 +515,13 @@ void Room::love2CrewmanUsedSynthesizer() {
 	} else {
 		if (_roomVar.love.cb == 3) {
 			if (haveItem(OBJECT_IWRENCH)) {
-				showText(TX_SPEAKER_SPOCK, TX_LOV2_005);
+				showText(TX_SPEAKER_SPOCK, 5, true);
 				walkCrewman(OBJECT_SPOCK, 0xa8, 0xb7, 16);
 			} else
-				showText(TX_SPEAKER_SPOCK, TX_LOV2_006);
+				showText(TX_SPEAKER_SPOCK, 6, true);
 		} else {
 			_roomVar.love.cb++;
-			showDescription(TX_LOV2N012);
+			showDescription(12, true);
 		}
 	}
 }
@@ -535,7 +535,7 @@ void Room::love2SpockEnabledGasFeeds() {
 	_awayMission->love.gasFeedOn = true;
 
 	loadActorAnim2(OBJECT_GAS_FEED, "s3r3v1", 0xac, 0x75, 0);
-	showDescription(TX_LOV2N008);
+	showDescription(8, true);
 	walkCrewman(OBJECT_SPOCK, 0xc6, 0xbb, 0);
 
 	love2UseSynthesizer();
@@ -562,21 +562,21 @@ void Room::love2UseSynthesizer() {
 					break;
 
 				case SYNTHITEM_VIRUS_SAMPLE: // Wet goo
-					showDescription(TX_LOV2N051);
-					showText(TX_SPEAKER_KIRK, TX_LOV2_002);
+					showDescription(51, true);
+					showText(TX_SPEAKER_KIRK, 2, true);
 					loadActorStandAnim(OBJECT_VIRUSSAMPLE);
 					goto closeSynthesizerDoor;
 
 				case SYNTHITEM_CURE_SAMPLE: // Wet goo
 wetGooFailure:
-					showDescription(TX_LOV2N050);
-					showText(TX_SPEAKER_MCCOY, TX_LOV2_021);
+					showDescription(50, true);
+					showText(TX_SPEAKER_MCCOY, 21, true);
 					loadActorStandAnim(OBJECT_CURESAMPLE);
 					goto closeSynthesizerDoor;
 
 				case SYNTHITEM_BOTTLE: // Nothing happens
 bottleFailure:
-					showText(TX_SPEAKER_SPOCK, TX_LOV2_028);
+					showText(TX_SPEAKER_SPOCK, 28, true);
 					break;
 
 				case SYNTHITEM_NONE: // Water
@@ -598,15 +598,15 @@ closeSynthesizerDoor:
 				switch (_awayMission->love.synthesizerContents) {
 				case SYNTHITEM_PBC: // Inert matter
 inertMatterFailure:
-					showDescription(TX_LOV2N049);
-					showText(TX_SPEAKER_SPOCK, TX_LOV2_039); // BUGFIX: original didn't play audio
+					showDescription(49, true);
+					showText(TX_SPEAKER_SPOCK, 39, true); // BUGFIX: original didn't play audio
 					loadActorStandAnim(OBJECT_POLYBERYLCARBONATE);
 					goto closeSynthesizerDoor;
 
 				case SYNTHITEM_VIRUS_SAMPLE: // Colorless goo (with useful information about virus in ammonia)
-					showDescription(TX_LOV2N048);
-					showText(TX_SPEAKER_SPOCK, TX_LOV2_034); // BUGFIX: original didn't play audio
-					showText(TX_SPEAKER_MCCOY, TX_LOV2_023);
+					showDescription(48, true);
+					showText(TX_SPEAKER_SPOCK, 34, true); // BUGFIX: original didn't play audio
+					showText(TX_SPEAKER_MCCOY, 23, true);
 					loadActorStandAnim(OBJECT_VIRUSSAMPLE);
 					goto closeSynthesizerDoor;
 
@@ -631,8 +631,8 @@ inertMatterFailure:
 					goto inertMatterFailure;
 
 				case SYNTHITEM_VIRUS_SAMPLE: // Wet goo
-					showDescription(TX_LOV2N047);
-					showText(TX_SPEAKER_MCCOY, TX_LOV2_017);
+					showDescription(47, true);
+					showText(TX_SPEAKER_MCCOY, 17, true);
 					loadActorStandAnim(OBJECT_VIRUSSAMPLE);
 					goto closeSynthesizerDoor;
 
@@ -651,13 +651,13 @@ inertMatterFailure:
 			}
 		} else {
 			playVoc("EFX24");
-			showDescription(TX_LOV2N005);
-			showText(TX_SPEAKER_MCCOY, TX_LOV2_010);
+			showDescription(5, true);
+			showText(TX_SPEAKER_MCCOY, 10, true);
 		}
 	} else {
 		playVoc("EFX24");
-		showDescription(TX_LOV2N005);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_024);
+		showDescription(5, true);
+		showText(TX_SPEAKER_SPOCK, 24, true);
 	}
 }
 
@@ -671,33 +671,33 @@ void Room::love2SynthesizerDoorClosed() {
 void Room::love2SynthesizerFinished() {
 	switch (_awayMission->love.synthesizerBottleIndex) {
 	case BOTTLETYPE_N2O:
-		showDescription(TX_LOV2N017);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_032);
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_015);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_036);
+		showDescription(17, true);
+		showText(TX_SPEAKER_SPOCK, 32);
+		showText(TX_SPEAKER_MCCOY, 15);
+		showText(TX_SPEAKER_SPOCK, 36);
 		break;
 
 	case BOTTLETYPE_NH3:
-		showDescription(TX_LOV2N016);
+		showDescription(16, true);
 		if (!_awayMission->redshirtDead) {
-			showText(TX_SPEAKER_FERRIS, TX_LOV2_043);
-			showText(TX_SPEAKER_KIRK, TX_LOV2_003);
+			showText(TX_SPEAKER_FERRIS, 43, true);
+			showText(TX_SPEAKER_KIRK, 3, true);
 		}
 		break;
 
 	case BOTTLETYPE_H2O:
-		showDescription(TX_LOV2N018);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_004);
+		showDescription(18, true);
+		showText(TX_SPEAKER_SPOCK, 4, true);
 		break;
 
 	case BOTTLETYPE_RLG:
 	default:
-		showDescription(TX_LOV2N019);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_031);
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_018);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_030);
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_022);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_038);
+		showDescription(19, true);
+		showText(TX_SPEAKER_SPOCK, 31, true);
+		showText(TX_SPEAKER_MCCOY, 18, true);
+		showText(TX_SPEAKER_SPOCK, 30, true);
+		showText(TX_SPEAKER_MCCOY, 22, true);
+		showText(TX_SPEAKER_SPOCK, 38, true);
 		break;
 	}
 }
@@ -719,8 +719,8 @@ void Room::love2CureStartedSynthesizing() {
 }
 
 void Room::love2CureSynthesized() {
-	showDescription(TX_LOV2N046);
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_020);
+	showDescription(46, true);
+	showText(TX_SPEAKER_MCCOY, 20, true);
 }
 
 
@@ -732,7 +732,7 @@ void Room::love2UsePolyberylcarbonateOnSynthesizerDoor() {
 
 void Room::love2KirkReachedSynthesizerWithPolyberylcarbonate() {
 	if (_awayMission->love.synthesizerContents != 0)
-		showDescription(TX_LOV2N025);
+		showDescription(25, true);
 	else {
 		loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d2", 0x8a, 0x8d, 5);
 		playSoundEffectIndex(SND_DOOR1);
@@ -758,7 +758,7 @@ void Room::love2UseVirusSampleOnSynthesizerDoor() {
 
 void Room::love2KirkReachedSynthesizerWithVirusSample() {
 	if (_awayMission->love.synthesizerContents != 0)
-		showDescription(TX_LOV2N025);
+		showDescription(25, true);
 	else {
 		loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d2", 0x8a, 0x8d, 6);
 		playSoundEffectIndex(SND_DOOR1);
@@ -784,7 +784,7 @@ void Room::love2UseCureSampleOnSynthesizerDoor() {
 
 void Room::love2KirkReachedSynthesizerWithCureSample() {
 	if (_awayMission->love.synthesizerContents != 0)
-		showDescription(TX_LOV2N025); // BUGFIX: original didn't play audio
+		showDescription(25, true); // BUGFIX: original didn't play audio
 	else {
 		loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d2", 0x8a, 0x8d, 7);
 		playSoundEffectIndex(SND_DOOR1);
@@ -804,18 +804,18 @@ void Room::love2PutCureSampleInSynthesizer() {
 
 
 void Room::love2UseAnythingOnSynthesizerDoor() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_014);
+	showText(TX_SPEAKER_MCCOY, 14, true);
 }
 
 void Room::love2UseAnythingOnSynthesizer() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::love2GetCanister() {
 	if (_awayMission->redshirtDead)
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_011);
+		showText(TX_SPEAKER_MCCOY, 11, true);
 	else
-		showText(TX_SPEAKER_FERRIS, TX_LOV2_040);
+		showText(TX_SPEAKER_FERRIS, 40, true);
 }
 
 
@@ -831,7 +831,7 @@ void Room::love2ReachedAntigrav() {
 void Room::love2GotAntigrav() {
 	loadActorStandAnim(OBJECT_ANTIGRAV);
 	giveItem(OBJECT_IANTIGRA);
-	showDescription(TX_LOV2N042);
+	showDescription(42, true);
 }
 
 
@@ -847,7 +847,7 @@ void Room::love2ReachedPolyberylcarbonate() {
 
 void Room::love2GotPolyberylcarbonate() {
 	loadActorStandAnim(OBJECT_POLYBERYLCARBONATE);
-	showDescription(TX_LOV2N044);
+	showDescription(44, true);
 	giveItem(OBJECT_IPBC);
 	_awayMission->love.synthesizerContents = 0;
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
@@ -867,7 +867,7 @@ void Room::love2ReachedDishes() {
 
 void Room::love2GotDishes() {
 	loadActorStandAnim(OBJECT_VIRUSSAMPLE);
-	showDescription(TX_LOV2N036); // FIXME: text doesn't match audio
+	showDescription(36, true); // FIXME: text doesn't match audio
 	giveItem(OBJECT_IDISHES);
 	_awayMission->love.synthesizerContents = 0;
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
@@ -887,7 +887,7 @@ void Room::love2ReachedSample() {
 
 void Room::love2GotSample() {
 	loadActorStandAnim(OBJECT_CURESAMPLE);
-	showDescription(TX_LOV2N037);
+	showDescription(37, true);
 	giveItem(OBJECT_ISAMPLE);
 	_awayMission->love.synthesizerContents = 0;
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
@@ -908,23 +908,23 @@ void Room::love2ReachedSynthesizerOutput() {
 void Room::love2GotSynthesizerOutput() {
 	switch (_awayMission->love.synthesizerBottleIndex) {
 	case BOTTLETYPE_N2O:
-		showDescription(TX_LOV2N040);
+		showDescription(40, true);
 		giveItem(OBJECT_IN2O);
 		break;
 
 	case BOTTLETYPE_NH3:
-		showDescription(TX_LOV2N039);
+		showDescription(39, true);
 		giveItem(OBJECT_INH3);
 		break;
 
 	case BOTTLETYPE_H2O:
-		showDescription(TX_LOV2N041);
+		showDescription(41, true);
 		giveItem(OBJECT_IH2O);
 		break;
 
 	case BOTTLETYPE_RLG:
 	default:
-		showDescription(TX_LOV2N038);
+		showDescription(38, true);
 		if (!_awayMission->love.gotTLDH) {
 			_awayMission->love.gotTLDH = true;
 			_awayMission->love.missionScore += 4;
@@ -959,7 +959,7 @@ void Room::love2GotCure() {
 
 	giveItem(OBJECT_ICURE);
 	loadActorStandAnim(OBJECT_CURE);
-	showDescription(TX_LOV2N043);
+	showDescription(43, true);
 
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
 	playSoundEffectIndex(SND_DOOR1);