diff options
Diffstat (limited to 'engines/startrek')
57 files changed, 920 insertions, 920 deletions
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp index e550d9c1a1..79e6621b72 100644 --- a/engines/startrek/room.cpp +++ b/engines/startrek/room.cpp @@ -409,7 +409,7 @@ int Room::showRoomSpecificText(const char **array) { return _vm->showText(&StarTrekEngine::readTextFromArrayWithChoices, (uintptr)array, 20, 20, textColor, true, false, false); } -int Room::showText(const TextRef *textIDs, bool fromRDF, bool lookWithTalker) { +int Room::showMultipleTexts(const TextRef *textIDs, bool fromRDF, bool lookWithTalker) { int numIDs = 0; int retval; while (textIDs[numIDs] != TX_BLANK) @@ -441,10 +441,10 @@ int Room::showText(TextRef speaker, TextRef text, bool fromRDF, bool lookWithTal textIDs[0] = speaker; textIDs[1] = text; textIDs[2] = TX_BLANK; - return showText(textIDs, fromRDF, lookWithTalker); + return showMultipleTexts(textIDs, fromRDF, lookWithTalker); } -int Room::showText(TextRef text, bool fromRDF, bool lookWithTalker) { +int Room::showDescription(TextRef text, bool fromRDF, bool lookWithTalker) { return showText(TX_NULL, text, fromRDF, lookWithTalker); } diff --git a/engines/startrek/room.h b/engines/startrek/room.h index a5bf463ff3..16e994d56e 100644 --- a/engines/startrek/room.h +++ b/engines/startrek/room.h @@ -188,8 +188,8 @@ private: * Cmd 0x03 */ int showRoomSpecificText(const char **textAddr); - int showText(const TextRef *text, bool fromRDF = false, bool lookWithTalker = false); - int showText(TextRef text, bool fromRDF = false, bool lookWithTalker = false); + int showMultipleTexts(const TextRef *text, bool fromRDF = false, bool lookWithTalker = false); + int showDescription(TextRef text, bool fromRDF = false, bool lookWithTalker = false); int showText(TextRef speaker, TextRef text, bool fromRDF = false, bool lookWithTalker = false); /** diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp index 2aaba6f791..2a16bd5bb1 100644 --- a/engines/startrek/rooms/demon0.cpp +++ b/engines/startrek/rooms/demon0.cpp @@ -162,7 +162,7 @@ void Room::demon0TalkToPrelate() { const TextRef *response = nullptr; - switch (showText(options1, true)) { + switch (showMultipleTexts(options1, true)) { case 0: response = firstResponse0; break; @@ -175,26 +175,26 @@ void Room::demon0TalkToPrelate() { } if (response != nullptr) - showText(response, true); + showMultipleTexts(response, true); - if (showText(options2, true) == 1) + if (showMultipleTexts(options2, true) == 1) demon0BadResponse(); - showText(secondResponse, true); + showMultipleTexts(secondResponse, true); - if (showText(options3, true) == 1) + if (showMultipleTexts(options3, true) == 1) demon0BadResponse(); - showText(thirdResponse, true); + showMultipleTexts(thirdResponse, true); if (_awayMission->demon.wasRudeToPrelate) - showText(badConclusion, true); + showMultipleTexts(badConclusion, true); else - showText(goodConclusion, true); + showMultipleTexts(goodConclusion, true); } void Room::demon0LookAtPrelate() { - showText(4, true); + showDescription(4, true); } void Room::demon0UsePhaserOnSnow() { @@ -222,39 +222,39 @@ void Room::demon0LookAtSign() { } void Room::demon0LookAtTrees() { - showText(6, true); + showDescription(6, true); } void Room::demon0LookAtSnow() { - showText(7, true); + showDescription(7, true); } void Room::demon0LookAnywhere() { - showText(0, true); + showDescription(0, true); } void Room::demon0LookAtBushes() { - showText(10, true); + showDescription(10, true); } void Room::demon0LookAtKirk() { - showText(5, true); + showDescription(5, true); } void Room::demon0LookAtMcCoy() { - showText(2, true); + showDescription(2, true); } void Room::demon0LookAtRedShirt() { - showText(3, true); + showDescription(3, true); } void Room::demon0LookAtSpock() { - showText(9, true); + showDescription(9, true); } void Room::demon0LookAtShelter() { - showText(1, true); + showDescription(1, true); } void Room::demon0TalkToKirk() { diff --git a/engines/startrek/rooms/demon1.cpp b/engines/startrek/rooms/demon1.cpp index 7034d75411..899f76095c 100644 --- a/engines/startrek/rooms/demon1.cpp +++ b/engines/startrek/rooms/demon1.cpp @@ -197,7 +197,7 @@ void Room::demon1KlingonFinishedAimingWeapon() { } void Room::demon1KirkShot() { - showText(0, true); + showDescription(0, true); showGameOverMenu(); } @@ -239,7 +239,7 @@ void Room::demon1KlingonDropsHand() { loadActorAnim(13, "klghnd", 0x10b, 0x8e, 0); _awayMission->disableInput = 0; _awayMission->timers[1] = 0; - showText(20, true); + showDescription(20, true); if (_awayMission->crewDownBitset & (1 << OBJECT_REDSHIRT)) return; @@ -433,79 +433,79 @@ void Room::demon1PickedUpHand() { void Room::demon1FinishedGettingHand() { if (_awayMission->demon.tookKlingonHand) - showText(5, true); + showDescription(5, true); else { _awayMission->demon.tookKlingonHand = true; giveItem(OBJECT_IHAND); - showText(7, true); + showDescription(7, true); } } void Room::demon1LookAtKlingon() { - showText(4, true); + showDescription(4, true); } void Room::demon1LookAtCattails() { - showText(18, true); + showDescription(18, true); } void Room::demon1LookAtTulips() { - showText(10, true); + showDescription(10, true); } void Room::demon1LookAtPods() { - showText(19, true); + showDescription(19, true); } void Room::demon1LookAtFerns() { - showText(9, true); + showDescription(9, true); } void Room::demon1LookAtStream() { - showText(11, true); + showDescription(11, true); } void Room::demon1LookAtMine() { - showText(21, true); + showDescription(21, true); } void Room::demon1LookAtMountain() { - showText(16, true); + showDescription(16, true); } void Room::demon1LookAtHand() { - showText(23, true); + showDescription(23, true); } void Room::demon1LookAnywhere() { - showText(17, true); + showDescription(17, true); } void Room::demon1LookAtKirk() { if (_awayMission->crewDownBitset & (1 << OBJECT_KIRK)) - showText(12, true); + showDescription(12, true); else - showText(3, true); + showDescription(3, true); } void Room::demon1LookAtSpock() { if (_awayMission->crewDownBitset & (1 << OBJECT_SPOCK)) - showText(15, true); + showDescription(15, true); else - showText(8, true); + showDescription(8, true); } void Room::demon1LookAtMcCoy() { if (_awayMission->crewDownBitset & (1 << OBJECT_MCCOY)) - showText(13, true); + showDescription(13, true); else - showText(1, true); + showDescription(1, true); } void Room::demon1LookAtRedshirt() { if (_awayMission->crewDownBitset & (1 << OBJECT_REDSHIRT)) - showText(14, true); + showDescription(14, true); else - showText(2, true); + showDescription(2, true); } void Room::demon1TalkToKirk() { diff --git a/engines/startrek/rooms/demon2.cpp b/engines/startrek/rooms/demon2.cpp index a0b7f88ae7..fbaca93cce 100644 --- a/engines/startrek/rooms/demon2.cpp +++ b/engines/startrek/rooms/demon2.cpp @@ -42,47 +42,47 @@ void Room::demon2TouchedWarp1() { } void Room::demon2LookAtCave() { - showText(9, true); + showDescription(9, true); } void Room::demon2LookAtMountain() { - showText(7, true); + showDescription(7, true); } void Room::demon2LookAtBerries() { - showText(12, true); + showDescription(12, true); } void Room::demon2LookAtFern() { - showText(5, true); + showDescription(5, true); } void Room::demon2LookAtMoss() { - showText(10, true); + showDescription(10, true); } void Room::demon2LookAtLights() { - showText(6, true); + showDescription(6, true); } void Room::demon2LookAtAnything() { - showText(11, true); + showDescription(11, true); } void Room::demon2LookAtKirk() { - showText(2, true); + showDescription(2, true); } void Room::demon2LookAtSpock() { - showText(4, true); + showDescription(4, true); } void Room::demon2LookAtMcCoy() { - showText(3, true); + showDescription(3, true); } void Room::demon2LookAtRedshirt() { - showText(0, true); + showDescription(0, true); } void Room::demon2TalkToKirk() { @@ -164,7 +164,7 @@ void Room::demon2ReachedBerries() { } void Room::demon2PickedUpBerries() { - showText(13, true); + showDescription(13, true); giveItem(OBJECT_IBERRY); _awayMission->demon.gotBerries = true; _awayMission->demon.missionScore += 1; diff --git a/engines/startrek/rooms/demon3.cpp b/engines/startrek/rooms/demon3.cpp index a0120d8bec..1218292bfb 100644 --- a/engines/startrek/rooms/demon3.cpp +++ b/engines/startrek/rooms/demon3.cpp @@ -85,13 +85,13 @@ void Room::demon3Timer1Expired() { // Door just opened void Room::demon3Timer3Expired() { if (_awayMission->demon.repairedHand) { - showText(8, true); + showDescription(8, true); loadActorAnim(14, "door", 0x82, 0xc, 0); loadMapFile("demon3"); _awayMission->demon.doorOpened = true; _awayMission->demon.missionScore += 2; } else { - showText(7, true); + showDescription(7, true); } } @@ -357,7 +357,7 @@ void Room::demon3RedshirtUsedPanel() { TX_BLANK }; text[1] = textTable[_awayMission->demon.field41 - 1]; - showText(text, true); + showMultipleTexts(text, true); walkCrewman(OBJECT_REDSHIRT, 0xbe, 0x9b, 0); } } @@ -388,7 +388,7 @@ void Room::demon3UsePhaserOnDoor() { _roomVar.demon.usedPhaserOnDoor++; if (_roomVar.demon.usedPhaserOnDoor == 1) - showText(9, true); + showDescription(9, true); else if (_roomVar.demon.usedPhaserOnDoor == 2) showText(TX_SPEAKER_SPOCK, 11, true); } @@ -491,72 +491,72 @@ void Room::demon3TalkToRedshirt() { } void Room::demon3LookAtKirk() { - showText(4, true); + showDescription(4, true); } void Room::demon3LookAtSpock() { - showText(1, true); + showDescription(1, true); } void Room::demon3LookAtMccoy() { - showText(2, true); + showDescription(2, true); } void Room::demon3LookAtRedshirt() { if (_awayMission->redshirtDead) { - showText(17, true); + showDescription(17, true); // NOTE: there's an alternate string that isn't used? (TX_DEM3N018) } else { - showText(3, true); + showDescription(3, true); } } void Room::demon3LookAnywhere() { - showText(10, true); + showDescription(10, true); } void Room::demon3LookAtMiner() { if (_awayMission->demon.healedMiner) { - showText(0, true); + showDescription(0, true); } else { - showText(6, true); + showDescription(6, true); } } void Room::demon3LookAtBoulder1() { - showText(11, true); + showDescription(11, true); } void Room::demon3LookAtBoulder2() { - showText(13, true); + showDescription(13, true); } void Room::demon3LookAtBoulder3() { - showText(13, true); + showDescription(13, true); } void Room::demon3LookAtBoulder4() { - showText(20, true); + showDescription(20, true); } void Room::demon3LookAtStructure() { - showText(16, true); + showDescription(16, true); } void Room::demon3LookAtDoor() { if (_awayMission->demon.doorOpened) { - showText(14, true); + showDescription(14, true); } else { - showText(12, true); + showDescription(12, true); } } void Room::demon3LookAtPanel() { - showText(19, true); + showDescription(19, true); } void Room::demon3LookAtLight() { - showText(15, true); + showDescription(15, true); } } diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp index bd1717411d..515946bc0d 100644 --- a/engines/startrek/rooms/demon4.cpp +++ b/engines/startrek/rooms/demon4.cpp @@ -60,7 +60,7 @@ void Room::demon4FinishedAnimation1() { void Room::demon4FinishedAnimation2() { if (!_roomVar.demon.cd) { _roomVar.demon.cd = true; - showText(11, true); + showDescription(11, true); } showGameOverMenu(); @@ -164,7 +164,7 @@ void Room::demon4KirkReachedSecurityEquipment() { void Room::demon4KirkFinishedUsingSecurityEquipment() { _awayMission->disableInput = false; - showText(14, true); + showDescription(14, true); } void Room::demon4UseMetalOnNauian() { @@ -187,7 +187,7 @@ void Room::demon4KirkReachedNauianWithSkull() { showText(TX_SPEAKER_NAUIAN, 36, true); const TextRef choices[] = { TX_SPEAKER_KIRK, 6, 3, 5, TX_BLANK }; - int choice = showText(choices, true); + int choice = showMultipleTexts(choices, true); switch (choice) { case 0: @@ -203,7 +203,7 @@ void Room::demon4KirkReachedNauianWithSkull() { break; default: - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); break; } } @@ -228,7 +228,7 @@ void Room::demon4TalkToNauian() { showText(TX_SPEAKER_NAUIAN, 44, true); const TextRef choices[] = { TX_SPEAKER_KIRK, 2, 4, 9, TX_BLANK }; - int choice = showText(choices, true); + int choice = showMultipleTexts(choices, true); switch (choice) { case 0: @@ -244,14 +244,14 @@ void Room::demon4TalkToNauian() { break; default: - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); break; } showText(TX_SPEAKER_NAUIAN, 43, true); const TextRef choices2[] = { TX_SPEAKER_KIRK, 8, 7, TX_BLANK }; - choice = showText(choices2, true); + choice = showMultipleTexts(choices2, true); switch (choice) { case 0: @@ -261,7 +261,7 @@ void Room::demon4TalkToNauian() { case 1: break; default: - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); break; } @@ -288,47 +288,47 @@ void Room::demon4TalkToNauian() { } void Room::demon4LookAtPattern() { - showText(2, true); + showDescription(2, true); } void Room::demon4LookAtAlien() { - showText(7, true); + showDescription(7, true); } void Room::demon4LookAnywhere() { - showText(4, true); + showDescription(4, true); } void Room::demon4LookAtSecurityEquipment() { - showText(8, true); + showDescription(8, true); } void Room::demon4LookAtFloor() { - showText(9, true); + showDescription(9, true); } void Room::demon4LookAtKirk() { - showText(3, true); + showDescription(3, true); } void Room::demon4LookAtMccoy() { - showText(0, true); + showDescription(0, true); } void Room::demon4LookAtSpock() { - showText(5, true); + showDescription(5, true); } void Room::demon4LookAtRedshirt() { - showText(1, true); + showDescription(1, true); } void Room::demon4LookAtChamber() { - showText(6, true); + showDescription(6, true); } void Room::demon4LookAtPanel() { - showText(12, true); + showDescription(12, true); } void Room::demon4UseKirkOnPanel() { @@ -366,7 +366,7 @@ void Room::demon4CrewmanReachedPanel() { _awayMission->demon.missionScore += 3; _awayMission->timers[0] = 10; } else - showText(13, true); + showDescription(13, true); walkCrewman(_roomVar.demon.crewmanUsingPanel, 0xae, 0x93, 0); _awayMission->disableInput = false; diff --git a/engines/startrek/rooms/demon5.cpp b/engines/startrek/rooms/demon5.cpp index f0dea9a58f..c1e900df0a 100644 --- a/engines/startrek/rooms/demon5.cpp +++ b/engines/startrek/rooms/demon5.cpp @@ -107,43 +107,43 @@ void Room::demon5UseBerryOnChub() { } void Room::demon5LookAtRoberts() { - showText(1, true); + showDescription(1, true); } void Room::demon5LookAtGrisnash() { - showText(9, true); + showDescription(9, true); } void Room::demon5LookAtStephen() { - showText(3, true); + showDescription(3, true); } void Room::demon5LookAtKirk() { - showText(6, true); + showDescription(6, true); } void Room::demon5LookAtSpock() { - showText(8, true); + showDescription(8, true); } void Room::demon5LookAtMccoy() { - showText(7, true); + showDescription(7, true); } void Room::demon5LookAtRedshirt() { - showText(5, true); + showDescription(5, true); } void Room::demon5LookAtMountain() { - showText(2, true); + showDescription(2, true); } void Room::demon5LookAtCrate() { - showText(4, true); + showDescription(4, true); } void Room::demon5LookAnywhere() { - showText(0, true); + showDescription(0, true); } void Room::demon5LookAtChub() { @@ -159,7 +159,7 @@ void Room::demon5TalkToRoberts() { demon5CheckCompletedStudy(); } } else { - showText(10, true); + showDescription(10, true); } } @@ -177,7 +177,7 @@ void Room::demon5TalkToChub() { demon5CheckCompletedStudy(); } } else { - showText(13, true); + showDescription(13, true); } } @@ -194,7 +194,7 @@ void Room::demon5TalkToGrisnash() { demon5CheckCompletedStudy(); } } else { - showText(11, true); + showDescription(11, true); } } @@ -323,7 +323,7 @@ void Room::demon5CheckCompletedStudy() { } void Room::demon5GetCrate() { - showText(12, true); + showDescription(12, true); } } diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp index 464d5f6fbb..1f6cfd6b5b 100644 --- a/engines/startrek/rooms/demon6.cpp +++ b/engines/startrek/rooms/demon6.cpp @@ -81,63 +81,63 @@ void Room::demon6UsePhaserOnCase() { } void Room::demon6LookAtWorkspace() { - showText(3, true); + showDescription(3, true); } void Room::demon6LookAtCase() { - showText(1, true); + showDescription(1, true); } void Room::demon6LookAtTable() { - showText(7, true); + showDescription(7, true); } void Room::demon6LookAtMineral() { - showText(16, true); + showDescription(16, true); } void Room::demon6LookAtShells() { - showText(11, true); + showDescription(11, true); } void Room::demon6LookAtSkull() { - showText(17, true); + showDescription(17, true); } void Room::demon6LookAtMetal() { - showText(5, true); + showDescription(5, true); } void Room::demon6LookAtMeteor() { - showText(0, true); + showDescription(0, true); } void Room::demon6LookAtMountain() { - showText(2, true); + showDescription(2, true); } void Room::demon6LookAtSynthesizer() { - showText(4, true); + showDescription(4, true); } void Room::demon6LookAtKirk() { - showText(8, true); + showDescription(8, true); } void Room::demon6LookAtSpock() { - showText(15, true); + showDescription(15, true); } void Room::demon6LookAtMccoy() { - showText(9, true); + showDescription(9, true); } void Room::demon6LookAtRedshirt() { - showText(10, true); + showDescription(10, true); } void Room::demon6LookAtComputer() { - showText(6, true); + showDescription(6, true); if (!_awayMission->demon.lookedAtComputer) { _awayMission->demon.lookedAtComputer = true; _awayMission->demon.missionScore++; @@ -145,11 +145,11 @@ void Room::demon6LookAtComputer() { } void Room::demon6LookAnywhere() { - showText(24, true); + showDescription(24, true); } void Room::demon6LookAtStephen() { - showText(21, true); + showDescription(21, true); } void Room::demon6TalkToMccoy() { @@ -193,7 +193,7 @@ void Room::demon6MccoyReachedSynthesizer() { void Room::demon6FinishedMakingHypoDytoxin() { playMidiMusicTracks(-1, -1); - showText(23, true); + showDescription(23, true); showText(TX_SPEAKER_MCCOY, 18, true); giveItem(OBJECT_IDETOXIN); @@ -230,7 +230,7 @@ void Room::demon6SpockFinishedRepairingHand() { // FIXME: doesn't work void Room::demon6UseAnythingOnWorkspace() { - showText(20, true); + showDescription(20, true); } void Room::demon6StephenIsInsulted() { @@ -243,7 +243,7 @@ void Room::demon6StephenDescribesItemsInCase() { while (true) { showText(TX_SPEAKER_STEPHEN, 51, true); TextRef choices2[] = { TX_SPEAKER_STEPHEN, 45, 46, 47, 48, 49, 50, TX_BLANK }; - TextRef choice = showText(choices2, true); + TextRef choice = showMultipleTexts(choices2, true); switch (choice) { case 0: @@ -266,7 +266,7 @@ void Room::demon6StephenDescribesItemsInCase() { _roomVar.demon.caseOpened = true; return; default: - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); } } } @@ -277,7 +277,7 @@ void Room::demon6UseCrewmanOnCase() { return; showText(TX_SPEAKER_STEPHEN, 44, true); TextRef choices1[] = {TX_SPEAKER_KIRK, 1, 6, 3, TX_BLANK}; - TextRef choice = showText(choices1, true); + TextRef choice = showMultipleTexts(choices1, true); if (choice == 0) { demon6StephenIsInsulted(); @@ -287,19 +287,19 @@ void Room::demon6UseCrewmanOnCase() { } else if (choice == 2) { showText(TX_SPEAKER_STEPHEN, 31, true); TextRef choices3[] = {TX_SPEAKER_KIRK, 1, 6, TX_BLANK}; - choice = showText(choices3, true); + choice = showMultipleTexts(choices3, true); if (choice == 0) demon6StephenIsInsulted(); else if (choice == 1) demon6StephenDescribesItemsInCase(); else - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); } else { - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); } } else { - showText(12, true); + showDescription(12, true); showText(TX_SPEAKER_MCCOY, 19, true); } } @@ -348,7 +348,7 @@ void Room::demon6UseMetalOnStephen() { void Room::demon6ReturnItemToStephen(int item) { loseItem(item); - showText(19, true); + showDescription(19, true); showText(TX_SPEAKER_STEPHEN, 29, true); } @@ -421,7 +421,7 @@ void Room::demon6UseSTricoderOnSynthesizer() { void Room::demon6GetCase() { if (!_roomVar.demon.caseOpened) - showText(22, true); + showDescription(22, true); else walkCrewman(OBJECT_KIRK, 0xff, 0xba, 5); } diff --git a/engines/startrek/rooms/feather0.cpp b/engines/startrek/rooms/feather0.cpp index 820614b62f..482a5ebd93 100644 --- a/engines/startrek/rooms/feather0.cpp +++ b/engines/startrek/rooms/feather0.cpp @@ -59,7 +59,7 @@ void Room::feather0TalkToQuetzecoatl() { }; showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_028); - int choice = showText(choices); + int choice = showMultipleTexts(choices); bool alreadyAngered = false; if (choice == 0) { @@ -70,7 +70,7 @@ void Room::feather0TalkToQuetzecoatl() { TX_BLANK }; showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_032); - choice = showText(choices0); + choice = showMultipleTexts(choices0); } else if (choice == 1) { const TextRef choices0[] = { TX_SPEAKER_KIRK, @@ -79,7 +79,7 @@ void Room::feather0TalkToQuetzecoatl() { TX_BLANK }; showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_031); - choice = showText(choices0); + choice = showMultipleTexts(choices0); } else if (choice == 2) { const TextRef choices0[] = { TX_SPEAKER_KIRK, @@ -88,14 +88,14 @@ void Room::feather0TalkToQuetzecoatl() { TX_BLANK }; showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_033); - choice = showText(choices0); + choice = showMultipleTexts(choices0); if (choice == 0) { alreadyAngered = true; showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_024); } } else - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); if (!alreadyAngered) { if (choice == 0) @@ -111,7 +111,7 @@ void Room::feather0TalkToQuetzecoatl() { TX_FEA0_005, TX_BLANK }; - choice = showText(choices1); + choice = showMultipleTexts(choices1); if (choice == 0) { showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_029); @@ -156,43 +156,43 @@ void Room::feather0UseMedkit() { } void Room::feather0LookAtQuetzecoatl() { - showText(TX_FEA0N008); + showDescription(TX_FEA0N008); } void Room::feather0LookAtMoon() { - showText(TX_FEA0N007); + showDescription(TX_FEA0N007); } void Room::feather0LookAtLog() { - showText(TX_FEA0N006); + showDescription(TX_FEA0N006); } void Room::feather0LookAtHut() { - showText(TX_FEA0N001); + showDescription(TX_FEA0N001); } void Room::feather0LookAnywhere() { - showText(TX_FEA0N009); + showDescription(TX_FEA0N009); } void Room::feather0LookAtEyes() { - showText(TX_FEA0N000); + showDescription(TX_FEA0N000); } void Room::feather0LookAtTree() { - showText(TX_FEA0N003); + showDescription(TX_FEA0N003); } void Room::feather0LookAtMccoy() { - showText(TX_FEA0N004); + showDescription(TX_FEA0N004); } void Room::feather0LookAtSpock() { - showText(TX_FEA0N005); + showDescription(TX_FEA0N005); } void Room::feather0LookAtRedshirt() { - showText(TX_FEA0N002); + showDescription(TX_FEA0N002); } void Room::feather0TalkToMccoy() { diff --git a/engines/startrek/rooms/feather1.cpp b/engines/startrek/rooms/feather1.cpp index f01bcd2bc1..66b3c6fcbc 100644 --- a/engines/startrek/rooms/feather1.cpp +++ b/engines/startrek/rooms/feather1.cpp @@ -188,21 +188,21 @@ void Room::feather1QuetzecoatlDisappeared() { } void Room::feather1GetRightVine() { - showText(TX_FEA1N008); + showDescription(TX_FEA1N008); } void Room::feather1GetLeftVine() { if (_awayMission->feather.vineState == 0) - showText(TX_FEA1N009); + showDescription(TX_FEA1N009); else - showText(TX_FEA1N008); + showDescription(TX_FEA1N008); } void Room::feather1GetRocks() { if (_roomVar.feather.crewEscaped[OBJECT_KIRK]) - showText(TX_FEA1N021); + showDescription(TX_FEA1N021); else if (_awayMission->feather.gotRock) - showText(TX_FEA1N019); + showDescription(TX_FEA1N019); else { walkCrewmanC(OBJECT_KIRK, 0x90, 0xb6, &Room::feather1ReachedRocks); _awayMission->disableInput = true; @@ -217,7 +217,7 @@ void Room::feather1PickedUpRocks() { _awayMission->disableInput = false; loadActorStandAnim(OBJECT_KIRK); giveItem(OBJECT_IROCK); - showText(TX_FEA1N022); + showDescription(TX_FEA1N022); _awayMission->feather.gotRock = true; } @@ -229,7 +229,7 @@ void Room::feather1GetSnake() { walkCrewmanC(OBJECT_KIRK, 0x90, 0xbe, &Room::feather1ReachedSnake); _awayMission->disableInput = true; } else - showText(TX_FEA1N021); + showDescription(TX_FEA1N021); } void Room::feather1ReachedSnake() { @@ -272,9 +272,9 @@ void Room::feather1UseCommunicator() { void Room::feather1UseRockOnHole() { if (_roomVar.feather.crewEscaped[OBJECT_KIRK]) - showText(TX_FEA1N021); + showDescription(TX_FEA1N021); else if (_awayMission->feather.holeBlocked) - showText(TX_FEA1N005); + showDescription(TX_FEA1N005); else { _awayMission->feather.missionScore++; walkCrewmanC(OBJECT_KIRK, 0xa3, 0xb6, &Room::feather1ReachedHole); @@ -364,7 +364,7 @@ void Room::feather1UseRedshirtOnHole() { } void Room::feather1UseRockOnMoss() { - showText(TX_FEA1N006); + showDescription(TX_FEA1N006); } void Room::feather1UseRockOnSpock() { @@ -466,7 +466,7 @@ void Room::feather1UseKirkOnVine() { _roomVar.feather.crewmanClimbingVine = OBJECT_KIRK; feather1CrewmanClimbVine(); } else - showText(TX_FEA1N010); + showDescription(TX_FEA1N010); } // This was refactored, due to the similarity of the code for each crewman. Originally, the @@ -619,58 +619,58 @@ void Room::feather1WalkToExit() { } void Room::feather1LookAnywhere() { - showText(TX_FEA1N020); + showDescription(TX_FEA1N020); } void Room::feather1LookAtSnake() { - showText(TX_FEA1N017); + showDescription(TX_FEA1N017); } void Room::feather1LookAtRightVine() { - showText(TX_FEA1N015); + showDescription(TX_FEA1N015); } void Room::feather1LookAtHole() { - showText(TX_FEA1N014); + showDescription(TX_FEA1N014); } void Room::feather1LookAtMoss() { - showText(TX_FEA1N016); + showDescription(TX_FEA1N016); } void Room::feather1LookAtRocks() { - showText(TX_FEA1N011); + showDescription(TX_FEA1N011); } void Room::feather1LookAtLight() { - showText(TX_FEA1N013); + showDescription(TX_FEA1N013); } void Room::feather1LookAtEyes() { - showText(TX_FEA1N000); + showDescription(TX_FEA1N000); } void Room::feather1LookAtKirk() { - showText(TX_FEA1N001); + showDescription(TX_FEA1N001); } void Room::feather1LookAtSpock() { - showText(TX_FEA1N004); + showDescription(TX_FEA1N004); } void Room::feather1LookAtMccoy() { - showText(TX_FEA1N003); + showDescription(TX_FEA1N003); } void Room::feather1LookAtRedshirt() { - showText(TX_FEA1N002); + showDescription(TX_FEA1N002); } void Room::feather1LookAtLeftVine() { if (_awayMission->feather.vineState == 0) - showText(TX_FEA1N012); + showDescription(TX_FEA1N012); else - showText(TX_FEA1N015); + showDescription(TX_FEA1N015); } } diff --git a/engines/startrek/rooms/feather2.cpp b/engines/startrek/rooms/feather2.cpp index d676490dc0..c81ce67143 100644 --- a/engines/startrek/rooms/feather2.cpp +++ b/engines/startrek/rooms/feather2.cpp @@ -97,7 +97,7 @@ void Room::feather2TalkToRedshirt() { void Room::feather2LookAtVines() { // NOTE: This might be unused? I can't find where HOTSPOT_VINES is supposed to be. - showText(TX_FEA2N000); + showDescription(TX_FEA2N000); showText(TX_SPEAKER_STRAGEY, TX_FEA2_010); showText(TX_SPEAKER_MCCOY, TX_FEA2_005); } @@ -111,35 +111,35 @@ void Room::feather2WalkToLeftExit() { } void Room::feather2LookAtEyes() { - showText(TX_FEA2N001); + showDescription(TX_FEA2N001); } void Room::feather2LookAtBigTree() { - showText(TX_FEA2N006); + showDescription(TX_FEA2N006); } void Room::feather2LookAtTrees() { - showText(TX_FEA2N007); + showDescription(TX_FEA2N007); } void Room::feather2LookAnywhere() { - showText(TX_FEA2N008); + showDescription(TX_FEA2N008); } void Room::feather2LookAtKirk() { - showText(TX_FEA2N002); + showDescription(TX_FEA2N002); } void Room::feather2LookAtSpock() { - showText(TX_FEA2N005); + showDescription(TX_FEA2N005); } void Room::feather2LookAtMccoy() { - showText(TX_FEA2N004); + showDescription(TX_FEA2N004); } void Room::feather2LookAtRedshirt() { - showText(TX_FEA2N003); + showDescription(TX_FEA2N003); } } diff --git a/engines/startrek/rooms/feather3.cpp b/engines/startrek/rooms/feather3.cpp index 7e710908f0..69bf6f50b9 100644 --- a/engines/startrek/rooms/feather3.cpp +++ b/engines/startrek/rooms/feather3.cpp @@ -151,7 +151,7 @@ void Room::feather3UseSnakeOnKirk() { loadActorAnim(OBJECT_KNIFE, "s5r3nf", KNIFE_X, KNIFE_Y); _awayMission->feather.field2e = true; } else - showText(TX_FEA3N004); + showDescription(TX_FEA3N004); } } @@ -259,7 +259,7 @@ void Room::feather3Timer3Expired() { void Room::feather3TlaoxacKnockedOutFromRockThrow() { _awayMission->disableInput = false; loadActorStandAnim(OBJECT_KIRK); - showText(TX_FEA3N006); + showDescription(TX_FEA3N006); if (!_awayMission->feather.tookKnife && !_awayMission->feather.field2e) showText(TX_SPEAKER_MCCOY, TX_FEA3_008); @@ -298,7 +298,7 @@ void Room::feather3TalkToTlaoxac() { TX_FEA3_001, TX_FEA3_002, TX_FEA3_003, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) showText(TX_SPEAKER_TLAOXAC, TX_FEA3_037); @@ -312,7 +312,7 @@ void Room::feather3TalkToTlaoxac() { loadActorAnim(OBJECT_REDSHIRT, "s5r3rd"); _awayMission->redshirtDead = true; } else - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); } } } @@ -377,40 +377,40 @@ void Room::feather3Timer1Expired() { void Room::feather3PickedUpKnife() { _awayMission->disableInput = false; loadActorStandAnim(OBJECT_KIRK); - showText(TX_FEA3N010); + showDescription(TX_FEA3N010); } void Room::feather3LookAtSpock() { if (!_awayMission->feather.knockedOutTlaoxac && !_awayMission->feather.tlaoxacTestPassed) - showText(TX_FEA3N002); + showDescription(TX_FEA3N002); else // ENHANCEMENT: Originally did nothing here. Fall back to default behaviour in the engine. _awayMission->rdfStillDoDefaultAction = true; } void Room::feather3LookAtRedshirt() { if (_awayMission->redshirtDead) - showText(TX_FEA3N005); + showDescription(TX_FEA3N005); else - showText(TX_FEA3N012); + showDescription(TX_FEA3N012); } void Room::feather3LookAtTlaoxac() { if (_awayMission->feather.knockedOutTlaoxac) - showText(TX_FEA3N003); + showDescription(TX_FEA3N003); else - showText(TX_FEA3N007); + showDescription(TX_FEA3N007); } void Room::feather3LookAtLight() { - showText(TX_FEA3N001); + showDescription(TX_FEA3N001); } void Room::feather3LookAtMccoy() { - showText(TX_FEA3N000); + showDescription(TX_FEA3N000); } void Room::feather3LookAtKnife() { - showText(TX_FEA3N011); + showDescription(TX_FEA3N011); } } diff --git a/engines/startrek/rooms/feather4.cpp b/engines/startrek/rooms/feather4.cpp index cd05e9382e..1118350706 100644 --- a/engines/startrek/rooms/feather4.cpp +++ b/engines/startrek/rooms/feather4.cpp @@ -125,39 +125,39 @@ void Room::feather4TalkToRedshirt() { } void Room::feather4LookAtEyes() { - showText(TX_FEA4N003); + showDescription(TX_FEA4N003); } void Room::feather4LookAnywhere() { - showText(TX_FEA4N008); + showDescription(TX_FEA4N008); } void Room::feather4LookAtMushroom() { - showText(TX_FEA4N001); + showDescription(TX_FEA4N001); } void Room::feather4LookAtFern() { - showText(TX_FEA4N000); + showDescription(TX_FEA4N000); } void Room::feather4LookAtLight() { - showText(TX_FEA4N002); + showDescription(TX_FEA4N002); } void Room::feather4LookAtKirk() { - showText(TX_FEA4N004); + showDescription(TX_FEA4N004); } void Room::feather4LookAtSpock() { - showText(TX_FEA4N007); + showDescription(TX_FEA4N007); } void Room::feather4LookAtMccoy() { - showText(TX_FEA4N006); + showDescription(TX_FEA4N006); } void Room::feather4LookAtRedshirt() { - showText(TX_FEA4N005); + showDescription(TX_FEA4N005); } } diff --git a/engines/startrek/rooms/feather5.cpp b/engines/startrek/rooms/feather5.cpp index 2adcd43d0e..2f86a1e468 100644 --- a/engines/startrek/rooms/feather5.cpp +++ b/engines/startrek/rooms/feather5.cpp @@ -194,7 +194,7 @@ void Room::feather5UseSnakeOnRedshirt() { } void Room::feather5UseSnakeOnWater() { - showText(TX_FEA5N011); + showDescription(TX_FEA5N011); loseItem(OBJECT_ISNAKE); } @@ -227,12 +227,12 @@ void Room::feather5UseKnifeOnMonster() { } void Room::feather5GetFern() { - showText(TX_FEA5N008); + showDescription(TX_FEA5N008); } void Room::feather5UseKnifeOnFern() { if (_awayMission->feather.gotFern) - showText(TX_FEA5N015); + showDescription(TX_FEA5N015); else { walkCrewmanC(OBJECT_KIRK, 0x106, 0x8a, &Room::feather5ReachedFern); _awayMission->disableInput = true; @@ -299,7 +299,7 @@ void Room::feather5UseRockOnRedshirt() { void Room::feather5UseCrewmanOnThrownFern() { // This might be unused? The object in question (OBJECT_THROWN_FERN) shouldn't be // visible while player control is active. - showText(TX_FEA5N003); + showDescription(TX_FEA5N003); } void Room::feather5UseSpockOnMonster() { @@ -319,54 +319,54 @@ void Room::feather5UsePhaser() { } void Room::feather5LookAnywhere() { - showText(TX_FEA5N012); + showDescription(TX_FEA5N012); } void Room::feather5LookAtLog() { - showText(TX_FEA5N007); + showDescription(TX_FEA5N007); } void Room::feather5LookAtWater() { - showText(TX_FEA5N009); + showDescription(TX_FEA5N009); } void Room::feather5LookAtFern() { - showText(TX_FEA5N014); + showDescription(TX_FEA5N014); } void Room::feather5LookAtInsects() { - showText(TX_FEA5N005); + showDescription(TX_FEA5N005); } void Room::feather5LookAtCave() { - showText(TX_FEA5N013); + showDescription(TX_FEA5N013); } void Room::feather5LookAtMonster() { - showText(TX_FEA5N000); + showDescription(TX_FEA5N000); } void Room::feather5LookAtSpock() { - showText(TX_FEA5N006); + showDescription(TX_FEA5N006); } void Room::feather5LookAtKirk() { if (!_awayMission->feather.waterMonsterRetreated) - showText(TX_FEA5N001); + showDescription(TX_FEA5N001); else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing _awayMission->rdfStillDoDefaultAction = true; } void Room::feather5LookAtMccoy() { if (!_awayMission->feather.waterMonsterRetreated) - showText(TX_FEA5N002); + showDescription(TX_FEA5N002); else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing _awayMission->rdfStillDoDefaultAction = true; } void Room::feather5LookAtRedshirt() { if (!_awayMission->feather.waterMonsterRetreated) - showText(TX_FEA5N004); + showDescription(TX_FEA5N004); else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing _awayMission->rdfStillDoDefaultAction = true; } diff --git a/engines/startrek/rooms/feather6.cpp b/engines/startrek/rooms/feather6.cpp index 451cef6032..dba3f42f99 100644 --- a/engines/startrek/rooms/feather6.cpp +++ b/engines/startrek/rooms/feather6.cpp @@ -146,8 +146,8 @@ void Room::feather6KirkDiedFromStalactites() { _awayMission->feather.missionScore -= 3; _awayMission->feather.diedFromStalactites = true; _awayMission->disableInput = false; - showText(TX_FEA6N000); - showText(TX_FEA6N004); + showDescription(TX_FEA6N000); + showDescription(TX_FEA6N004); loadRoomIndex(7, 5); } @@ -199,7 +199,7 @@ void Room::feather6UseKnifeOnStalagmites() { } void Room::feather6UseKnifeAnywhere() { - showText(TX_FEA6N010); + showDescription(TX_FEA6N010); } void Room::feather6UseKnifeOnMccoy() { @@ -216,11 +216,11 @@ void Room::feather6UseKnifeOnRedshirt() { } void Room::feather6UseCrystalAnywhere() { - showText(TX_FEA6N015); + showDescription(TX_FEA6N015); } void Room::feather6UseSnakeAnywhere() { - showText(TX_FEA6N001); + showDescription(TX_FEA6N001); } void Room::feather6UseMedkitAnywhere() { @@ -232,43 +232,43 @@ void Room::feather6UsePhaser() { } void Room::feather6LookAtEastExit() { - showText(TX_FEA6N016); + showDescription(TX_FEA6N016); } void Room::feather6LookAnywhere() { - showText(TX_FEA6N003); + showDescription(TX_FEA6N003); } void Room::feather6LookAtRocks() { - showText(TX_FEA6N014); + showDescription(TX_FEA6N014); } void Room::feather6LookAtStalagmites() { - showText(TX_FEA6N013); + showDescription(TX_FEA6N013); } void Room::feather6LookAtCrystals() { - showText(TX_FEA6N005); + showDescription(TX_FEA6N005); } void Room::feather6LookAtKirk() { - showText(TX_FEA6N007); + showDescription(TX_FEA6N007); } void Room::feather6LookAtSpock() { - showText(TX_FEA6N011); + showDescription(TX_FEA6N011); } void Room::feather6LookAtMccoy() { - showText(TX_FEA6N002); + showDescription(TX_FEA6N002); } void Room::feather6LookAtRedshirt() { - showText(TX_FEA6N008); + showDescription(TX_FEA6N008); } void Room::feather6LookAtStalactites() { - showText(TX_FEA6N012); + showDescription(TX_FEA6N012); showText(TX_SPEAKER_SPOCK, TX_FEA6_034); showText(TX_SPEAKER_MCCOY, TX_FEA6_017); showText(TX_SPEAKER_SPOCK, TX_FEA6_033); @@ -279,7 +279,7 @@ void Room::feather6LookAtStalactites() { TX_FEA6_008, TX_FEA6_006, TX_FEA6_004, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) showText(TX_SPEAKER_SPOCK, TX_FEA6_032); @@ -312,7 +312,7 @@ void Room::feather6TalkToSpock() { TX_FEA6_003, TX_FEA6_005, TX_FEA6_007, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) showText(TX_SPEAKER_SPOCK, TX_FEA6_029); @@ -357,7 +357,7 @@ void Room::feather6UseSTricorderOnStalagmites() { } void Room::feather6GetCrystals() { - showText(TX_FEA6N020); + showDescription(TX_FEA6N020); } void Room::feather6UseKnifeOnCrystals() { @@ -375,7 +375,7 @@ void Room::feather6DoneCuttingCrystals() { loadActorStandAnim(OBJECT_KIRK); _awayMission->feather.missionScore += 1; giveItem(OBJECT_ICRYSTAL); - showText(TX_FEA6N017); + showDescription(TX_FEA6N017); } void Room::feather6Timer4Expired() { // Crystal disappears when timer 4 expires diff --git a/engines/startrek/rooms/feather7.cpp b/engines/startrek/rooms/feather7.cpp index 0bfa2b22c2..fcd213d6e8 100644 --- a/engines/startrek/rooms/feather7.cpp +++ b/engines/startrek/rooms/feather7.cpp @@ -91,7 +91,7 @@ void Room::feather7KirkSatDown() { TX_FEA7_005, TX_FEA7_006, TX_FEA7_010, TX_BLANK }; - int choice = showText(choices1); + int choice = showMultipleTexts(choices1); if (choice == 0) { _roomVar.feather.insultedQuetzecoatl = true; @@ -108,7 +108,7 @@ void Room::feather7KirkSatDown() { TX_FEA7_007, TX_FEA7_004, TX_FEA7_012, TX_BLANK }; - choice = showText(choices2); + choice = showMultipleTexts(choices2); if (choice == 0) { _roomVar.feather.insultedQuetzecoatl = true; @@ -128,7 +128,7 @@ void Room::feather7KirkSatDown() { TX_FEA7_008, TX_FEA7_009, TX_FEA7_011, TX_BLANK }; - choice = showText(choices3); + choice = showMultipleTexts(choices3); if (choice == 0) { _roomVar.feather.insultedQuetzecoatl = true; diff --git a/engines/startrek/rooms/love0.cpp b/engines/startrek/rooms/love0.cpp index 0e841897b6..38e90d208a 100644 --- a/engines/startrek/rooms/love0.cpp +++ b/engines/startrek/rooms/love0.cpp @@ -98,39 +98,39 @@ void Room::love0ReachedDoor1() { } void Room::love0LookAtConsole() { - showText(TX_LOV0N006); + showDescription(TX_LOV0N006); } void Room::love0LookAtViewscreen() { - showText(TX_LOV0N000); + showDescription(TX_LOV0N000); } void Room::love0LookAnywhere() { - showText(TX_LOV0N009); + showDescription(TX_LOV0N009); } void Room::love0LookAtDoor1() { - showText(TX_LOV0N008); + showDescription(TX_LOV0N008); } void Room::love0LookAtDoor2() { - showText(TX_LOV0N007); + showDescription(TX_LOV0N007); } void Room::love0LookAtKirk() { - showText(TX_LOV0N002); + showDescription(TX_LOV0N002); } void Room::love0LookAtMccoy() { - showText(TX_LOV0N004); + showDescription(TX_LOV0N004); } void Room::love0LookAtSpock() { - showText(TX_LOV0N005); + showDescription(TX_LOV0N005); } void Room::love0LookAtRedshirt() { - showText(TX_LOV0N003); + showDescription(TX_LOV0N003); } void Room::love0TalkToKirk() { @@ -247,7 +247,7 @@ void Room::love0InteractWithConsole() { while (true) { showText(TX_SPEAKER_COMPUTER, TX_COMPU192); - int choice = showText(choices); + int choice = showMultipleTexts(choices); switch (choice) { case 0: @@ -268,7 +268,7 @@ void Room::love0InteractWithConsole() { case 5: return; default: - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); break; } } @@ -278,7 +278,7 @@ void Room::love0GetDoorOrConsole() { // BUGFIX: There was a problem with "get door 1" where it would execute a bit of // non-code before reaching where it was supposed to be. Not sure if it had any actual // effect. - showText(TX_LOV0N001); + showDescription(TX_LOV0N001); // NOTE: There is an unused block of code that's jumped over in the "get door 2" // function. (Spock says "that's not logical".) diff --git a/engines/startrek/rooms/love1.cpp b/engines/startrek/rooms/love1.cpp index be7ffc97b6..aba484689e 100644 --- a/engines/startrek/rooms/love1.cpp +++ b/engines/startrek/rooms/love1.cpp @@ -158,69 +158,69 @@ void Room::love1ReachedDoor2() { } void Room::love1LookAtLaser() { - showText(TX_LOV1N000); + showDescription(TX_LOV1N000); } void Room::love1LookAtKirk() { - showText(TX_LOV1N003); + showDescription(TX_LOV1N003); } void Room::love1LookAtSpock() { - showText(TX_LOV1N004); + showDescription(TX_LOV1N004); } void Room::love1LookAtMccoy() { - showText(TX_LOV1N001); + showDescription(TX_LOV1N001); } void Room::love1LookAtRedshirt() { - showText(TX_LOV1N002); + showDescription(TX_LOV1N002); } void Room::love1LookAnywhere() { - showText(TX_LOV1N019); + showDescription(TX_LOV1N019); } void Room::love1LookAtNozzle() { - showText(TX_LOV1N022); + showDescription(TX_LOV1N022); } void Room::love1LookAtLadder() { - showText(TX_LOV1N021); + showDescription(TX_LOV1N021); } void Room::love1LookAtDoor1Or2() { - showText(TX_LOV1N020); + showDescription(TX_LOV1N020); } void Room::love1LookAtDoor3() { - showText(TX_LOV1N017); + showDescription(TX_LOV1N017); } void Room::love1LookAtDistillator() { - showText(TX_LOV1N016); + showDescription(TX_LOV1N016); } void Room::love1LookAtChamber() { if (_awayMission->love.chamberHasCure) - showText(TX_LOV1N013); + showDescription(TX_LOV1N013); else - showText(TX_LOV1N014); + showDescription(TX_LOV1N014); } void Room::love1LookAtReplicator() { - showText(TX_LOV1N015); + showDescription(TX_LOV1N015); } void Room::love1LookAtFreezer() { if (_awayMission->love.freezerOpen) - showText(TX_LOV1N023); + showDescription(TX_LOV1N023); else - showText(TX_LOV1N018); + showDescription(TX_LOV1N018); } void Room::love1LookAtDishes() { - showText(TX_LOV1N012); + showDescription(TX_LOV1N012); } void Room::love1TalkToKirk() { @@ -284,17 +284,17 @@ void Room::love1KirkReachedFreezer() { if (_awayMission->love.freezerOpen) loadActorAnim2(OBJECT_KIRK, "kusehw", -1, -1, 9); else - showText(TX_LOV1N010); + showDescription(TX_LOV1N010); } void Room::love1KirkGotVirusCulture() { giveItem(OBJECT_IDISHES); - showText(TX_LOV1N006); + showDescription(TX_LOV1N006); } void Room::love1GetFromChamber() { if (!_awayMission->love.chamberHasDish) - showText(TX_LOV1N009); + showDescription(TX_LOV1N009); else walkCrewman(OBJECT_KIRK, 0xb5, 0x8c, 8); } @@ -306,14 +306,14 @@ void Room::love1KirkReachedChamber() { void Room::love1KirkGotCureSample() { if (_awayMission->love.chamberHasCure) { giveItem(OBJECT_ISAMPLE); - showText(TX_LOV1N035); + showDescription(TX_LOV1N035); // BUGFIX: after removing the cure, unset this variable. // Otherwise, any normal dish inserted afterward automagically becomes a cure. _awayMission->love.chamberHasCure = false; } else { giveItem(OBJECT_IDISHES); - showText(TX_LOV1N006); + showDescription(TX_LOV1N006); } loadActorStandAnim(OBJECT_DISH_IN_CHAMBER); @@ -328,7 +328,7 @@ void Room::love1GetFromNozzle() { void Room::love1KirkReachedNozzleToGet() { if (_awayMission->love.bottleInNozzle == 0) - showText(TX_LOV1N011); + showDescription(TX_LOV1N011); else loadActorAnim2(OBJECT_KIRK, "kusemn", -1, -1, 11); } @@ -348,13 +348,13 @@ void Room::love1KirkGotBottleFromNozzle() { giveItem(OBJECT_IRLG); break; default: - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); break; } _awayMission->love.bottleInNozzle = BOTTLETYPE_NONE; loadActorStandAnim(OBJECT_BOTTLE); - showText(TX_LOV1N007); + showDescription(TX_LOV1N007); _roomVar.love.itemInNozzle = 0; } @@ -491,7 +491,7 @@ void Room::love1KirkReachedDistillator() { void Room::love1KirkGotPolyberylcarbonate() { // Result of using insulation on distillator - showText(TX_LOV1N034); + showDescription(TX_LOV1N034); if (!_awayMission->love.gotPolyberylcarbonate) { _awayMission->love.gotPolyberylcarbonate = true; _awayMission->love.missionScore++; @@ -561,7 +561,7 @@ void Room::love1ReachedFreezerWithArbitraryItem() { } void Room::love1FinishedUsingArbitraryItemOnFreezer() { - showText(TX_LOV1N008); + showDescription(TX_LOV1N008); } void Room::love1UseAnythingOnReplicator() { diff --git a/engines/startrek/rooms/love2.cpp b/engines/startrek/rooms/love2.cpp index 5a0d802b0d..b4cbb3392d 100644 --- a/engines/startrek/rooms/love2.cpp +++ b/engines/startrek/rooms/love2.cpp @@ -195,48 +195,48 @@ void Room::love2DoorReachedOrOpened() { } void Room::love2LookAtCabinet() { - showText(TX_LOV2N027); + showDescription(TX_LOV2N027); } void Room::love2LookAtDoor() { - showText(TX_LOV2N001); + showDescription(TX_LOV2N001); } void Room::love2LookAtSynthesizer() { - showText(TX_LOV2N028); + showDescription(TX_LOV2N028); } void Room::love2LookAtAnywhere() { - showText(TX_LOV2N026); + showDescription(TX_LOV2N026); } void Room::love2LookAtAntigrav() { - showText(TX_LOV2N006); + showDescription(TX_LOV2N006); } void Room::love2LookAtMccoy() { - showText(TX_LOV2N011); + showDescription(TX_LOV2N011); } void Room::love2LookAtSpock() { - showText(TX_LOV2N014); + showDescription(TX_LOV2N014); } void Room::love2LookAtRedshirt() { - showText(TX_LOV2N010); + showDescription(TX_LOV2N010); } void Room::love2LookAtKirk() { - showText(TX_LOV2N009); + showDescription(TX_LOV2N009); } void Room::love2LookAtArdak() { - showText(TX_LOV2N045); + showDescription(TX_LOV2N045); showText(TX_SPEAKER_SPOCK, TX_LOV2_037); } void Room::love2LookAtChamber() { - showText(TX_LOV2N029); + showDescription(TX_LOV2N029); showText(TX_SPEAKER_SPOCK, TX_LOV2_035); showText(TX_SPEAKER_MCCOY, TX_LOV2_019); showText(TX_SPEAKER_SPOCK, TX_LOV2_033); @@ -246,14 +246,14 @@ void Room::love2LookAtChamber() { void Room::love2LookAtCan1() { switch (_awayMission->love.canister1) { case CANTYPE_O2: - showText(TX_LOV2N004); + showDescription(TX_LOV2N004); break; case CANTYPE_H2: - showText(TX_LOV2N002); + showDescription(TX_LOV2N002); break; case CANTYPE_N2: default: - showText(TX_LOV2N003); + showDescription(TX_LOV2N003); break; } } @@ -261,14 +261,14 @@ void Room::love2LookAtCan1() { void Room::love2LookAtCan2() { switch (_awayMission->love.canister2) { case CANTYPE_O2: - showText(TX_LOV2N004); + showDescription(TX_LOV2N004); break; case CANTYPE_H2: - showText(TX_LOV2N002); + showDescription(TX_LOV2N002); break; case CANTYPE_N2: default: - showText(TX_LOV2N003); + showDescription(TX_LOV2N003); break; } } @@ -359,11 +359,11 @@ void Room::love2ChangedGasFeed() { if (_awayMission->love.gasFeedOn) { _awayMission->love.gasFeedOn = false; loadActorAnim2(OBJECT_GAS_FEED, "s3r3v2", 0xac, 0x75, 0); - showText(TX_LOV2N007); + showDescription(TX_LOV2N007); } else { _awayMission->love.gasFeedOn = true; loadActorAnim2(OBJECT_GAS_FEED, "s3r3v1", 0xac, 0x75, 0); - showText(TX_LOV2N008); + showDescription(TX_LOV2N008); } } @@ -397,7 +397,7 @@ void Room::love2ReachedCanisterSlot() { else if (_awayMission->love.canister2 == CANTYPE_NONE) loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 14); else - showText(TX_LOV2N024); + showDescription(TX_LOV2N024); } } @@ -405,7 +405,7 @@ void Room::love2PutCanisterInSlot1() { playVoc("SE6FOOD"); loadActorAnim(OBJECT_CAN1, _roomVar.love.canisterAnim, 0xa7, 0xae, 0); _awayMission->love.canister1 = _roomVar.love.canisterType; - showText(TX_LOV2N034); + showDescription(TX_LOV2N034); 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; - showText(TX_LOV2N035); + showDescription(TX_LOV2N035); loseItem(_roomVar.love.canisterItem); } @@ -432,7 +432,7 @@ void Room::love2ReachedCanisterSlot1ToGet() { } void Room::love2TookCanister1() { - showText(TX_LOV2N030); + showDescription(TX_LOV2N030); loadActorStandAnim(OBJECT_CAN1); switch (_awayMission->love.canister1) { @@ -465,7 +465,7 @@ void Room::love2ReachedCanisterSlot2ToGet() { } void Room::love2TookCanister2() { - showText(TX_LOV2N031); + showDescription(TX_LOV2N031); loadActorStandAnim(OBJECT_CAN2); switch (_awayMission->love.canister2) { @@ -521,7 +521,7 @@ void Room::love2CrewmanUsedSynthesizer() { showText(TX_SPEAKER_SPOCK, TX_LOV2_006); } else { _roomVar.love.cb++; - showText(TX_LOV2N012); + showDescription(TX_LOV2N012); } } } @@ -535,7 +535,7 @@ void Room::love2SpockEnabledGasFeeds() { _awayMission->love.gasFeedOn = true; loadActorAnim2(OBJECT_GAS_FEED, "s3r3v1", 0xac, 0x75, 0); - showText(TX_LOV2N008); + showDescription(TX_LOV2N008); walkCrewman(OBJECT_SPOCK, 0xc6, 0xbb, 0); love2UseSynthesizer(); @@ -562,14 +562,14 @@ void Room::love2UseSynthesizer() { break; case SYNTHITEM_VIRUS_SAMPLE: // Wet goo - showText(TX_LOV2N051); + showDescription(TX_LOV2N051); showText(TX_SPEAKER_KIRK, TX_LOV2_002); loadActorStandAnim(OBJECT_VIRUSSAMPLE); goto closeSynthesizerDoor; case SYNTHITEM_CURE_SAMPLE: // Wet goo wetGooFailure: - showText(TX_LOV2N050); + showDescription(TX_LOV2N050); showText(TX_SPEAKER_MCCOY, TX_LOV2_021); loadActorStandAnim(OBJECT_CURESAMPLE); goto closeSynthesizerDoor; @@ -598,13 +598,13 @@ closeSynthesizerDoor: switch (_awayMission->love.synthesizerContents) { case SYNTHITEM_PBC: // Inert matter inertMatterFailure: - showText(TX_LOV2N049); + showDescription(TX_LOV2N049); showText(TX_SPEAKER_SPOCK, TX_LOV2_039); // BUGFIX: original didn't play audio loadActorStandAnim(OBJECT_POLYBERYLCARBONATE); goto closeSynthesizerDoor; case SYNTHITEM_VIRUS_SAMPLE: // Colorless goo (with useful information about virus in ammonia) - showText(TX_LOV2N048); + showDescription(TX_LOV2N048); showText(TX_SPEAKER_SPOCK, TX_LOV2_034); // BUGFIX: original didn't play audio showText(TX_SPEAKER_MCCOY, TX_LOV2_023); loadActorStandAnim(OBJECT_VIRUSSAMPLE); @@ -631,7 +631,7 @@ inertMatterFailure: goto inertMatterFailure; case SYNTHITEM_VIRUS_SAMPLE: // Wet goo - showText(TX_LOV2N047); + showDescription(TX_LOV2N047); showText(TX_SPEAKER_MCCOY, TX_LOV2_017); loadActorStandAnim(OBJECT_VIRUSSAMPLE); goto closeSynthesizerDoor; @@ -651,12 +651,12 @@ inertMatterFailure: } } else { playVoc("EFX24"); - showText(TX_LOV2N005); + showDescription(TX_LOV2N005); showText(TX_SPEAKER_MCCOY, TX_LOV2_010); } } else { playVoc("EFX24"); - showText(TX_LOV2N005); + showDescription(TX_LOV2N005); showText(TX_SPEAKER_SPOCK, TX_LOV2_024); } } @@ -671,14 +671,14 @@ void Room::love2SynthesizerDoorClosed() { void Room::love2SynthesizerFinished() { switch (_awayMission->love.synthesizerBottleIndex) { case BOTTLETYPE_N2O: - showText(TX_LOV2N017); + showDescription(TX_LOV2N017); showText(TX_SPEAKER_SPOCK, TX_LOV2_032); showText(TX_SPEAKER_MCCOY, TX_LOV2_015); showText(TX_SPEAKER_SPOCK, TX_LOV2_036); break; case BOTTLETYPE_NH3: - showText(TX_LOV2N016); + showDescription(TX_LOV2N016); if (!_awayMission->redshirtDead) { showText(TX_SPEAKER_FERRIS, TX_LOV2_043); showText(TX_SPEAKER_KIRK, TX_LOV2_003); @@ -686,13 +686,13 @@ void Room::love2SynthesizerFinished() { break; case BOTTLETYPE_H2O: - showText(TX_LOV2N018); + showDescription(TX_LOV2N018); showText(TX_SPEAKER_SPOCK, TX_LOV2_004); break; case BOTTLETYPE_RLG: default: - showText(TX_LOV2N019); + showDescription(TX_LOV2N019); showText(TX_SPEAKER_SPOCK, TX_LOV2_031); showText(TX_SPEAKER_MCCOY, TX_LOV2_018); showText(TX_SPEAKER_SPOCK, TX_LOV2_030); @@ -719,7 +719,7 @@ void Room::love2CureStartedSynthesizing() { } void Room::love2CureSynthesized() { - showText(TX_LOV2N046); + showDescription(TX_LOV2N046); showText(TX_SPEAKER_MCCOY, TX_LOV2_020); } @@ -732,7 +732,7 @@ void Room::love2UsePolyberylcarbonateOnSynthesizerDoor() { void Room::love2KirkReachedSynthesizerWithPolyberylcarbonate() { if (_awayMission->love.synthesizerContents != 0) - showText(TX_LOV2N025); + showDescription(TX_LOV2N025); 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) - showText(TX_LOV2N025); + showDescription(TX_LOV2N025); 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) - showText(TX_LOV2N025); // BUGFIX: original didn't play audio + showDescription(TX_LOV2N025); // BUGFIX: original didn't play audio else { loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d2", 0x8a, 0x8d, 7); playSoundEffectIndex(SND_DOOR1); @@ -831,7 +831,7 @@ void Room::love2ReachedAntigrav() { void Room::love2GotAntigrav() { loadActorStandAnim(OBJECT_ANTIGRAV); giveItem(OBJECT_IANTIGRA); - showText(TX_LOV2N042); + showDescription(TX_LOV2N042); } @@ -847,7 +847,7 @@ void Room::love2ReachedPolyberylcarbonate() { void Room::love2GotPolyberylcarbonate() { loadActorStandAnim(OBJECT_POLYBERYLCARBONATE); - showText(TX_LOV2N044); + showDescription(TX_LOV2N044); 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); - showText(TX_LOV2N036); // FIXME: text doesn't match audio + showDescription(TX_LOV2N036); // 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); - showText(TX_LOV2N037); + showDescription(TX_LOV2N037); 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: - showText(TX_LOV2N040); + showDescription(TX_LOV2N040); giveItem(OBJECT_IN2O); break; case BOTTLETYPE_NH3: - showText(TX_LOV2N039); + showDescription(TX_LOV2N039); giveItem(OBJECT_INH3); break; case BOTTLETYPE_H2O: - showText(TX_LOV2N041); + showDescription(TX_LOV2N041); giveItem(OBJECT_IH2O); break; case BOTTLETYPE_RLG: default: - showText(TX_LOV2N038); + showDescription(TX_LOV2N038); 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); - showText(TX_LOV2N043); + showDescription(TX_LOV2N043); loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0); playSoundEffectIndex(SND_DOOR1); diff --git a/engines/startrek/rooms/love3.cpp b/engines/startrek/rooms/love3.cpp index 48d93f2cf5..b0b90f0369 100644 --- a/engines/startrek/rooms/love3.cpp +++ b/engines/startrek/rooms/love3.cpp @@ -85,58 +85,58 @@ void Room::love3Timer3Expired() { } void Room::love3LookAtServicePanel() { - showText(TX_LOV3NA20); + showDescription(TX_LOV3NA20); } void Room::love3LookAtMonitor() { - showText(TX_LOV3N000); // BUGFIX: original didn't play the audio + showDescription(TX_LOV3N000); // BUGFIX: original didn't play the audio } void Room::love3LookAtWrench() { - showText(TX_LOV3N002); + showDescription(TX_LOV3N002); } void Room::love3LookAtKirk() { - showText(TX_LOV3N003); + showDescription(TX_LOV3N003); } void Room::love3LookAtMccoy() { - showText(TX_LOV3N005); + showDescription(TX_LOV3N005); } void Room::love3LookAtSpock() { - showText(TX_LOV3N008); + showDescription(TX_LOV3N008); } void Room::love3LookAtRedshirt() { - showText(TX_LOV3N004); + showDescription(TX_LOV3N004); } void Room::love3LookAnywhere() { - showText(TX_LOV3NA23); + showDescription(TX_LOV3NA23); } void Room::love3LookAtShaft() { - showText(TX_LOV3NA21); + showDescription(TX_LOV3NA21); } void Room::love3LookAtGrate() { - showText(TX_LOV3N019); + showDescription(TX_LOV3N019); } void Room::love3LookAtPanel() { if (_awayMission->love.insulationOnGround) - showText(TX_LOV3N017); + showDescription(TX_LOV3N017); else - showText(TX_LOV3NA22); + showDescription(TX_LOV3NA22); } void Room::love3LookAtGasTank() { - showText(TX_LOV3N006); + showDescription(TX_LOV3N006); } void Room::love3LookAtTurbines() { - showText(TX_LOV3N026); + showDescription(TX_LOV3N026); showText(TX_SPEAKER_MCCOY, TX_LOV3_009); showText(TX_SPEAKER_SPOCK, TX_LOV3_019); if (!_awayMission->redshirtDead) @@ -222,11 +222,11 @@ void Room::love3OpenedOrClosedServicePanel() { if (_awayMission->love.servicePanelOpen) { if (_awayMission->love.tookN2TankFromServicePanel) - showText(TX_LOV3N023); + showDescription(TX_LOV3N023); else - showText(TX_LOV3N022); + showDescription(TX_LOV3N022); } else - showText(TX_LOV3N020); + showDescription(TX_LOV3N020); } // Use wrench on gas tank, to screw or unscrew it in position @@ -241,12 +241,12 @@ void Room::love3ReachedGasTankToUnscrew() { void Room::love3ScrewedOrUnscrewedGasTank() { if (!_awayMission->love.gasTankUnscrewed) { - showText(TX_LOV3N012); + showDescription(TX_LOV3N012); if (!_awayMission->redshirtDead) showText(TX_SPEAKER_FERRIS, TX_LOV3_022); _awayMission->love.gasTankUnscrewed = true; } else { - showText(TX_LOV3N015); + showDescription(TX_LOV3N015); _awayMission->love.gasTankUnscrewed = false; } } @@ -268,7 +268,7 @@ void Room::love3ReachedGasTankToPutDown() { } void Room::love3PutN2TankBack() { - showText(TX_LOV3N013); + showDescription(TX_LOV3N013); _awayMission->love.tookN2TankFromServicePanel = false; loseItem(OBJECT_IN2GAS); loadActorAnim(OBJECT_GAS_TANK, "r4n2", 0, 0, 0); @@ -291,7 +291,7 @@ void Room::love3OpenedEngineeringPanel() { loadActorAnim(OBJECT_INSULATION, "s3r4p1", 0, 0, 0); _awayMission->love.insulationOnGround = true; } - showText(TX_LOV3N021); + showDescription(TX_LOV3N021); } @@ -319,7 +319,7 @@ void Room::love3PouredWaterOnMonitor() { void Room::love3UseCrewmanOnEngineeringPanelOrGrate() { - showText(TX_LOV3N030); + showDescription(TX_LOV3N030); } @@ -344,7 +344,7 @@ void Room::love3OpenedOrClosedGrate() { if (!_awayMission->love.grateRemoved) { _awayMission->love.grateRemoved = true; loadActorAnim(OBJECT_GRATE, "s3r4g3", 0, 0, 0); - showText(TX_LOV3N016); + showDescription(TX_LOV3N016); if (!_awayMission->love.gotPointsForOpeningGrate) { _awayMission->love.gotPointsForOpeningGrate = true; _awayMission->love.missionScore++; @@ -352,13 +352,13 @@ void Room::love3OpenedOrClosedGrate() { } else { loadActorAnim(OBJECT_GRATE, "s3r4g1", 0x116, 0x8f, 0); _awayMission->love.grateRemoved = false; - showText(TX_LOV3N032); + showDescription(TX_LOV3N032); } } void Room::love3UseCrewmanOnShaft() { - showText(TX_LOV3N011); + showDescription(TX_LOV3N011); } @@ -368,13 +368,13 @@ void Room::love3UseWaterOnShaft() { void Room::love3ReachedShaftUsingWater() { if (!_awayMission->love.grateRemoved) - showText(TX_LOV3N025); + showDescription(TX_LOV3N025); else loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredWaterDownShaft); } void Room::love3PouredWaterDownShaft() { - showText(TX_LOV3N009); + showDescription(TX_LOV3N009); loseItem(OBJECT_IH2O); } @@ -385,13 +385,13 @@ void Room::love3UseNitrousOxideOnShaft() { void Room::love3ReachedShaftUsingNitrousOxide() { if (!_awayMission->love.grateRemoved) - showText(TX_LOV3N025); + showDescription(TX_LOV3N025); else loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredNitrousOxideDownShaft); } void Room::love3PouredNitrousOxideDownShaft() { - showText(TX_LOV3N018); + showDescription(TX_LOV3N018); showText(TX_SPEAKER_SPOCK, TX_LOV3_012); loseItem(OBJECT_IN2O); } @@ -403,14 +403,14 @@ void Room::love3UseAmmoniaOnShaft() { void Room::love3ReachedShaftUsingAmmonia() { if (!_awayMission->love.grateRemoved) - showText(TX_LOV3N025); + showDescription(TX_LOV3N025); else loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredAmmoniaDownShaft); } void Room::love3PouredAmmoniaDownShaft() { if (!_awayMission->love.romulansUnconsciousFromVirus) { - showText(TX_LOV3N001); + showDescription(TX_LOV3N001); if (!_awayMission->redshirtDead) showText(TX_SPEAKER_FERRIS, TX_LOV3_023); } @@ -435,7 +435,7 @@ void Room::love3UseRomulanLaughingGasOnShaft() { void Room::love3ReachedShaftUsingRomulanLaughingGas() { if (!_awayMission->love.grateRemoved) - showText(TX_LOV3N025); + showDescription(TX_LOV3N025); else { loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredRomulanLaughingGasDownShaft); playVoc("EFX24"); @@ -447,10 +447,10 @@ void Room::love3PouredRomulanLaughingGasDownShaft() { _awayMission->love.romulansUnconsciousFromLaughingGas = true; if (_awayMission->love.romulansUnconsciousFromVirus) { - showText(TX_LOV3NA08); + showDescription(TX_LOV3NA08); _awayMission->love.romulansUnconsciousFromLaughingGas = false; } else { - showText(TX_LOV3NA09); + showDescription(TX_LOV3NA09); playVoc("ROMULANL"); } } @@ -470,7 +470,7 @@ void Room::love3PickedUpWrench() { giveItem(OBJECT_IWRENCH); loadActorStandAnim(OBJECT_WRENCH); _awayMission->love.wrenchTaken = true; - showText(TX_LOV3N031); + showDescription(TX_LOV3N031); } @@ -481,9 +481,9 @@ void Room::love3GetGasTank() { void Room::love3ReachedGasTankToGet() { if (_awayMission->love.gasTankUnscrewed) - showText(TX_LOV3N007); + showDescription(TX_LOV3N007); else - showText(TX_LOV3N014); + showDescription(TX_LOV3N014); } @@ -497,7 +497,7 @@ void Room::love3ReachedGasTankUsingAntigrav() { loadActorAnimC(OBJECT_KIRK, "kusehe", -1, -1, &Room::love3PickedUpGasTank); playVoc("SE3PLBAT"); } else { - showText(TX_LOV3N010); + showDescription(TX_LOV3N010); showText(TX_SPEAKER_SPOCK, TX_LOV3_015); } } @@ -507,7 +507,7 @@ void Room::love3PickedUpGasTank() { loadActorStandAnim(OBJECT_GAS_TANK); _awayMission->love.tookN2TankFromServicePanel = true; - showText(TX_LOV3NJ32); + showDescription(TX_LOV3NJ32); if (!_awayMission->redshirtDead) showText(TX_SPEAKER_FERRIS, TX_LOV3_025); } @@ -524,7 +524,7 @@ void Room::love3ReachedInsulationToGet() { void Room::love3PickedUpInsulation() { loadActorStandAnim(OBJECT_KIRK); giveItem(OBJECT_IINSULAT); - showText(TX_LOV3N029); + showDescription(TX_LOV3N029); } } diff --git a/engines/startrek/rooms/love4.cpp b/engines/startrek/rooms/love4.cpp index 6eeef1050a..9ca5305893 100644 --- a/engines/startrek/rooms/love4.cpp +++ b/engines/startrek/rooms/love4.cpp @@ -100,19 +100,19 @@ void Room::love4UseStunPhaserOnRomulan() { } void Room::love4LookAnywhere() { - showText(TX_LOV4N009); + showDescription(TX_LOV4N009); } void Room::love4LookAtLadder() { - showText(TX_LOV4N010); + showDescription(TX_LOV4N010); } void Room::love4LookAtDoor() { - showText(TX_LOV4N008); + showDescription(TX_LOV4N008); } void Room::love4LookAtKirk() { - showText(TX_LOV4N002); + showDescription(TX_LOV4N002); } void Room::love4LookAtMccoy() { @@ -121,22 +121,22 @@ void Room::love4LookAtMccoy() { // is thinking it. // Not sure if this was an intentional decision, but there is another unused audio // file which matches with the text more accurately, so I'm using that instead. - showText(TX_LOV4N012); + showDescription(TX_LOV4N012); } void Room::love4LookAtSpock() { - showText(TX_LOV4N003); + showDescription(TX_LOV4N003); } void Room::love4LookAtRedshirt() { - showText(TX_LOV4N001); + showDescription(TX_LOV4N001); } void Room::love4LookAtRomulan() { if (!_awayMission->love.romulansCured) - showText(TX_LOV4N006); + showDescription(TX_LOV4N006); else - showText(TX_LOV4N011); + showDescription(TX_LOV4N011); } void Room::love4TalkToKirk() { @@ -163,7 +163,7 @@ void Room::love4TalkToSpock() { void Room::love4TalkToRomulan() { if (_awayMission->love.romulansCured) - showText(TX_LOV4N007); // BUGFIX: original didn't play audio + showDescription(TX_LOV4N007); // BUGFIX: original didn't play audio } void Room::love4UseMTricorderOnRomulan() { @@ -233,7 +233,7 @@ void Room::love4MccoyReachedRomulan1() { void Room::love4MccoyCuredRomulan1() { loadActorAnim2(OBJECT_ROMULAN_1, "s3r5r1", 0x36, 0xb3, 0); - showText(TX_LOV4N005); + showDescription(TX_LOV4N005); if (!_roomVar.love.gaveWaterToRomulans) showText(TX_SPEAKER_MCCOY, TX_LOV4_023); @@ -250,7 +250,7 @@ void Room::love4UseWaterOnRomulan() { else { _roomVar.love.gaveWaterToRomulans = true; if (_awayMission->love.romulansCured) { - showText(TX_LOV4N013); + showDescription(TX_LOV4N013); showText(TX_SPEAKER_MCCOY, TX_LOV4_026); showText(TX_SPEAKER_KIRK, TX_LOV4_001); if (!_awayMission->love.gotPointsForHydratingRomulans) { @@ -273,7 +273,7 @@ void Room::love4UseWaterOnRomulan() { if (_awayMission->love.romulansUnconsciousFromVirus) showText(TX_SPEAKER_MCCOY, TX_LOV4_009); else { - showText(TX_LOV4N004); + showDescription(TX_LOV4N004); if (!_awayMission->redshirtDead) { showText(TX_SPEAKER_FERRIS, TX_LOV4_029); showText(TX_SPEAKER_KIRK, TX_LOV4_004); diff --git a/engines/startrek/rooms/love5.cpp b/engines/startrek/rooms/love5.cpp index 239d413c80..ce30d4c00c 100644 --- a/engines/startrek/rooms/love5.cpp +++ b/engines/startrek/rooms/love5.cpp @@ -80,23 +80,23 @@ void Room::love5UseStunPhaserOnPreax() { } void Room::love5LookAtKirk() { - showText(TX_LOV5N004); + showDescription(TX_LOV5N004); } void Room::love5LookAtSpock() { - showText(TX_LOV5N005); + showDescription(TX_LOV5N005); } void Room::love5LookAtMccoy() { - showText(TX_LOV5N002); + showDescription(TX_LOV5N002); } void Room::love5LookAtRedshirt() { - showText(TX_LOV5N003); + showDescription(TX_LOV5N003); } void Room::love5LookAnywhere() { - showText(TX_LOV5N008); + showDescription(TX_LOV5N008); // There is an unused version of this function, which states "This is Dr. Marcus's // quarters, and there are hostages and 4 romulans here". That description doesn't @@ -109,24 +109,24 @@ void Room::love5LookAnywhere() { } void Room::love5LookAtDevice() { - showText(TX_LOV5N013); + showDescription(TX_LOV5N013); showText(TX_SPEAKER_MCCOY, TX_LOV5_028); showText(TX_SPEAKER_MARCUS, TX_LOV5_044); } void Room::love5LookAtConsole() { - showText(TX_LOV5N016); + showDescription(TX_LOV5N016); showText(TX_SPEAKER_MCCOY, TX_LOV5_031); showText(TX_SPEAKER_MARCUS, TX_LOV5_050); } void Room::love5LookAtDrMarcus() { if (_awayMission->love.freedMarcusAndCheever) - showText(TX_LOV5N001); + showDescription(TX_LOV5N001); else { // BUGFIX: originally played audio "LOV5N001", which is only the first sentence of // what should be spoken. - showText(TX_LOV5N015); + showDescription(TX_LOV5N015); showText(TX_SPEAKER_MARCUS, TX_LOV5_046); } @@ -134,9 +134,9 @@ void Room::love5LookAtDrMarcus() { void Room::love5LookAtDrCheever() { if (_awayMission->love.freedMarcusAndCheever) - showText(TX_LOV5N000); + showDescription(TX_LOV5N000); else { - showText(TX_LOV5N014); + showDescription(TX_LOV5N014); showText(TX_SPEAKER_CHEEVER, TX_LOV5_057); if (!_awayMission->redshirtDead) { showText(TX_SPEAKER_FERRIS, TX_LOV5_054); @@ -147,15 +147,15 @@ void Room::love5LookAtDrCheever() { void Room::love5LookAtPreax() { if (_awayMission->love.preaxCured) - showText(TX_LOV5N011); + showDescription(TX_LOV5N011); else - showText(TX_LOV5N012); + showDescription(TX_LOV5N012); } void Room::love5TalkToPreax() { if (_awayMission->love.preaxCured) { if (!_awayMission->love.freedMarcusAndCheever) - showText(TX_LOV5N006); + showDescription(TX_LOV5N006); else { const TextRef choices[] = { TX_SPEAKER_KIRK, @@ -166,7 +166,7 @@ void Room::love5TalkToPreax() { }; showText(TX_SPEAKER_PREAX, TX_LOV5_059); - int choice = showText(choices); + int choice = showMultipleTexts(choices); switch (choice) { case 1: @@ -186,7 +186,7 @@ void Room::love5TalkToPreax() { showText(TX_SPEAKER_PREAX, TX_LOV5_060); break; default: - showText(TX_DIALOG_ERROR); + showDescription(TX_DIALOG_ERROR); break; } @@ -316,7 +316,7 @@ void Room::love5UseMedkitOnPreax() { void Room::love5UseWaterOnPreax() { if (_awayMission->love.preaxCured) { - showText(TX_LOV5N018); + showDescription(TX_LOV5N018); showText(TX_SPEAKER_MCCOY, TX_LOV5_029); showText(TX_SPEAKER_KIRK, TX_LOV5_007); if (!_awayMission->love.gotPointsForHydratingPreax) { @@ -330,7 +330,7 @@ void Room::love5UseWaterOnPreax() { // BUGFIX: original didn't have correct speaker. Also, you shouldn't lose your // water since it's not actually used here, so a "loseItem" line was removed. } else { - showText(TX_LOV5N017); + showDescription(TX_LOV5N017); if (!_awayMission->redshirtDead) { showText(TX_SPEAKER_FERRIS, TX_LOV5_053); showText(TX_SPEAKER_KIRK, TX_LOV5_005); @@ -366,7 +366,7 @@ void Room::love5CuredPreax() { walkCrewman(OBJECT_MCCOY, 0xdc, 0xc3); _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_E; - showText(TX_LOV5N007); + showDescription(TX_LOV5N007); // BUG: says he's dehydrated, but doesn't check whether you've given water to him // already (like it does in LOVE4). diff --git a/engines/startrek/rooms/lovea.cpp b/engines/startrek/rooms/lovea.cpp index 2f0bf77732..00c2a1f361 100644 --- a/engines/startrek/rooms/lovea.cpp +++ b/engines/startrek/rooms/lovea.cpp @@ -158,7 +158,7 @@ void Room::loveaTimer2Expired() { if (_awayMission->love.spockInfectionCounter >= 100) { // Spock succumbs, game over loadActorAnim(OBJECT_SPOCK, "sgetdn", -1, -1, 0); playMidiMusicTracks(2, -1); // FIXME: assembly had no second parameter...? - showText(TX_GENER004); + showDescription(TX_GENER004); showGameOverMenu(); } else if (_awayMission->love.spockInfectionCounter == 15) { showText(TX_SPEAKER_SPOCK, TX_SPOKCOFF); @@ -208,7 +208,7 @@ void Room::loveaUseMTricorderOnHuman() { } void Room::loveaUseRomulanLaughingGas() { - showText(TX_LOV2N005); + showDescription(TX_LOV2N005); _awayMission->love.releasedRomulanLaughingGas = true; loseItem(OBJECT_IRLG); @@ -217,7 +217,7 @@ void Room::loveaUseRomulanLaughingGas() { } void Room::loveaUseHumanLaughingGas() { - showText(TX_LOV2N005); + showDescription(TX_LOV2N005); showText(TX_SPEAKER_SPOCK, TX_MUD2_040); _awayMission->love.releasedHumanLaughingGas = true; loseItem(OBJECT_IN2O); @@ -228,7 +228,7 @@ void Room::loveaUseHumanLaughingGas() { } void Room::loveaUseAmmonia() { - showText(TX_LOV2N005); + showDescription(TX_LOV2N005); // TODO: redshirt says something in floppy edition only loseItem(OBJECT_INH3); } diff --git a/engines/startrek/rooms/mudd0.cpp b/engines/startrek/rooms/mudd0.cpp index ae9d682164..9e540d60c9 100644 --- a/engines/startrek/rooms/mudd0.cpp +++ b/engines/startrek/rooms/mudd0.cpp @@ -92,42 +92,42 @@ void Room::mudd0UseCommunicator() { void Room::mudd0LookAtFoodBox() { _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; loadActorStandAnim(OBJECT_KIRK); - showText(TX_MUD0N012); + showDescription(TX_MUD0N012); } void Room::mudd0LookAtComponentBox() { _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; loadActorStandAnim(OBJECT_KIRK); - showText(TX_MUD0N013); + showDescription(TX_MUD0N013); } void Room::mudd0LookAnywhere() { - showText(TX_MUD0N019); + showDescription(TX_MUD0N019); } void Room::mudd0LookAtMemoryDiskBox() { _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; loadActorStandAnim(OBJECT_KIRK); - showText(TX_MUD0N010); + showDescription(TX_MUD0N010); } void Room::mudd0LookAtDegrimerBox() { _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_W; loadActorStandAnim(OBJECT_KIRK); - showText(TX_MUD0N008); + showDescription(TX_MUD0N008); } void Room::mudd0LookAtLense() { _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E; loadActorStandAnim(OBJECT_KIRK); - showText(TX_MUD0N014); + showDescription(TX_MUD0N014); } void Room::mudd0UseSTricorderAnywhere() { // Narrator says something, not Spock (so we don't use "spockScan" function) loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0); playSoundEffectIndex(SND_TRICORDER); - showText(TX_MUD0N015); + showDescription(TX_MUD0N015); } void Room::mudd0UseMTricorderAnywhere() { @@ -136,7 +136,7 @@ void Room::mudd0UseMTricorderAnywhere() { // above. loadActorAnim2(OBJECT_MCCOY, "mscans", -1, -1, 0); playSoundEffectIndex(SND_TRICORDER); - showText(TX_MUD0N015); + showDescription(TX_MUD0N015); } void Room::mudd0UseSTricorderOnMemoryDiskBox() { @@ -148,7 +148,7 @@ void Room::mudd0UseSTricorderOnDegrimerBox() { _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; loadActorAnim2(OBJECT_SPOCK, "sscanw", -1, -1, 0); playSoundEffectIndex(SND_TRICORDER); - showText(TX_MUD0N000); + showDescription(TX_MUD0N000); } void Room::mudd0UseMTricorderOnLense() { @@ -160,7 +160,7 @@ void Room::mudd0UseMTricorderOnLense() { void Room::mudd0GetLense() { if (_awayMission->mudd.gotLense) - showText(TX_MUD0N016); + showDescription(TX_MUD0N016); else { _awayMission->mudd.gotLense = true; _awayMission->mudd.missionScore++; @@ -173,7 +173,7 @@ void Room::mudd0GetLense() { void Room::mudd0GetMemoryDisk() { if (_awayMission->mudd.gotMemoryDisk) - showText(TX_MUD0N016); + showDescription(TX_MUD0N016); else { _awayMission->mudd.gotMemoryDisk = true; _awayMission->mudd.missionScore++; @@ -185,7 +185,7 @@ void Room::mudd0GetMemoryDisk() { void Room::mudd0GetDegrimer() { if (_awayMission->mudd.gotDegrimer) - showText(TX_MUD0N016); + showDescription(TX_MUD0N016); else { _awayMission->mudd.gotDegrimer = true; _awayMission->mudd.missionScore++; @@ -203,7 +203,7 @@ void Room::mudd0PickedUpLense() { void Room::mudd0PickedUpItem() { _awayMission->disableInput = false; // NOTE: this was never set to true - showText(TX_LOV1N007); + showDescription(TX_LOV1N007); } @@ -236,23 +236,23 @@ void Room::mudd0UseMedkit() { } void Room::mudd0LookAtKirk() { - showText(TX_MUD0N004); + showDescription(TX_MUD0N004); } void Room::mudd0LookAtSpock() { - showText(TX_MUD0N007); + showDescription(TX_MUD0N007); } void Room::mudd0LookAtMccoy() { - showText(TX_MUD0N001); + showDescription(TX_MUD0N001); } void Room::mudd0LookAtRedshirt() { - showText(TX_MUD0N005); + showDescription(TX_MUD0N005); } void Room::mudd0LookAtMudd() { - showText(TX_MUD0N003); + showDescription(TX_MUD0N003); } void Room::mudd0TalkToKirk() { diff --git a/engines/startrek/rooms/mudd1.cpp b/engines/startrek/rooms/mudd1.cpp index de7a09fa4a..0112567482 100644 --- a/engines/startrek/rooms/mudd1.cpp +++ b/engines/startrek/rooms/mudd1.cpp @@ -161,7 +161,7 @@ void Room::mudd1SpockPressedRedButton() { TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); switch (choice) { case 0: @@ -170,7 +170,7 @@ void Room::mudd1SpockPressedRedButton() { // ENHANCEMENT: Original text was just "(Spock raises eyebrow)" without any audio. // This changes it to a narration to make it flow better. // TODO: This needs to be refactored - showText(TX_DEM0N009); + showDescription(TX_DEM0N009); break; case 1: @@ -186,7 +186,7 @@ void Room::mudd1SpockPressedRedButton() { void Room::mudd1GetTorpedo() { - showText(TX_MUD1N014); + showDescription(TX_MUD1N014); } void Room::mudd1UseSTricorderOnTorpedo() { @@ -216,51 +216,51 @@ void Room::mudd1UseMedkitAnywhere() { } void Room::mudd1LookAnywhere() { - showText(TX_MUD1N011); + showDescription(TX_MUD1N011); } void Room::mudd1LookAtTorpedo() { - showText(TX_MUD1N002); + showDescription(TX_MUD1N002); } void Room::mudd1LookAtFallenTorpedo() { - showText(TX_MUD1N012); + showDescription(TX_MUD1N012); } void Room::mudd1LookAtTorpedoLauncher() { - showText(TX_MUD1N003); + showDescription(TX_MUD1N003); } void Room::mudd1LookAtKirk() { - showText(TX_MUD1N005); + showDescription(TX_MUD1N005); } void Room::mudd1LookAtSpock() { - showText(TX_MUD1N009); + showDescription(TX_MUD1N009); } void Room::mudd1LookAtMccoy() { - showText(TX_MUD1N008); + showDescription(TX_MUD1N008); } void Room::mudd1LookAtRedshirt() { - showText(TX_MUD1N006); + showDescription(TX_MUD1N006); } void Room::mudd1LookAtCrane() { - showText(TX_MUD1N000); + showDescription(TX_MUD1N000); } void Room::mudd1LookAtRedButton() { - showText(TX_MUD1N001); + showDescription(TX_MUD1N001); } void Room::mudd1LookAtBlueButton() { - showText(TX_MUD1N015); + showDescription(TX_MUD1N015); } void Room::mudd1LookAtYellowButton() { - showText(TX_MUD1N016); + showDescription(TX_MUD1N016); } void Room::mudd1TalkToKirk() { diff --git a/engines/startrek/rooms/mudd2.cpp b/engines/startrek/rooms/mudd2.cpp index 43c381a161..6eb75cfc50 100644 --- a/engines/startrek/rooms/mudd2.cpp +++ b/engines/startrek/rooms/mudd2.cpp @@ -132,7 +132,7 @@ void Room::mudd2UseCommunicator() { } void Room::mudd2LookAtCapsules() { - showText(TX_MUD2N008); + showDescription(TX_MUD2N008); } void Room::mudd2UseMTricorderOnCapsules() { @@ -324,31 +324,31 @@ void Room::mudd2MccoyCuredMudd() { void Room::mudd2LookAtKirk() { - showText(TX_MUD2N003); + showDescription(TX_MUD2N003); } void Room::mudd2LookAtSpock() { - showText(TX_MUD2N006); + showDescription(TX_MUD2N006); } void Room::mudd2LookAtMccoy() { - showText(TX_MUD2N000); + showDescription(TX_MUD2N000); } void Room::mudd2LookAtRedshirt() { - showText(TX_MUD2N004); + showDescription(TX_MUD2N004); } void Room::mudd2LookAtMudd() { - showText(TX_MUD2N002); + showDescription(TX_MUD2N002); } void Room::mudd2LookAtControlPanel() { - showText(TX_MUD2N011); + showDescription(TX_MUD2N011); } void Room::mudd2LookAtBed() { - showText(TX_MUD2N007); + showDescription(TX_MUD2N007); } void Room::mudd2TalkToKirk() { diff --git a/engines/startrek/rooms/mudd3.cpp b/engines/startrek/rooms/mudd3.cpp index d11d9d8e36..24c8ecb824 100644 --- a/engines/startrek/rooms/mudd3.cpp +++ b/engines/startrek/rooms/mudd3.cpp @@ -74,7 +74,7 @@ void Room::mudd3LookAtScreen() { if (_awayMission->mudd.translatedAlienLanguage) showText(TX_SPEAKER_SPOCK, TX_MUD3_038); else - showText(TX_MUD3N017); + showDescription(TX_MUD3N017); } void Room::mudd3UseSTricorderOnScreen() { @@ -87,7 +87,7 @@ void Room::mudd3UseSTricorderOnScreen() { // BUGFIX: Event was actually "use screen on kirk", which makes no sense. void Room::mudd3UseKirkOnScreen() { if (!_awayMission->mudd.translatedAlienLanguage) { - showText(TX_MUD3N011); + showDescription(TX_MUD3N011); showText(TX_SPEAKER_SPOCK, TX_MUD3_037); } } @@ -98,7 +98,7 @@ void Room::mudd3UseSpockOnSphere() { if (_awayMission->mudd.computerDataErasedOrDestroyed) { if (!_awayMission->mudd.databaseDestroyed) { - showText(TX_MUD3N000); + showDescription(TX_MUD3N000); showText(TX_SPEAKER_SPOCK, TX_MUD3_052); showText(TX_SPEAKER_KIRK, TX_MUD3_012); showText(TX_SPEAKER_MCCOY, TX_MUD3_024); @@ -259,7 +259,7 @@ void Room::mudd3Timer2Expired() { _awayMission->mudd.computerDataErasedOrDestroyed = true; showText(TX_SPEAKER_MUDD, TX_MUD3_065); - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // Allow him to access the database (he ends up erasing it) showText(TX_SPEAKER_MUDD, TX_MUD3_066); @@ -269,7 +269,7 @@ void Room::mudd3Timer2Expired() { // Otherwise, the end of the mission when you confront Mudd doesn't make sense // unless the player happened to try accessing the database again. Also, if you // talk to the crew, they berate him for no apparent reason if this isn't clear. - showText(TX_MUD3N000); + showDescription(TX_MUD3N000); showText(TX_SPEAKER_MCCOY, TX_MUD3_031); } else { // Don't allow it (he destroys it by accident) @@ -296,21 +296,21 @@ void Room::mudd3UseMemoryDiskOnSphere() { loadActorStandAnim(OBJECT_KIRK); if (_awayMission->mudd.databaseDestroyed) - showText(TX_MUD3N014); + showDescription(TX_MUD3N014); else if (_awayMission->mudd.translatedAlienLanguage && !_awayMission->mudd.muddErasedDatabase) { - showText(TX_MUD3N020); + showDescription(TX_MUD3N020); if (!_awayMission->mudd.gotPointsForDownloadingData) { _awayMission->mudd.missionScore += 3; _awayMission->mudd.gotPointsForDownloadingData = true; } } else - showText(TX_MUD3N019); + showDescription(TX_MUD3N019); } void Room::mudd3GetRepairTool() { if (_awayMission->mudd.tookRepairTool) - showText(TX_MUD3N018); // NOTE: unused, since the object disappears, can't be selected again + showDescription(TX_MUD3N018); // NOTE: unused, since the object disappears, can't be selected again else { _awayMission->disableInput = true; _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; @@ -336,7 +336,7 @@ void Room::mudd3LookAtSphere() { _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; loadActorStandAnim(OBJECT_KIRK); - showText(TX_MUD3N015); + showDescription(TX_MUD3N015); } void Room::mudd3WalkToNorthDoor() { @@ -366,34 +366,34 @@ void Room::mudd3TouchedHotspot1() { void Room::mudd3LookAtKirk() { if (!_awayMission->mudd.muddInDatabaseRoom) - showText(TX_MUD3N005); + showDescription(TX_MUD3N005); else - showText(TX_MUD3N004); + showDescription(TX_MUD3N004); } void Room::mudd3LookAtSpock() { if (!_awayMission->mudd.muddInDatabaseRoom) - showText(TX_MUD3N012); + showDescription(TX_MUD3N012); else - showText(TX_MUD3N002); + showDescription(TX_MUD3N002); } void Room::mudd3LookAtMccoy() { if (!_awayMission->mudd.muddInDatabaseRoom) - showText(TX_MUD3N010); + showDescription(TX_MUD3N010); else - showText(TX_MUD3N009); + showDescription(TX_MUD3N009); } void Room::mudd3LookAtRedshirt() { if (!_awayMission->mudd.muddInDatabaseRoom) - showText(TX_MUD3N007); + showDescription(TX_MUD3N007); else - showText(TX_MUD3N006); + showDescription(TX_MUD3N006); } void Room::mudd3LookAtMudd() { - showText(TX_MUD3N003); + showDescription(TX_MUD3N003); } void Room::mudd3TalkToKirk() { diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp index 1a73c6b360..e7b90f7488 100644 --- a/engines/startrek/rooms/mudd4.cpp +++ b/engines/startrek/rooms/mudd4.cpp @@ -122,7 +122,7 @@ void Room::mudd4ShowLeftConsoleMenu() { TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); switch (choice) { case 0: // Sensors @@ -225,7 +225,7 @@ void Room::mudd4ShowRightConsoleMenu() { TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); switch (choice) { case 0: // Communications @@ -297,7 +297,7 @@ void Room::mudd4KirkUsedCommunications() { TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 1) { endMission(_awayMission->mudd.missionScore, 0x1b, _awayMission->mudd.torpedoStatus); @@ -317,7 +317,7 @@ void Room::mudd4KirkUsedCommunications() { showText(TX_SPEAKER_KIRK, TX_MUD4_020); showText(TX_SPEAKER_SCOTT, TX_MUD4_S03); - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 1) { endMission(_awayMission->mudd.missionScore, 0x1b, _awayMission->mudd.torpedoStatus); @@ -365,7 +365,7 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() { }; showText(TX_SPEAKER_MUDD, TX_MUD4_066); - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 1) { // Copy of code at very bottom of function @@ -426,7 +426,7 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() { }; showText(TX_SPEAKER_MUDD, TX_MUD4_065); - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 1) { showText(TX_SPEAKER_MUDD, TX_MUD4_074); @@ -479,7 +479,7 @@ void Room::mudd4UseMedkit() { void Room::mudd4GetRepairTool() { if (_awayMission->mudd.tookRepairTool) - showText(TX_MUD4N012); // NOTE: unused, since the object disappears, can't be selected again + showDescription(TX_MUD4N012); // NOTE: unused, since the object disappears, can't be selected again else { _awayMission->disableInput = true; _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; @@ -500,34 +500,34 @@ void Room::mudd4PickedUpRepairTool() { } void Room::mudd4LookAtConsole() { - showText(TX_MUD4N000); + showDescription(TX_MUD4N000); } void Room::mudd4LookAtViewscreen() { if (_awayMission->mudd.viewScreenEnabled) - showText(TX_MUD4N008); + showDescription(TX_MUD4N008); else - showText(TX_MUD4N013); + showDescription(TX_MUD4N013); } void Room::mudd4LookAtKirk() { - showText(TX_MUD4N003); + showDescription(TX_MUD4N003); } void Room::mudd4LookAtSpock() { - showText(TX_MUD4N006); + showDescription(TX_MUD4N006); } void Room::mudd4LookAtMccoy() { - showText(TX_MUD4N001); + showDescription(TX_MUD4N001); } void Room::mudd4LookAtRedshirt() { - showText(TX_MUD4N004); + showDescription(TX_MUD4N004); } void Room::mudd4LookAtRepairTool() { - showText(TX_MUD4N011); + showDescription(TX_MUD4N011); } void Room::mudd4TalkToKirk() { diff --git a/engines/startrek/rooms/mudd5.cpp b/engines/startrek/rooms/mudd5.cpp index caa18f8dc4..b3d4f73adb 100644 --- a/engines/startrek/rooms/mudd5.cpp +++ b/engines/startrek/rooms/mudd5.cpp @@ -69,7 +69,7 @@ void Room::mudd5Timer1Expired() { // Mudd enters room through hatch }; showText(TX_SPEAKER_MUDD, TX_MUD5_034); - showText(choices); + showMultipleTexts(choices); showText(TX_SPEAKER_MUDD, TX_MUD5_037); loadActorAnim2(OBJECT_MUDD, "s4ephc"); @@ -175,16 +175,16 @@ void Room::mudd5KirkTimer3Expired() { // Mudd popped back in after repairing gen } void Room::mudd5LookAtHatch() { - showText(TX_MUD5N011); + showDescription(TX_MUD5N011); showText(TX_SPEAKER_SPOCK, TX_MUD5_031); showText(TX_SPEAKER_KIRK, TX_MUD5_009); } void Room::mudd5LookAtLifeSupportGenerator() { if (_awayMission->mudd.lifeSupportMalfunctioning) - showText(TX_MUD5N008); + showDescription(TX_MUD5N008); else { - showText(TX_MUD5N012); + showDescription(TX_MUD5N012); showText(TX_SPEAKER_SPOCK, TX_MUD5_026); } } @@ -203,31 +203,31 @@ void Room::mudd5WalkToDoor() { } void Room::mudd5LookAtKirk() { - showText(TX_MUD5N002); + showDescription(TX_MUD5N002); } void Room::mudd5LookAtSpock() { - showText(TX_MUD5N005); + showDescription(TX_MUD5N005); } void Room::mudd5LookAtMccoy() { - showText(TX_MUD5N004); + showDescription(TX_MUD5N004); } void Room::mudd5LookAtRedshirt() { - showText(TX_MUD5N003); + showDescription(TX_MUD5N003); } void Room::mudd5LookAtDoor() { - showText(TX_MUD5N010); + showDescription(TX_MUD5N010); } void Room::mudd5LookAtCrane() { - showText(TX_MUD5N000); + showDescription(TX_MUD5N000); } void Room::mudd5LookAtEngine() { - showText(TX_MUD5N006); + showDescription(TX_MUD5N006); } void Room::mudd5TalkToKirk() { diff --git a/engines/startrek/rooms/mudda.cpp b/engines/startrek/rooms/mudda.cpp index 4c92ae03d5..9c0f11e6df 100644 --- a/engines/startrek/rooms/mudda.cpp +++ b/engines/startrek/rooms/mudda.cpp @@ -44,7 +44,7 @@ void Room::muddaUseLenseOnDegrimer() { loseItem(OBJECT_ILENSES); _awayMission->mudd.missionScore++; - showText(text[_roomIndex]); + showDescription(text[_roomIndex]); } @@ -102,7 +102,7 @@ void Room::muddaUseDegrimer() { TX_MUD5N001, }; - showText(text[_roomIndex]); + showDescription(text[_roomIndex]); } void Room::muddaTick() { @@ -175,7 +175,7 @@ void Room::muddaTick() { anim += directions[i][_roomIndex]; loadActorAnim2(i, anim); } - showText(deathText[_roomIndex]); + showDescription(deathText[_roomIndex]); showGameOverMenu(); } } diff --git a/engines/startrek/rooms/sins0.cpp b/engines/startrek/rooms/sins0.cpp index 61db8ef338..63d77ddbd1 100644 --- a/engines/startrek/rooms/sins0.cpp +++ b/engines/startrek/rooms/sins0.cpp @@ -93,15 +93,15 @@ void Room::sins0Tick1() { } void Room::sins0LookAnywhere() { - showText(TX_SIN0N009); + showDescription(TX_SIN0N009); } void Room::sins0LookAtOpenDoor() { - showText(TX_SIN0N005); + showDescription(TX_SIN0N005); } void Room::sins0LookAtClosedDoor() { - showText(TX_SIN0N008); + showDescription(TX_SIN0N008); } void Room::sins0TalkToSpock() { @@ -127,7 +127,7 @@ void Room::sins0TalkToRedshirt() { } void Room::sins0LookAtGround() { - showText(TX_SIN0N006); + showDescription(TX_SIN0N006); } void Room::sins0GetRock() { @@ -139,7 +139,7 @@ void Room::sins0GetRock() { void Room::sins0PickedUpRock() { _awayMission->disableInput = false; loadActorStandAnim(OBJECT_KIRK); - showText(TX_SIN0N010); + showDescription(TX_SIN0N010); giveItem(OBJECT_IS8ROCKS); } @@ -172,7 +172,7 @@ void Room::sins0Tick40() { } void Room::sins0LookAtStatue() { - showText(TX_SIN0N011); + showDescription(TX_SIN0N011); showText(TX_SPEAKER_MCCOY, TX_SIN0_015); showText(TX_SPEAKER_SPOCK, TX_SIN0_021); showText(TX_SPEAKER_MOSHER, TX_SIN0_027); @@ -180,28 +180,28 @@ void Room::sins0LookAtStatue() { } void Room::sins0LookAtPlanet() { - showText(TX_SIN0N007); + showDescription(TX_SIN0N007); } void Room::sins0LookAtSky() { // This seems unused, due to HOTSPOT_SKY not being mapped anywhere? - showText(TX_SIN0N004); + showDescription(TX_SIN0N004); } void Room::sins0LookAtKirk() { - showText(TX_SIN0N002); + showDescription(TX_SIN0N002); } void Room::sins0LookAtSpock() { - showText(TX_SIN0N003); + showDescription(TX_SIN0N003); } void Room::sins0LookAtMccoy() { - showText(TX_SIN0N000); + showDescription(TX_SIN0N000); } void Room::sins0LookAtRedshirt() { - showText(TX_SIN0N001); + showDescription(TX_SIN0N001); } void Room::sins0UseSTricorderOnClosedDoor() { diff --git a/engines/startrek/rooms/sins1.cpp b/engines/startrek/rooms/sins1.cpp index ac812211db..e2873680ca 100644 --- a/engines/startrek/rooms/sins1.cpp +++ b/engines/startrek/rooms/sins1.cpp @@ -117,27 +117,27 @@ void Room::sins1Tick1() { } void Room::sins1LookAnywhere() { - showText(TX_SIN1N001); + showDescription(TX_SIN1N001); } void Room::sins1LookAtLock() { - showText(TX_SIN1N009); + showDescription(TX_SIN1N009); } void Room::sins1LookAtDoor() { // NOTE: This function had two implementations (one unused). if (true) - showText(TX_SIN1N010); + showDescription(TX_SIN1N010); else - showText(TX_SIN1N008); + showDescription(TX_SIN1N008); } void Room::sins1LookAtPanel() { - showText(TX_SIN1N003); + showDescription(TX_SIN1N003); } void Room::sins1LookAtKeypad() { - showText(TX_SIN1N011); + showDescription(TX_SIN1N011); } void Room::sins1UseSTricorderOnPanel() { @@ -169,7 +169,7 @@ void Room::sins1UseSTricorderOnLens() { } void Room::sins1UseRockOnDoor() { - showText(TX_SIN1N007); + showDescription(TX_SIN1N007); } void Room::sins1UseRedshirtOnKeypad() { @@ -298,23 +298,23 @@ void Room::sins1TalkToRedshirt() { } void Room::sins1LookAtKirk() { - showText(TX_SIN1N005); + showDescription(TX_SIN1N005); } void Room::sins1LookAtSpock() { - showText(TX_SIN1N004); + showDescription(TX_SIN1N004); } void Room::sins1LookAtMccoy() { - showText(TX_SIN1N006); + showDescription(TX_SIN1N006); } void Room::sins1LookAtRedshirt() { - showText(TX_SIN1N002); + showDescription(TX_SIN1N002); } void Room::sins1LookAtLens() { - showText(TX_SIN1N000); + showDescription(TX_SIN1N000); } void Room::sins1UseCommunicator() { diff --git a/engines/startrek/rooms/sins2.cpp b/engines/startrek/rooms/sins2.cpp index 37e352fd6b..b85ca345ed 100644 --- a/engines/startrek/rooms/sins2.cpp +++ b/engines/startrek/rooms/sins2.cpp @@ -238,35 +238,35 @@ void Room::sins2Tick40() { } void Room::sins2LookAnywhere() { - showText(TX_SIN2N006); + showDescription(TX_SIN2N006); } void Room::sins2LookAtOpenDoor() { - showText(TX_SIN2N007); + showDescription(TX_SIN2N007); } void Room::sins2LookAtTerminal() { - showText(TX_SIN2N000); + showDescription(TX_SIN2N000); } void Room::sins2LookAtKeypad() { - showText(TX_SIN2N001); + showDescription(TX_SIN2N001); } void Room::sins2LookAtKirk() { - showText(TX_SIN2N003); + showDescription(TX_SIN2N003); } void Room::sins2LookAtSpock() { - showText(TX_SIN2N005); + showDescription(TX_SIN2N005); } void Room::sins2LookAtMccoy() { - showText(TX_SIN2N004); + showDescription(TX_SIN2N004); } void Room::sins2LookAtRedshirt() { - showText(TX_SIN2N002); + showDescription(TX_SIN2N002); } void Room::sins2TalkToKirk() { @@ -289,7 +289,7 @@ void Room::sins2TalkToRedshirt() { void Room::sins2LookAtDoor() { if (!_awayMission->sins.openedInnerDoor) - showText(TX_SIN2N008); + showDescription(TX_SIN2N008); } void Room::sins2UseSpockOnDoor() { diff --git a/engines/startrek/rooms/sins3.cpp b/engines/startrek/rooms/sins3.cpp index fd831b1202..f04450b3f0 100644 --- a/engines/startrek/rooms/sins3.cpp +++ b/engines/startrek/rooms/sins3.cpp @@ -172,19 +172,19 @@ void Room::sins3UseSTricorderOnPanel() { } void Room::sins3LookAtDrill() { - showText(TX_SIN3N012); + showDescription(TX_SIN3N012); } void Room::sins3LookAtPanel() { - showText(TX_SIN3N011); + showDescription(TX_SIN3N011); } void Room::sins3LookAtMonitor() { - showText(TX_SIN3N007); + showDescription(TX_SIN3N007); } void Room::sins3LookAnywhere() { - showText(TX_SIN3N013); + showDescription(TX_SIN3N013); } void Room::sins3UseSTricorderOnWall() { @@ -197,11 +197,11 @@ void Room::sins3UseSTricorderOnWall() { void Room::sins3LookAtBox() { if (_awayMission->sins.boxState == 0) - showText(TX_SIN3N000); + showDescription(TX_SIN3N000); else if (_awayMission->sins.boxState == 1) - showText(TX_SIN3N008); + showDescription(TX_SIN3N008); else if (_awayMission->sins.boxState == 2) - showText(TX_SIN3N005); + showDescription(TX_SIN3N005); } void Room::sins3UseKirkOnBox() { @@ -326,7 +326,7 @@ void Room::sins3SpockReachedPanel() { TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 3) // cancel return; @@ -428,7 +428,7 @@ void Room::sins3RockVaporized() { void Room::sins3UseDrillAnywhere() { // It isn't possible to "use" a hotspot on something else, so this is never called? - showText(TX_SIN3N009); + showDescription(TX_SIN3N009); } void Room::sins3GetIDCard() { @@ -452,27 +452,27 @@ void Room::sins3PickedUpIDCard() { void Room::sins3LookAtItemBeingDrilled() { if (_awayMission->sins.moldState == 2) - showText(TX_SIN3N006); + showDescription(TX_SIN3N006); else if (_awayMission->sins.moldState == 3) - showText(TX_SIN3N014); + showDescription(TX_SIN3N014); else if (_awayMission->sins.moldState == 4) - showText(TX_SIN3N010); + showDescription(TX_SIN3N010); } void Room::sins3LookAtKirk() { - showText(TX_SIN3N003); + showDescription(TX_SIN3N003); } void Room::sins3LookAtSpock() { - showText(TX_SIN3N004); + showDescription(TX_SIN3N004); } void Room::sins3LookAtMccoy() { - showText(TX_SIN3N001); // BUGFIX: Speaker is "nobody", not Dr. McCoy + showDescription(TX_SIN3N001); // BUGFIX: Speaker is "nobody", not Dr. McCoy } void Room::sins3LookAtRedshirt() { - showText(TX_SIN3N002); + showDescription(TX_SIN3N002); } void Room::sins3TalkToKirk() { diff --git a/engines/startrek/rooms/sins4.cpp b/engines/startrek/rooms/sins4.cpp index 7426bef3aa..9a0a37b54e 100644 --- a/engines/startrek/rooms/sins4.cpp +++ b/engines/startrek/rooms/sins4.cpp @@ -142,7 +142,7 @@ void Room::sins4UsePhaserOnPanel() { void Room::sins4UseIDCardOnPanel() { if (_awayMission->sins.unlockedIDCardDoor) - showText(TX_SIN4N006); + showDescription(TX_SIN4N006); else walkCrewmanC(OBJECT_KIRK, 0xb8, 0x86, &Room::sins4KirkReachedPanel); } @@ -170,7 +170,7 @@ void Room::sins4KirkReachedPanelWithRock() { } void Room::sins4KirkUsedRockOnPanel() { - showText(TX_SIN4N012); + showDescription(TX_SIN4N012); showText(TX_SPEAKER_SPOCK, TX_SIN4_022); if (_awayMission->sins.gatheredClues == 7) { @@ -180,19 +180,19 @@ void Room::sins4KirkUsedRockOnPanel() { } void Room::sins4LookAtWestDoor() { - showText(TX_SIN4N009); + showDescription(TX_SIN4N009); } void Room::sins4LookAtEastDoor() { - showText(TX_SIN4N010); + showDescription(TX_SIN4N010); } void Room::sins4LookAnywhere() { - showText(TX_SIN4N013); + showDescription(TX_SIN4N013); } void Room::sins4LookAtPanel() { - showText(TX_SIN4N011); + showDescription(TX_SIN4N011); } void Room::sins4Tick40() { @@ -211,35 +211,35 @@ void Room::sins4Tick40() { } void Room::sins4LookAtKirk() { - showText(TX_SIN4N002); + showDescription(TX_SIN4N002); } void Room::sins4LookAtSpock() { - showText(TX_SIN4N004); + showDescription(TX_SIN4N004); } void Room::sins4LookAtMccoy() { - showText(TX_SIN4N003); + showDescription(TX_SIN4N003); } void Room::sins4LookAtRedshirt() { - showText(TX_SIN4N001); + showDescription(TX_SIN4N001); } void Room::sins4LookAtLight() { - showText(TX_SIN4N000); + showDescription(TX_SIN4N000); } void Room::sins4LookAtBeam() { - showText(TX_SIN4N005); + showDescription(TX_SIN4N005); } void Room::sins4LookAtOpenNorthDoor() { - showText(TX_SIN4N008); + showDescription(TX_SIN4N008); } void Room::sins4LookAtClosedNorthDoor() { - showText(TX_SIN4N007); + showDescription(TX_SIN4N007); } void Room::sins4TalkToKirk() { diff --git a/engines/startrek/rooms/sins5.cpp b/engines/startrek/rooms/sins5.cpp index 18be050d71..ac3868f795 100644 --- a/engines/startrek/rooms/sins5.cpp +++ b/engines/startrek/rooms/sins5.cpp @@ -311,7 +311,7 @@ void Room::sins5WireConnected() { _awayMission->sins.wireConnected1 = true; _awayMission->sins.wireConnected2 = true; loadActorAnim2(OBJECT_CABLE, "s5cabl", 0, 0); - showText(TX_SIN5N004); + showDescription(TX_SIN5N004); loseItem(OBJECT_ICONECT); playMidiMusicTracks(MIDITRACK_30, -1); } @@ -393,8 +393,8 @@ void Room::sins5Timer2Expired() { void Room::sins5ComputerLaunchesMissiles() { playMidiMusicTracks(MIDITRACK_2, -1); - showText(TX_SIN5N012); - showText(TX_SIN5N013); + showDescription(TX_SIN5N012); + showDescription(TX_SIN5N013); showGameOverMenu(); } @@ -403,47 +403,47 @@ void Room::sins5Timer3Expired() { } void Room::sins5LookAnywhere() { - showText(TX_SIN5N005); + showDescription(TX_SIN5N005); } void Room::sins5LookAtKirk() { - showText(TX_SIN5N000); + showDescription(TX_SIN5N000); } void Room::sins5LookAtSpock() { - showText(TX_SIN5N006); + showDescription(TX_SIN5N006); } void Room::sins5LookAtMccoy() { - showText(TX_SIN5N001); + showDescription(TX_SIN5N001); } void Room::sins5LookAtRedshirt() { - showText(TX_SIN5N002); + showDescription(TX_SIN5N002); } void Room::sins5LookAtLight() { - showText(TX_SIN5N007); + showDescription(TX_SIN5N007); } void Room::sins5LookAtLeftComputer() { - showText(TX_SIN5N010); + showDescription(TX_SIN5N010); } void Room::sins5LookAtMiddleComputer() { - showText(TX_SIN5N008); + showDescription(TX_SIN5N008); } void Room::sins5LookAtRightComputer() { - showText(TX_SIN5N009); + showDescription(TX_SIN5N009); } void Room::sins5LookAtMissile() { - showText(TX_SIN5N003); + showDescription(TX_SIN5N003); } void Room::sins5LookAtNorthDoor() { - showText(TX_SIN5N011); + showDescription(TX_SIN5N011); } void Room::sins5UseMedkitOnCrewman() { diff --git a/engines/startrek/rooms/trial0.cpp b/engines/startrek/rooms/trial0.cpp index 6c6307e840..f4aba4d304 100644 --- a/engines/startrek/rooms/trial0.cpp +++ b/engines/startrek/rooms/trial0.cpp @@ -117,7 +117,7 @@ void Room::trial0ReachedRoomCenter() { TX_TRI0_019, TX_TRI0_016, TX_TRI0_021, TX_BLANK }; - showText(choices1); + showMultipleTexts(choices1); showText(TX_SPEAKER_VLICT, TX_TRI0_054); showText(TX_SPEAKER_KIRK, TX_TRI0_004); @@ -128,7 +128,7 @@ void Room::trial0ReachedRoomCenter() { TX_TRI0_011, TX_TRI0_018, TX_TRI0_015, TX_BLANK }; - int choice = showText(choices2); + int choice = showMultipleTexts(choices2); if (choice == 0) { // Kirk intervenes as a warrior showText(TX_SPEAKER_VLICT, TX_TRI0_043); @@ -153,7 +153,7 @@ void Room::trial0ReachedRoomCenter() { TX_TRI0_023, TX_TRI0_006, TX_TRI0_010, TX_BLANK }; - choice = showText(choices3); + choice = showMultipleTexts(choices3); if (choice == 0 || choice == 1) { showText(TX_SPEAKER_VLICT, TX_TRI0_052); @@ -163,7 +163,7 @@ void Room::trial0ReachedRoomCenter() { TX_TRI0_017, TX_TRI0_020, TX_TRI0_008, TX_BLANK }; - choice = showText(choices4); + choice = showMultipleTexts(choices4); if (choice == 0 || choice == 1) { showText(TX_SPEAKER_VLICT, TX_TRI0_057); @@ -175,7 +175,7 @@ void Room::trial0ReachedRoomCenter() { TX_TRI0_009, TX_TRI0_014, TX_TRI0_013, TX_BLANK }; - choice = showText(choices5); + choice = showMultipleTexts(choices5); if (choice == 0 || choice == 1) { showText(TX_SPEAKER_VLICT, TX_TRI0_055); @@ -205,43 +205,43 @@ void Room::trial0ReachedRoomCenter() { } void Room::trial0LookAtWindow() { - showText(TX_TRI0N007); + showDescription(TX_TRI0N007); } void Room::trial0LookAtVlict() { - showText(TX_TRI0N001); + showDescription(TX_TRI0N001); } void Room::trial0LookAtGuard() { - showText(TX_TRI0N000); + showDescription(TX_TRI0N000); } void Room::trial0LookAtBench() { - showText(TX_TRI0N006); + showDescription(TX_TRI0N006); } void Room::trial0LookAtSeal() { - showText(TX_TRI0N008); + showDescription(TX_TRI0N008); } void Room::trial0LookAtKirk() { - showText(TX_TRI0N004); + showDescription(TX_TRI0N004); } void Room::trial0LookAtSpock() { - showText(TX_TRI0N005); + showDescription(TX_TRI0N005); } void Room::trial0LookAtMccoy() { - showText(TX_TRI0N002); + showDescription(TX_TRI0N002); } void Room::trial0LookAtRedshirt() { - showText(TX_TRI0N003); + showDescription(TX_TRI0N003); } void Room::trial0LookAtQuetzecoatl() { - showText(TX_TRI0N009); + showDescription(TX_TRI0N009); } void Room::trial0TalkToVlict() { diff --git a/engines/startrek/rooms/trial1.cpp b/engines/startrek/rooms/trial1.cpp index c6462c90c3..b1bdf0a725 100644 --- a/engines/startrek/rooms/trial1.cpp +++ b/engines/startrek/rooms/trial1.cpp @@ -238,47 +238,47 @@ void Room::trial1PickedUpRod() { } void Room::trial1LookAtKirk() { - showText(TX_TRI1N003); + showDescription(TX_TRI1N003); } void Room::trial1LookAtSpock() { - showText(TX_TRI1N017); + showDescription(TX_TRI1N017); } void Room::trial1LookAtMccoy() { - showText(TX_TRI1N016); + showDescription(TX_TRI1N016); } void Room::trial1LookAtRedshirt() { - showText(TX_TRI1N015); + showDescription(TX_TRI1N015); } void Room::trial1LookAtWall() { - showText(TX_TRI1N011); + showDescription(TX_TRI1N011); } void Room::trial1LookAtFloor() { - showText(TX_TRI1N006); + showDescription(TX_TRI1N006); } void Room::trial1LookAtRods() { - showText(TX_TRI1N009); + showDescription(TX_TRI1N009); } void Room::trial1LookAtDoor() { - showText(TX_TRI1N001); + showDescription(TX_TRI1N001); } void Room::trial1LookAtLock() { - showText(TX_TRI1N002); + showDescription(TX_TRI1N002); } void Room::trial1LookAtEntity() { - showText(TX_TRI1N000); + showDescription(TX_TRI1N000); } void Room::trial1LookAtMoltenRock() { - showText(TX_TRI1N007); + showDescription(TX_TRI1N007); } void Room::trial1TalkToKirk() { @@ -307,11 +307,11 @@ void Room::trial1UsePhaserOnCrewman() { } void Room::trial1UsePhaserOnEntity() { - showText(TX_TRI1N004); + showDescription(TX_TRI1N004); } void Room::trial1UsePhaserOnWall() { - showText(TX_TRI1N008); + showDescription(TX_TRI1N008); } @@ -345,7 +345,7 @@ void Room::trial1ReachedFloorToUseKillPhaser() { } void Room::trial1DoneShootingFloorWithKillPhaser() { - showText(TX_TRI1N014); + showDescription(TX_TRI1N014); loadActorAnim2(OBJECT_MOLTEN_ROCK, "t1mltd", 0xca, 0xbc); _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E; @@ -357,7 +357,7 @@ void Room::trial1DoneShootingFloorWithKillPhaser() { } void Room::trial1UsePhaserOnRod() { - showText(TX_TRI1N012); + showDescription(TX_TRI1N012); } void Room::trial1UsePhaserOnDoor() { @@ -434,7 +434,7 @@ void Room::trial1UseCommunicator() { TX_TRI1_005, TX_TRI1_004, TX_TRI1_009, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // "Beam us back to the enterprise" _awayMission->trial.missionEndMethod = 1; @@ -461,7 +461,7 @@ void Room::trial1UseCommunicator() { TX_TRI1_006, TX_TRI1_002, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // Don't analyze the anomolous program showText(TX_SPEAKER_UHURA, TX_TRI1U079); @@ -476,7 +476,7 @@ void Room::trial1UseCommunicator() { TX_TRI1_003, TX_TRI1_008, TX_BLANK }; - choice = showText(choices2); + choice = showMultipleTexts(choices2); if (choice == 0) { // Activate the program showText(TX_SPEAKER_UHURA, TX_TRI1U095); @@ -625,7 +625,7 @@ void Room::trial1UseRodOnRedshirt() { } void Room::trial1UseRodOnFloorOrWall() { - showText(TX_TRI1C002); + showDescription(TX_TRI1C002); } @@ -645,7 +645,7 @@ void Room::trial1DoneThrowingWoodRod() { void Room::trial1UseWoodRodOnLock() { - showText(TX_TRI1N005); + showDescription(TX_TRI1N005); } @@ -660,7 +660,7 @@ void Room::trial1ReachedMoltenRock() { void Room::trial1DoneCoatingWoodRod() { _awayMission->disableInput = false; - showText(TX_TRI1N013); + showDescription(TX_TRI1N013); loseItem(OBJECT_IWROD); giveItem(OBJECT_IIROD); @@ -699,7 +699,7 @@ void Room::trial1DoneThrowingIronRod() { void Room::trial1UseIronRodOnLock() { - showText(TX_TRI1N004); + showDescription(TX_TRI1N004); } void Room::trial1GetThrownIronRod() { diff --git a/engines/startrek/rooms/trial2.cpp b/engines/startrek/rooms/trial2.cpp index 642778ac75..53e7f66ad1 100644 --- a/engines/startrek/rooms/trial2.cpp +++ b/engines/startrek/rooms/trial2.cpp @@ -164,35 +164,35 @@ void Room::trial2TouchedHotspot0() { // This is unused } void Room::trial2LookAtKirk() { - showText(TX_TRI2N003); + showDescription(TX_TRI2N003); } void Room::trial2LookAtSpock() { - showText(TX_TRI2N001); + showDescription(TX_TRI2N001); } void Room::trial2LookAtMccoy() { - showText(TX_TRI2N006); + showDescription(TX_TRI2N006); } void Room::trial2LookAtRedshirt() { - showText(TX_TRI2N002); + showDescription(TX_TRI2N002); } void Room::trial2LookAtInsignia() { - showText(TX_TRI2N004); + showDescription(TX_TRI2N004); } void Room::trial2LookAtGlob() { - showText(TX_TRI2N000); + showDescription(TX_TRI2N000); } void Room::trial2LookAtWall() { - showText(TX_TRI2N007); + showDescription(TX_TRI2N007); } void Room::trial2LookAtDoor() { - showText(TX_TRI2N005); + showDescription(TX_TRI2N005); } void Room::trial2TalkToKirk() { @@ -212,11 +212,11 @@ void Room::trial2TalkToRedshirt() { } void Room::trial2TalkToGlob() { - showText(TX_QUIET); + showDescription(TX_QUIET); } void Room::trial2UsePhaserOnWall() { - showText(TX_TRI2N008); + showDescription(TX_TRI2N008); } @@ -410,7 +410,7 @@ void Room::trial2UseCommunicator() { TX_TRI2_003, TX_TRI2_004, TX_TRI2_007, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // "Beam us back to the enterprise" _awayMission->trial.missionEndMethod = 1; diff --git a/engines/startrek/rooms/trial3.cpp b/engines/startrek/rooms/trial3.cpp index 47f56ccd55..acfd2be4d3 100644 --- a/engines/startrek/rooms/trial3.cpp +++ b/engines/startrek/rooms/trial3.cpp @@ -220,7 +220,7 @@ void Room::trial3CheckShowUhuraText() { TX_TRI3_006, TX_TRI3_002, TX_TRI3_003, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // Don't beam out } else if (choice == 1) { // Beam to enterprise @@ -260,27 +260,27 @@ void Room::trial3KirkExploded() { } void Room::trial3LookAtKirk() { - showText(TX_TRI3N000); + showDescription(TX_TRI3N000); } void Room::trial3LookAtSpock() { - showText(TX_TRI3N004); + showDescription(TX_TRI3N004); } void Room::trial3LookAtMccoy() { - showText(TX_TRI3N001); + showDescription(TX_TRI3N001); } void Room::trial3LookAtRedshirt() { - showText(TX_TRI3N002); + showDescription(TX_TRI3N002); } void Room::trial3LookAtExit() { - showText(TX_TRI3N005); + showDescription(TX_TRI3N005); } void Room::trial3LookAtWall() { - showText(TX_TRI3N007); + showDescription(TX_TRI3N007); } void Room::trial3TalkToKirk() { @@ -300,7 +300,7 @@ void Room::trial3TalkToRedshirt() { } void Room::trial3UsePhaserOnWall() { - showText(TX_TRI3N006); + showDescription(TX_TRI3N006); } void Room::trial3UseStunPhaserOnKlingon1() { @@ -346,7 +346,7 @@ void Room::trial3ReadyToShootKlingon1OnKill() { } void Room::trial3UsePhaserAnywhere() { - showText(TX_TRI3N003); + showDescription(TX_TRI3N003); } void Room::trial3UseMTricorderOnKirk() { @@ -395,7 +395,7 @@ void Room::trial3UseCommunicator() { TX_TRI3_103, TX_TRI3_104, TX_TRI3_107, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // "Beam us back to the enterprise" _awayMission->trial.missionEndMethod = 1; diff --git a/engines/startrek/rooms/trial4.cpp b/engines/startrek/rooms/trial4.cpp index bfbb516a6a..62f00c63e2 100644 --- a/engines/startrek/rooms/trial4.cpp +++ b/engines/startrek/rooms/trial4.cpp @@ -54,7 +54,7 @@ void Room::trial4Tick60() { TX_TRI4_022, TX_TRI4_039, TX_TRI4_032, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // "You were trying to kill us" showText(TX_SPEAKER_VLICT, TX_TRI4_064); @@ -64,7 +64,7 @@ void Room::trial4Tick60() { TX_TRI4_033, TX_TRI4_009, TX_TRI4_002, TX_BLANK }; - showText(choices2); // choice doesn't matter + showMultipleTexts(choices2); // choice doesn't matter showText(TX_SPEAKER_VLICT, TX_TRI4_062); showText(TX_SPEAKER_KIRK, TX_TRI4_014); @@ -76,7 +76,7 @@ void Room::trial4Tick60() { TX_TRI4_029, TX_TRI4_020, TX_TRI4_030, TX_BLANK }; - choice = showText(choices3); + choice = showMultipleTexts(choices3); if (choice == 0) { // "Then you have my deepest respect" // Nothing more @@ -104,7 +104,7 @@ void Room::trial4Tick60() { TX_TRI4_019, TX_TRI4_025, TX_TRI4_008, TX_BLANK }; - choice = showText(choices2); + choice = showMultipleTexts(choices2); if (choice == 1) { // Threatened Vlict showText(TX_SPEAKER_VLICT, TX_TRI4_069); @@ -118,7 +118,7 @@ void Room::trial4Tick60() { TX_TRI4_027, TX_TRI4_034, TX_TRI4_018, TX_BLANK }; - choice = showText(choices2); + choice = showMultipleTexts(choices2); if (choice == 0) { // "Let's stop playing games" showText(TX_SPEAKER_VLICT, TX_TRI4_075); @@ -131,7 +131,7 @@ void Room::trial4Tick60() { TX_TRI4_028, TX_TRI4_021, TX_TRI4_031, TX_BLANK }; - choice = showText(choices3); + choice = showMultipleTexts(choices3); if (choice == 0 || choice == 1) { showText(TX_SPEAKER_VLICT, TX_TRI4_068); @@ -156,7 +156,7 @@ void Room::trial4Tick60() { TX_TRI4_026, TX_TRI4_024, TX_TRI4_023, TX_BLANK }; - choice = showText(choices3); + choice = showMultipleTexts(choices3); if (choice == 0) { // "The empire will learn you betrayed them" showText(TX_SPEAKER_VLICT, TX_TRI4_057); diff --git a/engines/startrek/rooms/trial5.cpp b/engines/startrek/rooms/trial5.cpp index 8d522fdcc2..59c6a71931 100644 --- a/engines/startrek/rooms/trial5.cpp +++ b/engines/startrek/rooms/trial5.cpp @@ -198,7 +198,7 @@ void Room::trial5VlictAppeared() { TX_TRI5_003, TX_TRI5_008, TX_TRI5_006, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // "Do you want me to help you?" showText(TX_SPEAKER_VLICT, TX_TRI5_023); @@ -209,7 +209,7 @@ void Room::trial5VlictAppeared() { TX_TRI5_009, TX_TRI5_007, TX_BLANK }; - choice = showText(choices2); + choice = showMultipleTexts(choices2); if (choice == 0) choice = 1; @@ -332,27 +332,27 @@ void Room::trial5GetBlueGem3() { } void Room::trial5LookAtKirk() { - showText(TX_TRI5N005); + showDescription(TX_TRI5N005); } void Room::trial5LookAtSpock() { - showText(TX_TRI5N009); + showDescription(TX_TRI5N009); } void Room::trial5LookAtMccoy() { - showText(TX_TRI5N008); + showDescription(TX_TRI5N008); } void Room::trial5LookAtRedshirt() { - showText(TX_TRI5N010); + showDescription(TX_TRI5N010); } void Room::trial5LookAtBeam() { - showText(TX_TRI5N002); + showDescription(TX_TRI5N002); } void Room::trial5LookAtInterface() { - showText(TX_TRI5N004); + showDescription(TX_TRI5N004); } void Room::trial5UseSTricorderOnInterface() { @@ -364,43 +364,43 @@ void Room::trial5UseMTricorderOnInterface() { } void Room::trial5LookAtRedGem1() { - showText(TX_TRI5N013); + showDescription(TX_TRI5N013); } void Room::trial5LookAtRedGem2() { - showText(TX_TRI5N014); + showDescription(TX_TRI5N014); } void Room::trial5LookAtRedGem3() { - showText(TX_TRI5N015); + showDescription(TX_TRI5N015); } void Room::trial5LookAtGreenGem1() { - showText(TX_TRI5N019); + showDescription(TX_TRI5N019); } void Room::trial5LookAtGreenGem2() { - showText(TX_TRI5N020); + showDescription(TX_TRI5N020); } void Room::trial5LookAtGreenGem3() { - showText(TX_TRI5N021); + showDescription(TX_TRI5N021); } void Room::trial5LookAtBlueGem1() { - showText(TX_TRI5N016); + showDescription(TX_TRI5N016); } void Room::trial5LookAtBlueGem2() { - showText(TX_TRI5N017); + showDescription(TX_TRI5N017); } void Room::trial5LookAtBlueGem3() { - showText(TX_TRI5N018); + showDescription(TX_TRI5N018); } void Room::trial5LookAtHole() { - showText(TX_TRI5N006); + showDescription(TX_TRI5N006); } void Room::trial5TalkToKirk() { @@ -420,22 +420,22 @@ void Room::trial5TalkToRedshirt() { } void Room::trial5UsePhaser() { - showText(TX_TRI5N011); + showDescription(TX_TRI5N011); } void Room::trial5UseMTricorderAnywhere() { // BUGFIX: Original had Spock doing the animation, not Mccoy mccoyScan(DIR_S, -1, true); - showText(TX_TRI5N012); + showDescription(TX_TRI5N012); } void Room::trial5UseSTricorderAnywhere() { spockScan(DIR_S, -1, true); - showText(TX_TRI5N012); + showDescription(TX_TRI5N012); } void Room::trial5UseCommunicator() { - showText(TX_TRI5N007); + showDescription(TX_TRI5N007); } void Room::trial5UseGemOnHole(int16 item, int16 object, int16 hole) { diff --git a/engines/startrek/rooms/tug0.cpp b/engines/startrek/rooms/tug0.cpp index 640ecef6b4..7c31e8d7f3 100644 --- a/engines/startrek/rooms/tug0.cpp +++ b/engines/startrek/rooms/tug0.cpp @@ -48,9 +48,9 @@ void Room::tug0Tick1() { void Room::tug0LookAtEngineer() { if (_awayMission->tug.engineerConscious) - showText(TX_TUG0N002); + showDescription(TX_TUG0N002); else - showText(TX_TUG0N014); + showDescription(TX_TUG0N014); } void Room::tug0GetEngineer() { @@ -59,9 +59,9 @@ void Room::tug0GetEngineer() { void Room::tug0LookAtControls() { if (_awayMission->tug.transporterRepaired) - showText(TX_TUG0N012); + showDescription(TX_TUG0N012); else - showText(TX_TUG0N001); + showDescription(TX_TUG0N001); } void Room::tug0UseSpockOnControls() { @@ -208,15 +208,15 @@ void Room::tug0KirkGotTransmogrifier() { void Room::tug0LookAtToolbox() { if (_awayMission->tug.gotTransmogrifier) - showText(TX_TUG0N008); + showDescription(TX_TUG0N008); else - showText(TX_TUG0N000); + showDescription(TX_TUG0N000); } void Room::tug0UsePhaserOnWelder() { loseItem(OBJECT_IPWE); giveItem(OBJECT_IPWF); - showText(TX_TUG0N006); + showDescription(TX_TUG0N006); // BUGFIX: this following line didn't exist, despite it existing in TUG1; meaning this // was supposed to give points, but it only did in a specific room. @@ -224,7 +224,7 @@ void Room::tug0UsePhaserOnWelder() { } void Room::tug0UseWelderOnWireScraps() { - showText(TX_TUG0N010); + showDescription(TX_TUG0N010); loseItem(OBJECT_IWIRSCRP); } @@ -387,27 +387,27 @@ void Room::tug0WalkToDoor() { } void Room::tug0LookAtKirk() { - showText(TX_TUG0N003); + showDescription(TX_TUG0N003); } void Room::tug0LookAtSpock() { - showText(TX_TUG0N007); + showDescription(TX_TUG0N007); } void Room::tug0LookAtMccoy() { - showText(TX_TUG0N005); + showDescription(TX_TUG0N005); } void Room::tug0LookAtRedshirt() { - showText(TX_TUG0N004); + showDescription(TX_TUG0N004); } void Room::tug0LookAtTransporter() { - showText(TX_TUG0N013); + showDescription(TX_TUG0N013); } void Room::tug0LookAtDoor() { - showText(TX_TUG0N011); + showDescription(TX_TUG0N011); } void Room::tug0TalkToKirk() { @@ -444,7 +444,7 @@ void Room::tug0UseCommunicator() { } void Room::tug0LookAnywhere() { - showText(TX_TUG0N009); + showDescription(TX_TUG0N009); } void Room::tug0UseSTricorderAnywhere() { diff --git a/engines/startrek/rooms/tug1.cpp b/engines/startrek/rooms/tug1.cpp index c91387cfc5..9f219c21b2 100644 --- a/engines/startrek/rooms/tug1.cpp +++ b/engines/startrek/rooms/tug1.cpp @@ -53,7 +53,7 @@ void Room::tug1UseSTricorderOnAnything() { void Room::tug1LookAtBridgeDoor() { if (_awayMission->tug.bridgeForceFieldDown) return; - showText(TX_TUG1N005); + showDescription(TX_TUG1N005); } void Room::tug1UseSTricorderOnBridgeDoor() { @@ -68,7 +68,7 @@ void Room::tug1UseSTricorderOnBridgeDoor() { void Room::tug1UsePhaserOnBridgeDoor() { if (_awayMission->tug.bridgeForceFieldDown) - showText(TX_TUG1N007); + showDescription(TX_TUG1N007); else { _awayMission->disableInput = true; _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; @@ -104,7 +104,7 @@ void Room::tug1UseSTricorderOnJunkPile() { } void Room::tug1LookAtJunkPile() { - showText(TX_TUG1N000); + showDescription(TX_TUG1N000); } void Room::tug1GetJunkPile() { @@ -130,13 +130,13 @@ void Room::tug1KirkFinishedTakingJunkPile() { void Room::tug1UsePhaserOnWelder() { loseItem(OBJECT_IPWE); giveItem(OBJECT_IPWF); - showText(TX_TUG1N004); + showDescription(TX_TUG1N004); _awayMission->tug.missionScore += 3; } void Room::tug1UseWelderOnWireScraps() { - showText(TX_TUG1N009); + showDescription(TX_TUG1N009); loseItem(OBJECT_IWIRSCRP); } @@ -155,7 +155,7 @@ void Room::tug1UseCombBitOnTransmogrifier() { void Room::tug1UsePhaserWelderOnBridgeDoor() { if (_awayMission->tug.bridgeForceFieldDown) - showText(TX_TUG1N008); + showDescription(TX_TUG1N008); else { _awayMission->disableInput = true; _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; @@ -165,7 +165,7 @@ void Room::tug1UsePhaserWelderOnBridgeDoor() { void Room::tug1UsePhaserWelderOnBridgeDoorInLeftSpot() { if (_awayMission->tug.bridgeForceFieldDown) - showText(TX_TUG1N007); + showDescription(TX_TUG1N007); else { _awayMission->disableInput = true; _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; @@ -200,19 +200,19 @@ void Room::tug1KirkFinishedUsingWelderInLeftSpot() { } void Room::tug1LookAnywhere() { - showText(TX_TUG1N013); + showDescription(TX_TUG1N013); } void Room::tug1LookAtMccoy() { - showText(TX_TUG1N003); + showDescription(TX_TUG1N003); } void Room::tug1LookAtSpock() { - showText(TX_TUG1N006); + showDescription(TX_TUG1N006); } void Room::tug1LookAtRedshirt() { - showText(TX_TUG1N002); + showDescription(TX_TUG1N002); } void Room::tug1TalkToMccoy() { @@ -224,15 +224,15 @@ void Room::tug1TalkToRedshirt() { } void Room::tug1LookAtTerminal() { - showText(TX_TUG1N010); + showDescription(TX_TUG1N010); } void Room::tug1LookAtDebris() { - showText(TX_TUG1N011); + showDescription(TX_TUG1N011); } void Room::tug1LookAtBrigDoor() { - showText(TX_TUG1N001); + showDescription(TX_TUG1N001); } void Room::tug1UseSTricorderOnBrigDoor() { diff --git a/engines/startrek/rooms/tug2.cpp b/engines/startrek/rooms/tug2.cpp index 04b2aaef71..1cd21dfdc6 100644 --- a/engines/startrek/rooms/tug2.cpp +++ b/engines/startrek/rooms/tug2.cpp @@ -119,19 +119,19 @@ void Room::tug2Tick60() { } void Room::tug2LookAtButton() { - showText(TX_TUG2N011); + showDescription(TX_TUG2N011); } void Room::tug2LookAtMccoy() { - showText(TX_TUG2N005); + showDescription(TX_TUG2N005); } void Room::tug2LookAtSpock() { - showText(TX_TUG2N007); + showDescription(TX_TUG2N007); } void Room::tug2LookAtRedshirt() { - showText(TX_TUG2N004); + showDescription(TX_TUG2N004); } void Room::tug2GetBomb() { @@ -140,7 +140,7 @@ void Room::tug2GetBomb() { _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; walkCrewman(OBJECT_KIRK, 0xc9, 0xa0, 12); } else - showText(TX_TUG2N024); + showDescription(TX_TUG2N024); } void Room::tug2KirkReachedBomb() { @@ -155,33 +155,33 @@ void Room::tug2KirkGotBomb() { } void Room::tug2LookAtBomb() { - showText(TX_TUG2N000); + showDescription(TX_TUG2N000); } void Room::tug2LookAtGuard1() { if (_awayMission->tug.guard1Status == 0) - showText(TX_TUG2N001); + showDescription(TX_TUG2N001); else if (_awayMission->tug.guard1Status == 1) - showText(TX_TUG2N013); + showDescription(TX_TUG2N013); else if (_awayMission->tug.guard1Status == 8) - showText(TX_TUG2N015); + showDescription(TX_TUG2N015); else if (_awayMission->tug.guard1Status == 2) - showText(TX_TUG2N106); + showDescription(TX_TUG2N106); } void Room::tug2LookAtGuard2() { if (_awayMission->tug.guard2Status == 0) - showText(TX_TUG2N037); + showDescription(TX_TUG2N037); else if (_awayMission->tug.guard2Status == 1) - showText(TX_TUG2N014); + showDescription(TX_TUG2N014); else if (_awayMission->tug.guard2Status == 8) - showText(TX_TUG2N016); + showDescription(TX_TUG2N016); else if (_awayMission->tug.guard2Status == 2) - showText(TX_TUG2N106); + showDescription(TX_TUG2N106); } void Room::tug2LookAtWires() { - showText(TX_TUG2N010); + showDescription(TX_TUG2N010); } void Room::tug2UseSTricorderOnButton() { @@ -214,7 +214,7 @@ void Room::tug2RedshirtReachedWires() { } void Room::tug2RedshirtDefusedBomb() { - showText(TX_TUG2C001); + showDescription(TX_TUG2C001); showText(TX_SPEAKER_CHRISTENSEN, TX_TUG2L011); _awayMission->tug.field35 = 4; _awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_E; @@ -376,7 +376,7 @@ void Room::tug2TurnedOffForceField() { void Room::tug2PrisonersDead() { loadActorAnim2(OBJECT_BRIG, "zapdon", 0, 0, 0); - showText(TX_TUG2N026); + showDescription(TX_TUG2N026); } void Room::tug2PrisonersReleased() { @@ -526,7 +526,7 @@ void Room::tug2KirkKillGuard2() { void Room::tug2UsePhaserOnWelder() { loseItem(OBJECT_IPWE); giveItem(OBJECT_IPWF); - showText(TX_TUG2N006); + showDescription(TX_TUG2N006); // BUGFIX: this following line didn't exist, despite it existing in TUG1; meaning this // was supposed to give points, but it only did in a specific room. @@ -534,7 +534,7 @@ void Room::tug2UsePhaserOnWelder() { } void Room::tug2UseWelderOnWireScraps() { - showText(TX_TUG2N009); + showDescription(TX_TUG2N009); loseItem(OBJECT_IWIRSCRP); } @@ -552,7 +552,7 @@ void Room::tug2UseCombBitOnTransmogrifier() { } void Room::tug2ShotByElasi() { - showText(TX_TUG2N025); + showDescription(TX_TUG2N025); showGameOverMenu(); // Unused: additional textbox that says "***Game over man!***" @@ -563,11 +563,11 @@ void Room::tug2WalkToDoor() { } void Room::tug2LookAtDoor() { - showText(TX_TUG2N012); + showDescription(TX_TUG2N012); } void Room::tug2LookAtKirk() { - showText(TX_TUG2N003); + showDescription(TX_TUG2N003); } void Room::tug2TalkToKirk() { @@ -824,19 +824,19 @@ void Room::tug2UseMedkitOnGuard2() { void Room::tug2LookAnywhere() { if (_awayMission->tug.guard1Status == GUARDSTAT_DEAD && _awayMission->tug.guard2Status == GUARDSTAT_DEAD && _awayMission->tug.field35 == 6) - showText(TX_TUG2N019); + showDescription(TX_TUG2N019); else if (_awayMission->tug.guard1Status == GUARDSTAT_DEAD && _awayMission->tug.guard2Status == GUARDSTAT_DEAD && !_awayMission->tug.brigForceFieldDown) - showText(TX_TUG2N017); + showDescription(TX_TUG2N017); else if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED && _awayMission->tug.guard2Status == GUARDSTAT_STUNNED && _awayMission->tug.field35 == 6) - showText(TX_TUG2N020); + showDescription(TX_TUG2N020); else if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED && _awayMission->tug.guard2Status == GUARDSTAT_STUNNED && !_awayMission->tug.brigForceFieldDown) - showText(TX_TUG2N018); + showDescription(TX_TUG2N018); else if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED && _awayMission->tug.guard2Status == GUARDSTAT_STUNNED && _awayMission->tug.brigForceFieldDown) - showText(TX_TUG2N021); + showDescription(TX_TUG2N021); else if (_awayMission->tug.guard1Status == GUARDSTAT_DEAD && _awayMission->tug.guard2Status == GUARDSTAT_DEAD && _awayMission->tug.brigForceFieldDown) - showText(TX_TUG2N022); + showDescription(TX_TUG2N022); else - showText(TX_TUG2N023); + showDescription(TX_TUG2N023); } void Room::tug2TalkToBrig() { diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp index bccd173c1e..9fd2a075e0 100644 --- a/engines/startrek/rooms/tug3.cpp +++ b/engines/startrek/rooms/tug3.cpp @@ -54,7 +54,7 @@ void Room::tug3Tick40() { } void Room::tug3LookAnywhere() { - showText(TX_TUG3N007); + showDescription(TX_TUG3N007); } void Room::tug3ElasiSurrendered() { @@ -231,7 +231,7 @@ void Room::tug3TalkToElasi1() { TX_TUG3_002, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); switch (choice) { case 0: // They surrender @@ -290,15 +290,15 @@ void Room::tug3Elasi1ShotConsoleAndSurrenders() { } void Room::tug3LookAtMccoy() { - showText(TX_TUG3N000); + showDescription(TX_TUG3N000); } void Room::tug3LookAtSpock() { - showText(TX_TUG3N002); + showDescription(TX_TUG3N002); } void Room::tug3LookAtRedshirt() { - showText(TX_TUG3N001); + showDescription(TX_TUG3N001); } void Room::tug3LookAtElasi1() { @@ -309,32 +309,32 @@ void Room::tug3LookAtElasi1() { // instead of just checking if he's stunned. if (_awayMission->tug.bridgeElasi1Status == GUARDSTAT_STUNNED || _awayMission->tug.bridgeElasi1Status == GUARDSTAT_DEAD) - showText(TX_TUG3N003); + showDescription(TX_TUG3N003); else - showText(TX_TUG3N008); + showDescription(TX_TUG3N008); } void Room::tug3LookAtElasi2() { // BUGFIX: also check if stunned. They can't "glare at the crewmembers" if they're // unconscious. (applies to below functions too.) if (_awayMission->tug.bridgeElasi2Status == GUARDSTAT_DEAD || _awayMission->tug.bridgeElasi2Status == GUARDSTAT_STUNNED) - showText(TX_TUG3N004); + showDescription(TX_TUG3N004); else - showText(TX_TUG3N005); + showDescription(TX_TUG3N005); } void Room::tug3LookAtElasi3() { if (_awayMission->tug.bridgeElasi3Status == GUARDSTAT_DEAD || _awayMission->tug.bridgeElasi2Status == GUARDSTAT_STUNNED) - showText(TX_TUG3N004); + showDescription(TX_TUG3N004); else - showText(TX_TUG3N005); + showDescription(TX_TUG3N005); } void Room::tug3LookAtElasi4() { if (_awayMission->tug.bridgeElasi4Status == GUARDSTAT_DEAD || _awayMission->tug.bridgeElasi2Status == GUARDSTAT_STUNNED) - showText(TX_TUG3N004); + showDescription(TX_TUG3N004); else - showText(TX_TUG3N005); + showDescription(TX_TUG3N005); } void Room::tug3TalkToMccoy() { @@ -462,7 +462,7 @@ void Room::tug3Timer1Expired() { _awayMission->timers[1] = 100; _awayMission->tug.orbitalDecayCounter++; } else { // Game over - showText(TX_TUG3N006); + showDescription(TX_TUG3N006); showGameOverMenu(); } } diff --git a/engines/startrek/rooms/veng0.cpp b/engines/startrek/rooms/veng0.cpp index fe5ae7f631..d19937fee3 100644 --- a/engines/startrek/rooms/veng0.cpp +++ b/engines/startrek/rooms/veng0.cpp @@ -217,7 +217,7 @@ void Room::veng0UseMccoyOnDeadCrewman() { void Room::veng0UseSawOnBeam() { if (_awayMission->veng.beamState == 1 || _awayMission->veng.beamState == 2) - showText(TX_VEN0N008); + showDescription(TX_VEN0N008); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_KIRK, 0x24, 0xc2, &Room::veng0KirkReachedSaw); @@ -241,7 +241,7 @@ void Room::veng0DoneCuttingBeam() { loadActorStandAnim(OBJECT_9); loadActorStandAnim(OBJECT_10); - showText(TX_VEN0N007); + showDescription(TX_VEN0N007); _awayMission->veng.beamState = 1; veng0GetBeam(); @@ -249,12 +249,12 @@ void Room::veng0DoneCuttingBeam() { void Room::veng0GetBeam() { if (_awayMission->veng.beamState == 1) { - showText(TX_VEN0N019); + showDescription(TX_VEN0N019); _awayMission->veng.beamState = 2; giveItem(OBJECT_IBEAM); loadActorAnim2(OBJECT_BEAM, "s7r0bf", 0x0e, 0x9a); } else - showText(TX_VEN0N009); + showDescription(TX_VEN0N009); } void Room::veng0TalkToKirk() { @@ -277,62 +277,62 @@ void Room::veng0TalkToRedshirt() { } void Room::veng0LookAtPatterson() { - showText(TX_VEN0N004); + showDescription(TX_VEN0N004); } void Room::veng0LookAtDeadCrewman2() { - showText(TX_VEN0N017); + showDescription(TX_VEN0N017); } void Room::veng0LookAtComputerBank() { - showText(TX_VEN0N005); + showDescription(TX_VEN0N005); } void Room::veng0LookAtChair() { - showText(TX_VEN0N015); + showDescription(TX_VEN0N015); } void Room::veng0LookAtKirk() { - showText(TX_VEN0N001); + showDescription(TX_VEN0N001); } void Room::veng0LookAtSpock() { - showText(TX_VEN0N006); + showDescription(TX_VEN0N006); } void Room::veng0LookAtMccoy() { - showText(TX_VEN0N002); + showDescription(TX_VEN0N002); } void Room::veng0LookAtRedshirt() { - showText(TX_VEN0N003); + showDescription(TX_VEN0N003); } void Room::veng0LookAtViewscreen() { - showText(TX_VEN0N010); + showDescription(TX_VEN0N010); } void Room::veng0LookAtHelmConsole() { - showText(TX_VEN0N011); + showDescription(TX_VEN0N011); } void Room::veng0LookAtNavConsole() { - showText(TX_VEN0N012); + showDescription(TX_VEN0N012); } void Room::veng0LookAtBeam() { if (_awayMission->veng.beamState == 1) - showText(TX_VEN0N013); + showDescription(TX_VEN0N013); else - showText(TX_VEN0N000); + showDescription(TX_VEN0N000); } void Room::veng0LookAnywhere() { - showText(TX_VEN0N018); + showDescription(TX_VEN0N018); } void Room::veng0LookAtDeadCrewman1() { - showText(TX_VEN0N016); + showDescription(TX_VEN0N016); } void Room::veng0UseMccoyOnLivingCrewman() { diff --git a/engines/startrek/rooms/veng1.cpp b/engines/startrek/rooms/veng1.cpp index a90a396ea6..34e77fdf88 100644 --- a/engines/startrek/rooms/veng1.cpp +++ b/engines/startrek/rooms/veng1.cpp @@ -158,7 +158,7 @@ void Room::veng1WalkToDoor() { _roomVar.veng.walkingToDoor = true; _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; } else - showText(TX_VEN1N007); + showDescription(TX_VEN1N007); } void Room::veng1TouchedHotspot0() { @@ -180,7 +180,7 @@ void Room::veng1TouchedTurbolift() { } void Room::veng1LookAtDeadGuy() { - showText(TX_VEN4N014); + showDescription(TX_VEN4N014); } void Room::veng1UseSTricorderOnVent() { @@ -189,43 +189,43 @@ void Room::veng1UseSTricorderOnVent() { void Room::veng1LookAtPanel() { if (!_awayMission->veng.openedPanel) - showText(TX_VEN1N022); + showDescription(TX_VEN1N022); else if (!_awayMission->veng.removedPanelDebris) - showText(TX_VEN1N019); + showDescription(TX_VEN1N019); else - showText(TX_VEN1N010); + showDescription(TX_VEN1N010); } void Room::veng1LookAtDoor() { - showText(TX_VEN1N021); + showDescription(TX_VEN1N021); } void Room::veng1LookAtSaw() { - showText(TX_VEN1N001); + showDescription(TX_VEN1N001); } void Room::veng1LookAtDebris() { - showText(TX_VEN1N000); + showDescription(TX_VEN1N000); } void Room::veng1LookAtKirk() { - showText(TX_VEN1N002); + showDescription(TX_VEN1N002); } void Room::veng1LookAtMccoy() { - showText(TX_VEN1N004); + showDescription(TX_VEN1N004); } void Room::veng1LookAtSpock() { - showText(TX_VEN1N003); + showDescription(TX_VEN1N003); } void Room::veng1LookAtRedshirt() { - showText(TX_VEN1N005); + showDescription(TX_VEN1N005); } void Room::veng1LookAnywhere() { - showText(TX_VEN1N020); + showDescription(TX_VEN1N020); } void Room::veng1TalkToKirk() { @@ -287,32 +287,32 @@ void Room::veng1KirkAccessedPanel() { _awayMission->disableInput = false; if (!_awayMission->veng.clearedPanelDebris) { - showText(TX_VEN1N016); + showDescription(TX_VEN1N016); } else if (!_awayMission->veng.openedPanel) { _awayMission->veng.openedPanel = true; - showText(TX_VEN1N017); + showDescription(TX_VEN1N017); loadActorAnim2(OBJECT_DEBRIS, "s7r1p2", 0xd1, 0x6a); loadActorStandAnim(OBJECT_PANEL); } else - showText(TX_VEN1_F33); + showDescription(TX_VEN1_F33); walkCrewman(OBJECT_KIRK, 0xc9, 0x98); } void Room::veng1UseSawOnPanel() { - showText(TX_VEN1N013); + showDescription(TX_VEN1N013); } void Room::veng1UseSawOnDoor() { - showText(TX_VEN1N014); + showDescription(TX_VEN1N014); } void Room::veng1UseDrillOnDebris() { - showText(TX_VEN1N009); + showDescription(TX_VEN1N009); } void Room::veng1UseSawOnDebris() { - showText(TX_VEN1N018); + showDescription(TX_VEN1N018); } void Room::veng1UseDrillOnPanel() { @@ -330,7 +330,7 @@ void Room::veng1KirkDoneDrillingPanel() { _awayMission->disableInput = false; if (!_awayMission->veng.clearedPanelDebris) { _awayMission->veng.clearedPanelDebris = true; - showText(TX_VEN1N008); + showDescription(TX_VEN1N008); } } @@ -348,10 +348,10 @@ void Room::veng1KirkUsedHypoOnDebris() { _awayMission->disableInput = false; if (!_awayMission->veng.oilInHypo) - showText(TX_VEN1N012); + showDescription(TX_VEN1N012); else { _awayMission->veng.loosenedDebrisWithOil = true; - showText(TX_VEN1N015); + showDescription(TX_VEN1N015); } } @@ -366,7 +366,7 @@ void Room::veng1ReachedSaw() { void Room::veng1PickedUpSaw() { loadActorStandAnim(OBJECT_SAW); - showText(TX_VEN1N023); + showDescription(TX_VEN1N023); giveItem(OBJECT_ILMD); _awayMission->veng.tookMolecularSaw = true; @@ -387,11 +387,11 @@ void Room::veng1TriedToGetDebris() { _awayMission->disableInput = false; if (!_awayMission->veng.loosenedDebrisWithOil) - showText(TX_VEN1N006); + showDescription(TX_VEN1N006); else { loadActorStandAnim(OBJECT_DEBRIS); loadActorAnim2(OBJECT_PANEL, "s7r1p3", 0xd1, 0x6a); - showText(TX_VEN1N011); + showDescription(TX_VEN1N011); _awayMission->veng.removedPanelDebris = true; } } diff --git a/engines/startrek/rooms/veng2.cpp b/engines/startrek/rooms/veng2.cpp index 139142dd57..63caab14a4 100644 --- a/engines/startrek/rooms/veng2.cpp +++ b/engines/startrek/rooms/veng2.cpp @@ -291,7 +291,7 @@ void Room::veng2Timer2Expired() { // Elasi hail the Enterprise if they haven't a TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_099); @@ -317,111 +317,111 @@ void Room::veng2TouchedDoor() { void Room::veng2LookAtViewscreen() { if (!_awayMission->veng.elasiShipDecloaked) - showText(TX_VEN2N022); + showDescription(TX_VEN2N022); else - showText(TX_VEN2N002); + showDescription(TX_VEN2N002); } void Room::veng2LookAtMiddleConsole() { - showText(TX_VEN2N030); + showDescription(TX_VEN2N030); } void Room::veng2LookAtDamageDisplay() { if (!_awayMission->veng.impulseEnginesOn) - showText(TX_VEN2N035); + showDescription(TX_VEN2N035); else - showText(TX_VEN2N032); + showDescription(TX_VEN2N032); // NOTE: There were originally 2 more cases, where "poweredSystem == 2" or otherwise. For // the case where poweredSystem == 2, it played TX_VEN2N032, but with mismatching text. } void Room::veng2LookAtSTricorder() { - showText(TX_VEN2N027); + showDescription(TX_VEN2N027); } void Room::veng2LookAtMTricorder() { - showText(TX_VEN2N024); + showDescription(TX_VEN2N024); } void Room::veng2LookAtTorpedoButton() { - showText(TX_VEN2N033); + showDescription(TX_VEN2N033); } // TODO: Consider merging "veng2LookAtTorpedoButton" with "veng2LookAtTorpedoControl" // (and the same for use actions) void Room::veng2LookAtTorpedoControl() { - showText(TX_VEN2N033); + showDescription(TX_VEN2N033); if (!_awayMission->veng.impulseEnginesOn) - showText(TX_VEN2N001); // Unused, since it can't be selected when impulse is off? + showDescription(TX_VEN2N001); // Unused, since it can't be selected when impulse is off? else if (!_awayMission->veng.torpedoLoaded) { - showText(TX_VEN2N000); + showDescription(TX_VEN2N000); if (!_awayMission->veng.elasiShipDecloaked) showText(TX_SPEAKER_SPOCK, TX_VEN2_036); else showText(TX_SPEAKER_SPOCK, TX_VEN2_037); _awayMission->veng.examinedTorpedoControl = true; } else if (!_awayMission->veng.firedTorpedo) - showText(TX_VEN2N021); + showDescription(TX_VEN2N021); else - showText(TX_VEN2N020); // Unused, since after firing the torpedo, the mission ends + showDescription(TX_VEN2N020); // Unused, since after firing the torpedo, the mission ends } void Room::veng2LookAtImpulseConsole() { - showText(TX_VEN2N034); + showDescription(TX_VEN2N034); if (!_awayMission->veng.impulseEnginesOn) - showText(TX_VEN2N008); + showDescription(TX_VEN2N008); else if (_awayMission->veng.tricordersPluggedIntoComputer != 3) - showText(TX_VEN2N009); + showDescription(TX_VEN2N009); else if (_awayMission->veng.poweredSystem == 0) - showText(TX_VEN2N009); + showDescription(TX_VEN2N009); else if (_awayMission->veng.poweredSystem == 1) - showText(TX_VEN2N007); + showDescription(TX_VEN2N007); else if (_awayMission->veng.poweredSystem == 2) - showText(TX_VEN2N005); + showDescription(TX_VEN2N005); else - showText(TX_VEN2N006); + showDescription(TX_VEN2N006); } void Room::veng2LookAtMainComputer() { if (_awayMission->veng.tricordersPluggedIntoComputer == 0) - showText(TX_VEN2N003); + showDescription(TX_VEN2N003); else if (_awayMission->veng.tricordersPluggedIntoComputer == 1) // Med tricorder plugged in - showText(TX_VEN2N023); + showDescription(TX_VEN2N023); else if (_awayMission->veng.tricordersPluggedIntoComputer == 2) // Sci tricorder plugged in - showText(TX_VEN2N027); + showDescription(TX_VEN2N027); else // Both - showText(TX_VEN2N025); + showDescription(TX_VEN2N025); } void Room::veng2LookAtRecordDeck() { - showText(TX_VEN2N029); + showDescription(TX_VEN2N029); } void Room::veng2LookAtDeckIOConsole() { - showText(TX_VEN2N031); + showDescription(TX_VEN2N031); } void Room::veng2LookAtKirk() { - showText(TX_VEN2N010); + showDescription(TX_VEN2N010); } void Room::veng2LookAtSpock() { - showText(TX_VEN2N019); + showDescription(TX_VEN2N019); } void Room::veng2LookAtMccoy() { - showText(TX_VEN2N012); + showDescription(TX_VEN2N012); } void Room::veng2LookAtRedshirt() { - showText(TX_VEN2N004); + showDescription(TX_VEN2N004); } void Room::veng2LookAnywhere() { - showText(TX_VEN2N035); + showDescription(TX_VEN2N035); } void Room::veng2TalkToKirk() { @@ -514,7 +514,7 @@ void Room::veng2UseCommunicator() { TX_VEN2_HAIL_ELASI, TX_VEN2_HAIL_ENT, TX_VEN2_CANCEL, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // Hail Elasi if (!_awayMission->veng.torpedoLoaded) @@ -528,7 +528,7 @@ void Room::veng2UseCommunicator() { TX_VEN2_015, TX_VEN2_029, TX_BLANK }; - choice = showText(choices2); + choice = showMultipleTexts(choices2); if (choice == 0) { // "We don't have it yet" showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_100); @@ -554,7 +554,7 @@ void Room::veng2UseCommunicator() { void Room::veng2UseKirkOnTorpedoButton() { if (_awayMission->veng.poweredSystem != 1) - showText(TX_VEN2N028); + showDescription(TX_VEN2N028); else if (!_awayMission->veng.torpedoLoaded) showText(TX_SPEAKER_SPOCK, TX_VEN2_058); else if (!_awayMission->veng.elasiShieldsDown) @@ -624,7 +624,7 @@ void Room::veng2UseSTricorderOnTorpedoButton() { void Room::veng2UseSTricorderOnMiddleConsole() { spockScan(DIR_N, -1); - showText(TX_VEN2N030); // This is a narration, not Spock speaking + showDescription(TX_VEN2N030); // This is a narration, not Spock speaking } void Room::veng2UseSTricorderOnTorpedoControl() { @@ -681,7 +681,7 @@ void Room::veng2SpockUsedImpulseConsole() { TX_VEN2_WEA, TX_VEN2_SHI, TX_VEN2_TRA, TX_BLANK }; - int choice = showText(choices); + int choice = showMultipleTexts(choices); if (choice == 0) { // Weapons if (_awayMission->veng.toldElasiToBeamOver) { @@ -786,7 +786,7 @@ void Room::veng2AttachedSTricorderToComputer() { loseItem(OBJECT_ISTRICOR); loadActorAnim2(OBJECT_STRICORDER, "s7r2t1", STRICORDER_POS_X, STRICORDER_POS_Y); - showText(TX_VEN2N017); + showDescription(TX_VEN2N017); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); if (_awayMission->veng.tricordersPluggedIntoComputer == 3) // Both tricorders plugged in @@ -819,7 +819,7 @@ void Room::veng2AttachedMTricorderToComputer() { loseItem(OBJECT_IMTRICOR); loadActorAnim2(OBJECT_MTRICORDER, "s7r2t2", MTRICORDER_POS_X, MTRICORDER_POS_Y); - showText(TX_VEN2N016); + showDescription(TX_VEN2N016); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); if (_awayMission->veng.tricordersPluggedIntoComputer == 3) // Both tricorders plugged in @@ -859,7 +859,7 @@ void Room::veng2PickedUpLogDeck() { loadActorStandAnim(OBJECT_DECK); _awayMission->disableInput = false; _awayMission->veng.tookRecordDeckFromAuxilaryControl = true; - showText(TX_VEN2N039); + showDescription(TX_VEN2N039); giveItem(OBJECT_IDECK); } @@ -883,7 +883,7 @@ void Room::veng2PickedUpSTricorder() { loadActorStandAnim(OBJECT_STRICORDER); loadActorStandAnim(OBJECT_MAIN_COMPUTER); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); - showText(TX_VEN2N015); + showDescription(TX_VEN2N015); } void Room::veng2GetMTricorder() { @@ -906,7 +906,7 @@ void Room::veng2PickedUpMTricorder() { loadActorStandAnim(OBJECT_MTRICORDER); loadActorStandAnim(OBJECT_MAIN_COMPUTER); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); - showText(TX_VEN2N013); + showDescription(TX_VEN2N013); } } diff --git a/engines/startrek/rooms/veng3.cpp b/engines/startrek/rooms/veng3.cpp index 8c71086e24..12c044b83d 100644 --- a/engines/startrek/rooms/veng3.cpp +++ b/engines/startrek/rooms/veng3.cpp @@ -147,7 +147,7 @@ void Room::veng3WalkToDoor() { if (_awayMission->veng.clearedDebris) walkCrewmanC(OBJECT_KIRK, 0xa6, 0x6e, &Room::veng3ReachedTurbolift2); else - showText(TX_VEN3N006); + showDescription(TX_VEN3N006); } void Room::veng3ReachedTurbolift2() { @@ -175,18 +175,18 @@ void Room::veng3SickbayDoorOpened() { } void Room::veng3LookAtSupportBeam() { - showText(TX_VEN3N007); + showDescription(TX_VEN3N007); } void Room::veng3LookAtDebris() { if (!_awayMission->veng.clearedDebris) - showText(TX_VEN3N009); + showDescription(TX_VEN3N009); else - showText(TX_VEN3N007); // UNUSED (debris is gone) + showDescription(TX_VEN3N007); // UNUSED (debris is gone) } void Room::veng3LookAtTurbolift2Door() { - showText(TX_VEN3N012); + showDescription(TX_VEN3N012); if (!_awayMission->veng.lookedAtTurbolift2Door) { _awayMission->veng.lookedAtTurbolift2Door = true; @@ -198,35 +198,35 @@ void Room::veng3LookAtTurbolift2Door() { } void Room::veng3LookAtSickbayDoor() { - showText(TX_VEN3N011); + showDescription(TX_VEN3N011); } void Room::veng3LookAtCable() { - showText(TX_VEN3N013); + showDescription(TX_VEN3N013); } void Room::veng3LookAtDeadGuy() { - showText(TX_VEN3N005); + showDescription(TX_VEN3N005); } void Room::veng3LookAtKirk() { - showText(TX_VEN3N001); + showDescription(TX_VEN3N001); } void Room::veng3LookAtMccoy() { - showText(TX_VEN3N002); + showDescription(TX_VEN3N002); } void Room::veng3LookAtSpock() { - showText(TX_VEN3N004); + showDescription(TX_VEN3N004); } void Room::veng3LookAtRedshirt() { - showText(TX_VEN3N000); + showDescription(TX_VEN3N000); } void Room::veng3LookAnywhere() { - showText(TX_VEN3N003); + showDescription(TX_VEN3N003); } void Room::veng3UseStunPhaserOnDebris() { @@ -338,7 +338,7 @@ void Room::veng3TalkToRedshirt() { } void Room::veng3GetDebris() { - showText(TX_VEN3N010); + showDescription(TX_VEN3N010); } void Room::veng3GetCable() { @@ -354,7 +354,7 @@ void Room::veng3ReachedCable() { void Room::veng3PickedUpCable() { _awayMission->disableInput = false; loadActorStandAnim(OBJECT_CABLE); - showText(TX_VEN3N014); + showDescription(TX_VEN3N014); giveItem(OBJECT_ICABLE2); _awayMission->veng.tookCableFromSickbayHallway = true; } diff --git a/engines/startrek/rooms/veng4.cpp b/engines/startrek/rooms/veng4.cpp index b98ffcb3aa..9911ecc8e6 100644 --- a/engines/startrek/rooms/veng4.cpp +++ b/engines/startrek/rooms/veng4.cpp @@ -234,19 +234,19 @@ void Room::veng4TalkToBrittany() { } void Room::veng4LookAtDeadGuy() { - showText(TX_VEN4N014); + showDescription(TX_VEN4N014); } void Room::veng4LookAtRightBedReadings() { - showText(TX_VEN4N013); + showDescription(TX_VEN4N013); } void Room::veng4LookAtDoorHotspot() { - showText(TX_VEN4N008); + showDescription(TX_VEN4N008); } void Room::veng4LookAtKirk() { - showText(TX_VEN4N002); + showDescription(TX_VEN4N002); } void Room::veng4LookAtSpock() { @@ -266,45 +266,45 @@ void Room::veng4LookAtLeftBed() { // ENHANCEMENT: Original game showed a string with no corresponding audio ("This // bed contains the body of a recently deceaced crewman." Yes that's a typo.) // Instead, show some appropriate voiced text. - showText(TX_VEN4N017); + showDescription(TX_VEN4N017); } else - showText(TX_VEN4N007); + showDescription(TX_VEN4N007); } void Room::veng4LookAtLeftBedReadings() { if (!_awayMission->veng.brittanyDead) - showText(TX_VEN4N006); + showDescription(TX_VEN4N006); else - showText(TX_VEN4N005); + showDescription(TX_VEN4N005); } void Room::veng4LookAtBrittany() { if (_awayMission->veng.brittanyDead) - showText(TX_VEN4N017); + showDescription(TX_VEN4N017); else if (!_awayMission->veng.lookedAtBrittany) { _awayMission->veng.lookedAtBrittany = true; showText(TX_SPEAKER_KIRK, TX_VEN4_005); showText(TX_SPEAKER_MCCOY, TX_VEN4_014); } else if (_awayMission->veng.talkedToBrittany) - showText(TX_VEN4N017); + showDescription(TX_VEN4N017); else - showText(TX_VEN4N004); + showDescription(TX_VEN4N004); } void Room::veng4LookAtDrill() { - showText(TX_VEN4N012); + showDescription(TX_VEN4N012); } void Room::veng4LookAtHypoOnTable() { - showText(TX_VEN4N010); + showDescription(TX_VEN4N010); } void Room::veng4LookAtDoorObject() { - showText(TX_VEN4N009); + showDescription(TX_VEN4N009); } void Room::veng4LookAnywhere() { - showText(TX_VEN4N011); + showDescription(TX_VEN4N011); } void Room::veng4GetHypo() { @@ -320,7 +320,7 @@ void Room::veng4PickedUpHypo() { giveItem(OBJECT_IHYPO); _awayMission->veng.tookHypoFromSickbay = true; loadActorStandAnim(OBJECT_HYPO); - showText(TX_VEN4N015); + showDescription(TX_VEN4N015); walkCrewman(OBJECT_KIRK, 0xcd, 0xc2); _awayMission->disableInput = false; } @@ -338,7 +338,7 @@ void Room::veng4PickedUpDrill() { giveItem(OBJECT_IDRILL); _awayMission->veng.tookDrillFromSickbay = true; loadActorStandAnim(OBJECT_DRILL); - showText(TX_VEN4N016); + showDescription(TX_VEN4N016); walkCrewman(OBJECT_KIRK, 0xcd, 0xc2); _awayMission->disableInput = false; } diff --git a/engines/startrek/rooms/veng5.cpp b/engines/startrek/rooms/veng5.cpp index 23a7cd2f56..0ea475be35 100644 --- a/engines/startrek/rooms/veng5.cpp +++ b/engines/startrek/rooms/veng5.cpp @@ -130,43 +130,43 @@ void Room::veng5TouchedTurboliftDoor() { } void Room::veng5LookAtDoor() { - showText(TX_VEN5N007); + showDescription(TX_VEN5N007); } void Room::veng5LookAtLadder() { - showText(TX_VEN5N008); + showDescription(TX_VEN5N008); } void Room::veng5LookAtDeadGuy() { - showText(TX_VEN5N000); + showDescription(TX_VEN5N000); } void Room::veng5LookAtPowerPack() { - showText(TX_VEN5N009); + showDescription(TX_VEN5N009); } void Room::veng5LookAtDebris() { - showText(TX_VEN5N001); + showDescription(TX_VEN5N001); } void Room::veng5LookAtKirk() { - showText(TX_VEN5N003); + showDescription(TX_VEN5N003); } void Room::veng5LookAtSpock() { - showText(TX_VEN5N002); + showDescription(TX_VEN5N002); } void Room::veng5LookAtMccoy() { - showText(TX_VEN5N004); + showDescription(TX_VEN5N004); } void Room::veng5LookAtRedshirt() { - showText(TX_VEN5N005); + showDescription(TX_VEN5N005); } void Room::veng5LookAnywhere() { - showText(TX_VEN5N006); + showDescription(TX_VEN5N006); } void Room::veng5UsePhaserOnPowerPack() { @@ -259,7 +259,7 @@ void Room::veng5ReachedPowerPack() { void Room::veng5PickedUpPowerPack() { if (!_awayMission->veng.havePowerPack) { loadActorStandAnim(OBJECT_POWER_PACK); - showText(TX_VEN5N010); + showDescription(TX_VEN5N010); _awayMission->veng.havePowerPack = true; giveItem(OBJECT_IFUSION); } diff --git a/engines/startrek/rooms/veng6.cpp b/engines/startrek/rooms/veng6.cpp index b7bb549077..a5129420df 100644 --- a/engines/startrek/rooms/veng6.cpp +++ b/engines/startrek/rooms/veng6.cpp @@ -189,72 +189,72 @@ void Room::veng6DoorOpened() { } void Room::veng6LookAtLeftPort() { - showText(TX_VEN6N018); + showDescription(TX_VEN6N018); } void Room::veng6LookAtRightPort() { - showText(TX_VEN6N016); + showDescription(TX_VEN6N016); } void Room::veng6LookAtDoor() { - showText(TX_VEN5N007); + showDescription(TX_VEN5N007); } void Room::veng6LookAtOilCanister() { - showText(TX_VEN6N011); + showDescription(TX_VEN6N011); } void Room::veng6LookAtCabinet() { - showText(TX_VEN6N015); + showDescription(TX_VEN6N015); } void Room::veng6LookAtCable() { - showText(TX_VEN6N013); + showDescription(TX_VEN6N013); } void Room::veng6LookAtRightConsole() { - showText(TX_VEN6N017); + showDescription(TX_VEN6N017); } void Room::veng6LookAtImpulseEngines() { - showText(TX_VEN6N010); + showDescription(TX_VEN6N010); } void Room::veng6LookAtLeftConsole() { - showText(TX_VEN6N009); + showDescription(TX_VEN6N009); } void Room::veng6LookAtJunctionBox() { - showText(TX_VEN6N012); + showDescription(TX_VEN6N012); } void Room::veng6LookAtJournal() { - showText(TX_VEN6N025); + showDescription(TX_VEN6N025); showText(TX_SPEAKER_SPOCK, TX_VEN6_021); } void Room::veng6LookAtKirk() { - showText(TX_VEN6N001); + showDescription(TX_VEN6N001); } void Room::veng6LookAtSpock() { - showText(TX_VEN6N003); + showDescription(TX_VEN6N003); } void Room::veng6LookAtMccoy() { - showText(TX_VEN6N002); + showDescription(TX_VEN6N002); } void Room::veng6LookAtRedshirt() { - showText(TX_VEN6N000); + showDescription(TX_VEN6N000); } void Room::veng6LookAtDeadGuy() { - showText(TX_VEN0N016); + showDescription(TX_VEN0N016); } void Room::veng6LookAnywhere() { - showText(TX_VEN6N019); + showDescription(TX_VEN6N019); } void Room::veng6TalkToKirk() { @@ -303,7 +303,7 @@ void Room::veng6KirkOrSpockReachedLeftPort() { void Room::veng6AttachedLeftCable() { loadActorAnim(OBJECT_CABLE_1, "s7r6cl", CABLE_1_X, CABLE_1_Y); - showText(TX_VEN6N020); + showDescription(TX_VEN6N020); _awayMission->veng.junctionCablesConnected |= 1; loseItem(_roomVar.veng.cableInUse); _awayMission->disableInput = false; @@ -337,7 +337,7 @@ void Room::veng6KirkOrSpockReachedRightPort() { void Room::veng6AttachedRightCable() { loadActorAnim(OBJECT_CABLE_2, "s7r6cr", CABLE_2_X, CABLE_2_Y); - showText(TX_VEN6N022); + showDescription(TX_VEN6N022); _awayMission->veng.junctionCablesConnected |= 2; loseItem(_roomVar.veng.cableInUse); _awayMission->disableInput = false; @@ -374,7 +374,7 @@ void Room::veng6SpockAdjustedJunctionBox() { void Room::veng6UseHypoOnOilCanister() { if (_awayMission->veng.oilInHypo) - showText(TX_VEN6N006); + showDescription(TX_VEN6N006); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_KIRK, 0x3c, 0x9e, &Room::veng6ReachedOilCanister); @@ -387,7 +387,7 @@ void Room::veng6ReachedOilCanister() { void Room::veng6FilledHypoWithOil() { _awayMission->disableInput = false; - showText(TX_VEN6N007); + showDescription(TX_VEN6N007); _awayMission->veng.oilInHypo = true; } @@ -412,7 +412,7 @@ void Room::veng6OpenedOrClosedCabinet() { playSoundEffectIndex(SND_DOOR1); _awayMission->veng.engineeringCabinetOpen = true; if (!_awayMission->veng.tookEngineeringJournal) - showText(TX_VEN6N005); + showDescription(TX_VEN6N005); } } @@ -442,11 +442,11 @@ void Room::veng6UsePowerPackOnLeftConsole() { } void Room::veng6GetJunctionBox() { - showText(TX_MUD1N014); + showDescription(TX_MUD1N014); } void Room::veng6GetOilCanister() { - showText(TX_VEN6N008); + showDescription(TX_VEN6N008); } void Room::veng6GetEngineeringJournal() { @@ -461,7 +461,7 @@ void Room::veng6ReachedEngineeringJournal() { void Room::veng6TookEngineeringJournal() { loadActorStandAnim(OBJECT_JOURNAL); _awayMission->disableInput = false; - showText(TX_VEN6N024); + showDescription(TX_VEN6N024); _awayMission->veng.tookEngineeringJournal = true; giveItem(OBJECT_ITECH); } diff --git a/engines/startrek/rooms/veng7.cpp b/engines/startrek/rooms/veng7.cpp index 3dafb0841e..fbb068d2c6 100644 --- a/engines/startrek/rooms/veng7.cpp +++ b/engines/startrek/rooms/veng7.cpp @@ -107,41 +107,41 @@ void Room::veng7TouchedTurboliftDoor() { } void Room::veng7LookAtCollapsedSection() { - showText(TX_VEN7N001); + showDescription(TX_VEN7N001); } void Room::veng7LookAtDeadGuy() { // ENHANCEMENT: Original played TX_VEN0N016. This is reused and boring, and there is // a more interesting unused audio file, so use that instead. - showText(TX_VEN7N000); + showDescription(TX_VEN7N000); } void Room::veng7LookAtDoor() { - showText(TX_VEN7N007); + showDescription(TX_VEN7N007); } void Room::veng7LookAtCable() { - showText(TX_VEN7N008); + showDescription(TX_VEN7N008); } void Room::veng7LookAtKirk() { - showText(TX_VEN7N003); + showDescription(TX_VEN7N003); } void Room::veng7LookAtSpock() { - showText(TX_VEN7N005); + showDescription(TX_VEN7N005); } void Room::veng7LookAtMccoy() { - showText(TX_VEN7N004); + showDescription(TX_VEN7N004); } void Room::veng7LookAtRedshirt() { - showText(TX_VEN7N002); + showDescription(TX_VEN7N002); } void Room::veng7LookAnywhere() { - showText(TX_VEN7N006); + showDescription(TX_VEN7N006); } void Room::veng7TalkToKirk() { @@ -184,7 +184,7 @@ void Room::veng7ReachedCable() { void Room::veng7PickedUpCable() { loadActorStandAnim(OBJECT_CABLE); - showText(TX_VEN7N009); + showDescription(TX_VEN7N009); giveItem(OBJECT_ICABLE1); _awayMission->veng.tookCableFromTransporterRoomHallway = true; _awayMission->disableInput = false; diff --git a/engines/startrek/rooms/veng8.cpp b/engines/startrek/rooms/veng8.cpp index 0712bdf441..594da88d43 100644 --- a/engines/startrek/rooms/veng8.cpp +++ b/engines/startrek/rooms/veng8.cpp @@ -159,54 +159,54 @@ void Room::veng8SparkAnim2Done() { } void Room::veng8LookAtPowerPack() { - showText(TX_VEN8N004); + showDescription(TX_VEN8N004); } void Room::veng8LookAtDoor() { - showText(TX_VEN8N009); + showDescription(TX_VEN8N009); } void Room::veng8LookAtPowerCircuits() { - showText(TX_VEN8N006); + showDescription(TX_VEN8N006); } void Room::veng8LookAtControls() { - showText(TX_VEN8N007); + showDescription(TX_VEN8N007); } void Room::veng8LookAtDeadGuy() { - showText(TX_VEN8N003); // Unused, since the dead guy object isn't drawn + showDescription(TX_VEN8N003); // Unused, since the dead guy object isn't drawn } void Room::veng8LookAtSlider() { - showText(TX_VEN8N008); + showDescription(TX_VEN8N008); } void Room::veng8LookAtKirk() { - showText(TX_VEN8N001); + showDescription(TX_VEN8N001); } void Room::veng8LookAtSpock() { // NOTE: Potential alternative is VEN8N011 - showText(TX_VEN5N002); + showDescription(TX_VEN5N002); } void Room::veng8LookAtMccoy() { // NOTE: Potential alternative is VEN8N002 (though it doesn't fit very well with this // room, so perhaps the circumstances of this room changed in development) - showText(TX_VEN5N004); + showDescription(TX_VEN5N004); } void Room::veng8LookAtRedshirt() { - showText(TX_VEN8N000); + showDescription(TX_VEN8N000); } void Room::veng8LookAtTransporter() { - showText(TX_VEN8N010); + showDescription(TX_VEN8N010); } void Room::veng8LookAnywhere() { - showText(TX_VEN8N005); + showDescription(TX_VEN8N005); } void Room::veng8TalkToKirk() { diff --git a/engines/startrek/rooms/venga.cpp b/engines/startrek/rooms/venga.cpp index 99be1456bb..57a4ec25aa 100644 --- a/engines/startrek/rooms/venga.cpp +++ b/engines/startrek/rooms/venga.cpp @@ -60,7 +60,7 @@ void Room::vengaTick() { _awayMission->veng.counterUntilElasiDestroyShip--; if (_awayMission->veng.counterUntilElasiDestroyShip == 0 && !_awayMission->veng.firedTorpedo) { // Elasi fire torpedoes at you since you wouldn't lower your shields. - showText(TX_VENA_F40); + showDescription(TX_VENA_F40); showGameOverMenu(); return; } @@ -76,7 +76,7 @@ void Room::vengaTick() { } void Room::vengaElasiBeamOver() { - showText(TX_VENA_F32); + showDescription(TX_VENA_F32); showGameOverMenu(); } @@ -86,9 +86,9 @@ void Room::vengaUsePhaserAnywhere() { void Room::vengaLookAtHypo() { if (_awayMission->veng.oilInHypo) - showText(TX_VEN4N007); + showDescription(TX_VEN4N007); else - showText(TX_VEN4N010); + showDescription(TX_VEN4N010); } void Room::vengaUseCommunicator() { |