aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/rooms/veng2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/startrek/rooms/veng2.cpp')
-rw-r--r--engines/startrek/rooms/veng2.cpp84
1 files changed, 42 insertions, 42 deletions
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);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-14 10:04:26 +0000