aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/rooms
diff options
context:
space:
mode:
authorFilippos Karapetis2019-08-19 00:17:08 +0300
committerFilippos Karapetis2019-08-19 00:18:05 +0300
commit0add13ed4375adf532ddf84394022bc212643eea (patch)
tree2ac6485b941aeb3d1bb5f41f74577c468710c25f /engines/startrek/rooms
parent8e69e9e462aa5c5b79c4561da8702b76279f5cc9 (diff)
downloadscummvm-rg350-0add13ed4375adf532ddf84394022bc212643eea.tar.gz
scummvm-rg350-0add13ed4375adf532ddf84394022bc212643eea.tar.bz2
scummvm-rg350-0add13ed4375adf532ddf84394022bc212643eea.zip
STARTREK: Read most of the TUG mission texts from RDF files
Diffstat (limited to 'engines/startrek/rooms')
-rw-r--r--engines/startrek/rooms/tug0.cpp92
-rw-r--r--engines/startrek/rooms/tug1.cpp66
-rw-r--r--engines/startrek/rooms/tug2.cpp120
-rw-r--r--engines/startrek/rooms/tug3.cpp64
4 files changed, 171 insertions, 171 deletions
diff --git a/engines/startrek/rooms/tug0.cpp b/engines/startrek/rooms/tug0.cpp
index 0ae7f52dcf..df9aab88b9 100644
--- a/engines/startrek/rooms/tug0.cpp
+++ b/engines/startrek/rooms/tug0.cpp
@@ -54,7 +54,7 @@ void Room::tug0LookAtEngineer() {
}
void Room::tug0GetEngineer() {
- showText(TX_SPEAKER_MCCOY, TX_TUG0_019);
+ showText(TX_SPEAKER_MCCOY, 19, true);
}
void Room::tug0LookAtControls() {
@@ -76,18 +76,18 @@ void Room::tug0SpockReachedControlsToExamine() {
}
void Room::tug0SpockExaminedControls() {
- showText(TX_SPEAKER_SPOCK, TX_TUG0_040);
- showText(TX_SPEAKER_KIRK, TX_TUG0_005);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_043);
- showText(TX_SPEAKER_KIRK, TX_TUG0_013);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_038);
- showText(TX_SPEAKER_KIRK, TX_TUG0_008);
+ showText(TX_SPEAKER_SPOCK, 40, true);
+ showText(TX_SPEAKER_KIRK, 5, true);
+ showText(TX_SPEAKER_SPOCK, 43, true);
+ showText(TX_SPEAKER_KIRK, 13, true);
+ showText(TX_SPEAKER_SPOCK, 38, true);
+ showText(TX_SPEAKER_KIRK, 8, true);
_awayMission->tug.spockExaminedTransporter = true;
_awayMission->disableInput = false;
}
void Room::tug0UseTransmogrifierWithoutBitOnControls() {
- showText(TX_SPEAKER_SPOCK, TX_TUG0_014);
+ showText(TX_SPEAKER_SPOCK, 14, true);
}
void Room::tug0UseTransmogrifierWithBitOnControls() {
@@ -97,7 +97,7 @@ void Room::tug0UseTransmogrifierWithBitOnControls() {
}
void Room::tug0SpockReachedControlsWithTransmogrifier() {
- showText(TX_SPEAKER_SPOCK, TX_TUG0_029);
+ showText(TX_SPEAKER_SPOCK, 29, true);
loadActorAnim2(OBJECT_SPOCK, "susehn", -1, -1, 7);
playSoundEffectIndex(SND_BLANK_0b); // FIXME: blank sound?
}
@@ -115,7 +115,7 @@ void Room::tug0TransporterScreenFullyLit() {
void Room::tug0UseWireScrapsOnControls() {
if (_awayMission->tug.usedTransmogrifierOnTransporter)
- showText(TX_SPEAKER_SPOCK, TX_TUG0_034);
+ showText(TX_SPEAKER_SPOCK, 34, true);
}
void Room::tug0UseWireOnControls() {
@@ -136,24 +136,24 @@ void Room::tug0SpockFinishedUsingWire() {
_awayMission->tug.missionScore++;
loadActorAnim2(11, "t0con1", 0x105, 0xc2, 22);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_039);
+ showText(TX_SPEAKER_SPOCK, 39, true);
_awayMission->tug.transporterRepaired = true;
- showText(TX_SPEAKER_KIRK, TX_TUG0_010);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_022);
+ showText(TX_SPEAKER_KIRK, 10, true);
+ showText(TX_SPEAKER_MCCOY, 22, true);
// BUGFIX: check if the redshirt is dead.
if (!_awayMission->redshirtDead) {
- showText(TX_SPEAKER_KIRK, TX_TUG0_002);
+ showText(TX_SPEAKER_KIRK, 2, true);
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L009);
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L008);
+ showText(TX_SPEAKER_CHRISTENSEN, 9, true, true);
+ showText(TX_SPEAKER_CHRISTENSEN, 8, true, true);
if (_awayMission->tug.haveBomb) {
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L010);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_021);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_041);
+ showText(TX_SPEAKER_CHRISTENSEN, 10, true, true);
+ showText(TX_SPEAKER_MCCOY, 21, true);
+ showText(TX_SPEAKER_SPOCK, 41, true);
}
}
}
@@ -229,13 +229,13 @@ void Room::tug0UseWelderOnWireScraps() {
}
void Room::tug0UseWelderOnMetalScraps() {
- showText(TX_SPEAKER_SPOCK, TX_TUG0_032);
+ showText(TX_SPEAKER_SPOCK, 32, true);
loseItem(OBJECT_IJNKMETL);
giveItem(OBJECT_ICOMBBIT);
}
void Room::tug0UseCombBitOnTransmogrifier() {
- showText(TX_SPEAKER_SPOCK, TX_TUG0_035);
+ showText(TX_SPEAKER_SPOCK, 35, true);
loseItem(OBJECT_ICOMBBIT);
loseItem(OBJECT_IRT);
giveItem(OBJECT_IRTWB);
@@ -263,7 +263,7 @@ void Room::tug0SpockReachedControlsToTransport() {
}
void Room::tug0SpockPreparedTransporter() {
- showText(TX_SPEAKER_KIRK, TX_TUG0_001);
+ showText(TX_SPEAKER_KIRK, 1, true);
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S;
walkCrewman(OBJECT_SPOCK, 0x9a, 0x7e, 20);
}
@@ -325,12 +325,12 @@ void Room::tug0SpockFinishesBeamingBomb() {
void Room::tug0BombExploded() {
playMidiMusicTracks(2, -1);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_023);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_037);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_027);
- showText(TX_SPEAKER_KIRK, TX_TUG0_004);
+ showText(TX_SPEAKER_MCCOY, 23, true);
+ showText(TX_SPEAKER_SPOCK, 37, true);
+ showText(TX_SPEAKER_MCCOY, 27, true);
+ showText(TX_SPEAKER_KIRK, 4, true);
showText(TX_SPEAKER_SCOTT, TX_TUG0_S11);
- showText(TX_SPEAKER_KIRK, TX_TUG0_003);
+ showText(TX_SPEAKER_KIRK, 3, true);
showText(TX_SPEAKER_SCOTT, TX_TUG0_S06);
_awayMission->tug.field2d = 1;
@@ -344,13 +344,13 @@ void Room::tug0UseMTricorderOnControls() {
_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S;
loadActorAnim2(OBJECT_MCCOY, "mscans", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_016);
+ showText(TX_SPEAKER_MCCOY, 16, true);
}
void Room::tug0UseSTricorderOnControls() {
loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 23);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_015);
+ showText(TX_SPEAKER_SPOCK, 15, true);
}
void Room::tug0UseMTricorderOnEngineer() {
@@ -366,9 +366,9 @@ void Room::tug0MccoyReachedEngineerToScan() {
void Room::tug0MccoyFinishedScanningEngineer() {
if (_awayMission->tug.engineerConscious)
- showText(TX_SPEAKER_MCCOY, TX_TUG0_017);
+ showText(TX_SPEAKER_MCCOY, 17, true);
else
- showText(TX_SPEAKER_MCCOY, TX_TUG0_018);
+ showText(TX_SPEAKER_MCCOY, 18, true);
_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W;
walkCrewman(OBJECT_MCCOY, 0x41, 0xaf, 26);
@@ -379,7 +379,7 @@ void Room::tug0UseSTricorderOnEngineer() {
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S;
loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_030);
+ showText(TX_SPEAKER_SPOCK, 30, true);
}
void Room::tug0WalkToDoor() {
@@ -411,36 +411,36 @@ void Room::tug0LookAtDoor() {
}
void Room::tug0TalkToKirk() {
- showText(TX_SPEAKER_KIRK, TX_TUG0_006);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_036);
- showText(TX_SPEAKER_KIRK, TX_TUG0_011);
+ showText(TX_SPEAKER_KIRK, 6, true);
+ showText(TX_SPEAKER_SPOCK, 36, true);
+ showText(TX_SPEAKER_KIRK, 11, true);
}
void Room::tug0TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_TUG0_025);
- showText(TX_SPEAKER_KIRK, TX_TUG0_007);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_024);
+ showText(TX_SPEAKER_MCCOY, 25, true);
+ showText(TX_SPEAKER_KIRK, 7, true);
+ showText(TX_SPEAKER_MCCOY, 24, true);
}
void Room::tug0TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, TX_TUG0_042);
- showText(TX_SPEAKER_KIRK, TX_TUG0_009);
+ showText(TX_SPEAKER_SPOCK, 42, true);
+ showText(TX_SPEAKER_KIRK, 9, true);
}
void Room::tug0TalkToRedshirt() {
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG0L006);
+ showText(TX_SPEAKER_CHRISTENSEN, 6, true, true);
}
void Room::tug0TalkToEngineer() {
if (_awayMission->tug.engineerConscious) {
showText(TX_SPEAKER_SIMPSON, TX_TUG0_F30);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_026);
- showText(TX_SPEAKER_KIRK, TX_TUG0_012);
+ showText(TX_SPEAKER_MCCOY, 26, true);
+ showText(TX_SPEAKER_KIRK, 12, true);
}
}
void Room::tug0UseCommunicator() {
- showText(TX_SPEAKER_SPOCK, TX_TUG0_031);
+ showText(TX_SPEAKER_SPOCK, 31, true);
}
void Room::tug0LookAnywhere() {
@@ -451,14 +451,14 @@ void Room::tug0UseSTricorderAnywhere() {
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S;
loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_SPOCK, TX_TUG0_028);
+ showText(TX_SPEAKER_SPOCK, 28, true);
}
void Room::tug0UseMTricorderAnywhere() {
_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S;
loadActorAnim2(OBJECT_MCCOY, "mscans", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_MCCOY, TX_TUG0_020); // BUG: typo
+ showText(TX_SPEAKER_MCCOY, 20, true); // BUG: typo
}
}
diff --git a/engines/startrek/rooms/tug1.cpp b/engines/startrek/rooms/tug1.cpp
index 9f219c21b2..aa9a808d85 100644
--- a/engines/startrek/rooms/tug1.cpp
+++ b/engines/startrek/rooms/tug1.cpp
@@ -44,7 +44,7 @@ void Room::tug1UseSTricorderOnAnything() {
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N;
loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_SPOCK, TX_TUG1_014);
+ showText(TX_SPEAKER_SPOCK, 14, true);
// NOTE: this action has a second implementation (which is never called). It displayed
// TX_TUG1_006. Was this meant to be displayed after the force field is down?
@@ -53,7 +53,7 @@ void Room::tug1UseSTricorderOnAnything() {
void Room::tug1LookAtBridgeDoor() {
if (_awayMission->tug.bridgeForceFieldDown)
return;
- showDescription(TX_TUG1N005);
+ showDescription(5, true);
}
void Room::tug1UseSTricorderOnBridgeDoor() {
@@ -63,12 +63,12 @@ void Room::tug1UseSTricorderOnBridgeDoor() {
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N;
loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_SPOCK, TX_TUG1_002);
+ showText(TX_SPEAKER_SPOCK, 2, true);
}
void Room::tug1UsePhaserOnBridgeDoor() {
if (_awayMission->tug.bridgeForceFieldDown)
- showDescription(TX_TUG1N007);
+ showDescription(7, true);
else {
_awayMission->disableInput = true;
_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
@@ -93,18 +93,18 @@ void Room::tug1KirkFinishedFiringPhaser() {
void Room::tug1TalkToSpock() {
if (!_awayMission->tug.bridgeForceFieldDown)
- showText(TX_SPEAKER_SPOCK, TX_TUG1_010);
+ showText(TX_SPEAKER_SPOCK, 10, true);
}
void Room::tug1UseSTricorderOnJunkPile() {
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N;
loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_SPOCK, TX_TUG1_009);
+ showText(TX_SPEAKER_SPOCK, 9, true);
}
void Room::tug1LookAtJunkPile() {
- showDescription(TX_TUG1N000);
+ showDescription(0, true);
}
void Room::tug1GetJunkPile() {
@@ -130,24 +130,24 @@ void Room::tug1KirkFinishedTakingJunkPile() {
void Room::tug1UsePhaserOnWelder() {
loseItem(OBJECT_IPWE);
giveItem(OBJECT_IPWF);
- showDescription(TX_TUG1N004);
+ showDescription(4, true);
_awayMission->tug.missionScore += 3;
}
void Room::tug1UseWelderOnWireScraps() {
- showDescription(TX_TUG1N009);
+ showDescription(9, true);
loseItem(OBJECT_IWIRSCRP);
}
void Room::tug1UseWelderOnMetalScraps() {
- showText(TX_SPEAKER_SPOCK, TX_TUG1_012);
+ showText(TX_SPEAKER_SPOCK, 12, true);
loseItem(OBJECT_IJNKMETL);
giveItem(OBJECT_ICOMBBIT);
}
void Room::tug1UseCombBitOnTransmogrifier() {
- showText(TX_SPEAKER_SPOCK, TX_TUG1_017);
+ showText(TX_SPEAKER_SPOCK, 17, true);
loseItem(OBJECT_ICOMBBIT);
loseItem(OBJECT_IRT);
giveItem(OBJECT_IRTWB);
@@ -155,7 +155,7 @@ void Room::tug1UseCombBitOnTransmogrifier() {
void Room::tug1UsePhaserWelderOnBridgeDoor() {
if (_awayMission->tug.bridgeForceFieldDown)
- showDescription(TX_TUG1N008);
+ showDescription(8, true);
else {
_awayMission->disableInput = true;
_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
@@ -165,7 +165,7 @@ void Room::tug1UsePhaserWelderOnBridgeDoor() {
void Room::tug1UsePhaserWelderOnBridgeDoorInLeftSpot() {
if (_awayMission->tug.bridgeForceFieldDown)
- showDescription(TX_TUG1N007);
+ showDescription(7, true);
else {
_awayMission->disableInput = true;
_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
@@ -181,7 +181,7 @@ void Room::tug1KirkReachedBridgeDoorWithWelder() {
void Room::tug1KirkFinishedUsingWelder() {
loadActorStandAnim(OBJECT_PHASERSHOT);
- showText(TX_SPEAKER_SPOCK, TX_TUG1_016);
+ showText(TX_SPEAKER_SPOCK, 16, true);
_awayMission->disableInput = false;
}
@@ -193,26 +193,26 @@ void Room::tug1KirkReachedBridgeDoorWithWelderInLeftSpot() {
void Room::tug1KirkFinishedUsingWelderInLeftSpot() {
loadActorStandAnim(OBJECT_PHASERSHOT);
- showText(TX_SPEAKER_SPOCK, TX_TUG1_015);
+ showText(TX_SPEAKER_SPOCK, 15, true);
_awayMission->tug.bridgeForceFieldDown = true;
_awayMission->disableInput = false;
_awayMission->tug.missionScore++;
}
void Room::tug1LookAnywhere() {
- showDescription(TX_TUG1N013);
+ showDescription(13, true);
}
void Room::tug1LookAtMccoy() {
- showDescription(TX_TUG1N003);
+ showDescription(3, true);
}
void Room::tug1LookAtSpock() {
- showDescription(TX_TUG1N006);
+ showDescription(6, true);
}
void Room::tug1LookAtRedshirt() {
- showDescription(TX_TUG1N002);
+ showDescription(2, true);
}
void Room::tug1TalkToMccoy() {
@@ -220,36 +220,36 @@ void Room::tug1TalkToMccoy() {
}
void Room::tug1TalkToRedshirt() {
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG1L005);
+ showText(TX_SPEAKER_CHRISTENSEN, 5, true, true);
}
void Room::tug1LookAtTerminal() {
- showDescription(TX_TUG1N010);
+ showDescription(10, true);
}
void Room::tug1LookAtDebris() {
- showDescription(TX_TUG1N011);
+ showDescription(11, true);
}
void Room::tug1LookAtBrigDoor() {
- showDescription(TX_TUG1N001);
+ showDescription(1, true);
}
void Room::tug1UseSTricorderOnBrigDoor() {
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N;
loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_SPOCK, TX_TUG1_018);
+ showText(TX_SPEAKER_SPOCK, 18, true);
}
void Room::tug1TalkToKirk() {
- showText(TX_SPEAKER_KIRK, TX_TUG1_001);
- showText(TX_SPEAKER_MCCOY, TX_TUG1_008);
+ showText(TX_SPEAKER_KIRK, 1, true);
+ showText(TX_SPEAKER_MCCOY, 8, true);
}
// FIXME: not working
void Room::tug1UseCommunicator() {
- showText(TX_SPEAKER_SPOCK, TX_TUG1_011);
+ showText(TX_SPEAKER_SPOCK, 11, true);
}
void Room::tug1WalkToBridgeDoor() {
@@ -276,36 +276,36 @@ void Room::tug1UseMTricorderAnywhere() {
_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_N;
loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_MCCOY, TX_TUG1_003);
+ showText(TX_SPEAKER_MCCOY, 3, true);
}
void Room::tug1UseMTricorderOnBridgeDoor() {
_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_N;
loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_MCCOY, TX_TUG1_007);
+ showText(TX_SPEAKER_MCCOY, 7, true);
}
void Room::tug1UseMTricorderOnBrigDoor() {
_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_N;
loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
playSoundEffectIndex(SND_TRICORDER);
- showText(TX_SPEAKER_MCCOY, TX_TUG1_005);
+ showText(TX_SPEAKER_MCCOY, 5, true);
}
void Room::tug1UseSpockOnBridgeDoor() {
if (!_awayMission->tug.bridgeForceFieldDown)
- showText(TX_SPEAKER_SPOCK, TX_TUG1_013);
+ showText(TX_SPEAKER_SPOCK, 13, true);
}
void Room::tug1UseRedshirtOnBridgeDoor() {
if (!_awayMission->tug.bridgeForceFieldDown)
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG1L000);
+ showText(TX_SPEAKER_CHRISTENSEN, 0, true, true);
}
void Room::tug1UseMedkitOnBridgeDoor() {
if (!_awayMission->tug.bridgeForceFieldDown)
- showText(TX_SPEAKER_MCCOY, TX_TUG1_004);
+ showText(TX_SPEAKER_MCCOY, 4, true);
}
}
diff --git a/engines/startrek/rooms/tug2.cpp b/engines/startrek/rooms/tug2.cpp
index 1cd21dfdc6..ec23197c7c 100644
--- a/engines/startrek/rooms/tug2.cpp
+++ b/engines/startrek/rooms/tug2.cpp
@@ -113,25 +113,25 @@ void Room::tug2Tick1() {
void Room::tug2Tick60() {
if (!_awayMission->tug.guard1Status || !_awayMission->tug.guard2Status) {
_awayMission->timers[0] = 60;
- showText(TX_SPEAKER_ELASI_GUARD, TX_TUG2L085);
+ showText(TX_SPEAKER_ELASI_GUARD, 85, true, true);
tug2ElasiReadyPhaser();
}
}
void Room::tug2LookAtButton() {
- showDescription(TX_TUG2N011);
+ showDescription(11, true);
}
void Room::tug2LookAtMccoy() {
- showDescription(TX_TUG2N005);
+ showDescription(5, true);
}
void Room::tug2LookAtSpock() {
- showDescription(TX_TUG2N007);
+ showDescription(7, true);
}
void Room::tug2LookAtRedshirt() {
- showDescription(TX_TUG2N004);
+ showDescription(4, true);
}
void Room::tug2GetBomb() {
@@ -140,7 +140,7 @@ void Room::tug2GetBomb() {
_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
walkCrewman(OBJECT_KIRK, 0xc9, 0xa0, 12);
} else
- showDescription(TX_TUG2N024);
+ showDescription(24, true);
}
void Room::tug2KirkReachedBomb() {
@@ -155,33 +155,33 @@ void Room::tug2KirkGotBomb() {
}
void Room::tug2LookAtBomb() {
- showDescription(TX_TUG2N000);
+ showDescription(0, true);
}
void Room::tug2LookAtGuard1() {
if (_awayMission->tug.guard1Status == 0)
- showDescription(TX_TUG2N001);
+ showDescription(1, true);
else if (_awayMission->tug.guard1Status == 1)
- showDescription(TX_TUG2N013);
+ showDescription(13, true);
else if (_awayMission->tug.guard1Status == 8)
- showDescription(TX_TUG2N015);
+ showDescription(15, true);
else if (_awayMission->tug.guard1Status == 2)
- showDescription(TX_TUG2N106);
+ showDescription(106, true);
}
void Room::tug2LookAtGuard2() {
if (_awayMission->tug.guard2Status == 0)
- showDescription(TX_TUG2N037);
+ showDescription(37, true);
else if (_awayMission->tug.guard2Status == 1)
- showDescription(TX_TUG2N014);
+ showDescription(14, true);
else if (_awayMission->tug.guard2Status == 8)
- showDescription(TX_TUG2N016);
+ showDescription(16, true);
else if (_awayMission->tug.guard2Status == 2)
- showDescription(TX_TUG2N106);
+ showDescription(106, true);
}
void Room::tug2LookAtWires() {
- showDescription(TX_TUG2N010);
+ showDescription(10, true);
}
void Room::tug2UseSTricorderOnButton() {
@@ -193,17 +193,17 @@ void Room::tug2UseSTricorderOnButton() {
void Room::tug2UseMccoyOnWires() {
if (_awayMission->tug.field35 != 0)
return;
- showText(TX_SPEAKER_MCCOY, TX_TUG2_009);
+ showText(TX_SPEAKER_MCCOY, 9, true);
}
void Room::tug2UseMccoyOnBomb() {
- showText(TX_SPEAKER_MCCOY, TX_TUG2_011);
+ showText(TX_SPEAKER_MCCOY, 11, true);
}
void Room::tug2UseRedshirtOnWires() {
if (_awayMission->disableWalking || _awayMission->tug.field35 != 0)
return;
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG2L007);
+ showText(TX_SPEAKER_CHRISTENSEN, 7, true, true);
_awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_N;
_awayMission->disableInput = true;
walkCrewman(OBJECT_REDSHIRT, 0xc9, 0xa0, 6);
@@ -215,7 +215,7 @@ void Room::tug2RedshirtReachedWires() {
void Room::tug2RedshirtDefusedBomb() {
showDescription(TX_TUG2C001);
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG2L011);
+ showText(TX_SPEAKER_CHRISTENSEN, 11, true, true);
_awayMission->tug.field35 = 4;
_awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_E;
walkCrewman(OBJECT_REDSHIRT, 0x44, 0xc2, 8);
@@ -235,8 +235,8 @@ void Room::tug2UseKirkOnWires() {
}
void Room::tug2KirkReachedWires() {
- showText(TX_SPEAKER_KIRK, TX_TUG2_003);
- showText(TX_SPEAKER_SPOCK, TX_TUG2_023);
+ showText(TX_SPEAKER_KIRK, 3, true);
+ showText(TX_SPEAKER_SPOCK, 23, true);
_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E;
walkCrewman(OBJECT_KIRK, 0x66, 0xb8, 0);
@@ -255,11 +255,11 @@ void Room::tug2UseSpockOnWires() {
void Room::tug2SpockReachedWires() {
loadActorAnim2(OBJECT_SPOCK, "suseme", -1, -1, 0);
playVoc("WIRESNIP");
- showText(TX_SPEAKER_SPOCK, TX_TUG2_024);
+ showText(TX_SPEAKER_SPOCK, 24, true);
_awayMission->tug.field35 = 4;
if (_awayMission->tug.spockExaminedTransporter)
- showText(TX_SPEAKER_SPOCK, TX_TUG2_008);
+ showText(TX_SPEAKER_SPOCK, 8, true);
_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_E;
walkCrewman(OBJECT_SPOCK, 0x56, 0xa9, 11);
@@ -376,25 +376,25 @@ void Room::tug2TurnedOffForceField() {
void Room::tug2PrisonersDead() {
loadActorAnim2(OBJECT_BRIG, "zapdon", 0, 0, 0);
- showDescription(TX_TUG2N026);
+ showDescription(26, true);
}
void Room::tug2PrisonersReleased() {
loadActorAnim2(OBJECT_BRIG, "fld10d", 0, 0, 0);
- showText(TX_SPEAKER_MASADA_CREWMAN, TX_TUG2_029);
- showText(TX_SPEAKER_MASADA_CREWMAN, TX_TUG2_030);
- showText(TX_SPEAKER_MASADA_CREWMAN, TX_TUG2_028);
+ showText(TX_SPEAKER_MASADA_CREWMAN, 29, true);
+ showText(TX_SPEAKER_MASADA_CREWMAN, 30, true);
+ showText(TX_SPEAKER_MASADA_CREWMAN, 28, true);
_awayMission->tug.savedPrisoners = true;
}
void Room::tug2UsePhaserOnBrig() {
if (_awayMission->tug.field35 == 0)
- showText(TX_SPEAKER_SPOCK, TX_TUG2_006);
+ showText(TX_SPEAKER_SPOCK, 6, true);
else if (_awayMission->tug.brigForceFieldDown) {
// BUGFIX: this function had two implementations; one for firing on the brig, and
// one for firing on the masada crewman (who replaces the brig object). The first
// took priority, meaning the latter code never ran. That's fixed here.
- showText(TX_SPEAKER_MASADA_CREWMAN, TX_TUG2_025);
+ showText(TX_SPEAKER_MASADA_CREWMAN, 25, true);
}
}
@@ -526,7 +526,7 @@ void Room::tug2KirkKillGuard2() {
void Room::tug2UsePhaserOnWelder() {
loseItem(OBJECT_IPWE);
giveItem(OBJECT_IPWF);
- showDescription(TX_TUG2N006);
+ showDescription(6, true);
// 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,25 +534,25 @@ void Room::tug2UsePhaserOnWelder() {
}
void Room::tug2UseWelderOnWireScraps() {
- showDescription(TX_TUG2N009);
+ showDescription(9, true);
loseItem(OBJECT_IWIRSCRP);
}
void Room::tug2UseWelderOnMetalScraps() {
- showText(TX_SPEAKER_SPOCK, TX_TUG2_112);
+ showText(TX_SPEAKER_SPOCK, 112, true);
loseItem(OBJECT_IJNKMETL);
giveItem(OBJECT_ICOMBBIT);
}
void Room::tug2UseCombBitOnTransmogrifier() {
- showText(TX_SPEAKER_SPOCK, TX_TUG2_021);
+ showText(TX_SPEAKER_SPOCK, 21, true);
loseItem(OBJECT_ICOMBBIT);
loseItem(OBJECT_IRT);
giveItem(OBJECT_IRTWB);
}
void Room::tug2ShotByElasi() {
- showDescription(TX_TUG2N025);
+ showDescription(25, true);
showGameOverMenu();
// Unused: additional textbox that says "***Game over man!***"
@@ -563,25 +563,25 @@ void Room::tug2WalkToDoor() {
}
void Room::tug2LookAtDoor() {
- showDescription(TX_TUG2N012);
+ showDescription(12, true);
}
void Room::tug2LookAtKirk() {
- showDescription(TX_TUG2N003);
+ showDescription(3, true);
}
void Room::tug2TalkToKirk() {
if (_awayMission->tug.field35 == 6)
- showText(TX_SPEAKER_KIRK, TX_TUG2_001);
+ showText(TX_SPEAKER_KIRK, 1, true);
else
- showText(TX_SPEAKER_KIRK, TX_TUG2_002);
+ showText(TX_SPEAKER_KIRK, 2, true);
}
void Room::tug2TalkToMccoy() {
if (_awayMission->tug.field35 == 6)
- showText(TX_SPEAKER_MCCOY, TX_TUG2_018);
+ showText(TX_SPEAKER_MCCOY, 18, true);
else
- showText(TX_SPEAKER_MCCOY, TX_TUG2_010);
+ showText(TX_SPEAKER_MCCOY, 10, true);
}
void Room::tug2TalkToRedshirt() {
@@ -589,7 +589,7 @@ void Room::tug2TalkToRedshirt() {
// precedence, however, it's just generic, unhelpful text. The second implementation
// is more interesting, so that one is used instead.
if (_awayMission->tug.field35 == 6)
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG2L004);
+ showText(TX_SPEAKER_CHRISTENSEN, 4, true, true);
else
showText(TX_SPEAKER_CHRISTENSEN, TX_TUG2J003);
@@ -599,9 +599,9 @@ void Room::tug2TalkToRedshirt() {
void Room::tug2TalkToSpock() {
if (_awayMission->tug.field35 == 6)
- showText(TX_SPEAKER_SPOCK, TX_TUG2_005);
+ showText(TX_SPEAKER_SPOCK, 5, true);
else
- showText(TX_SPEAKER_SPOCK, TX_TUG2_020);
+ showText(TX_SPEAKER_SPOCK, 20, true);
}
void Room::tug2UseCommunicator() {
@@ -796,47 +796,47 @@ void Room::tug2UseMTricorderOnGuard2() {
void Room::tug2TalkToGuard1() {
if (_awayMission->tug.guard1Status == GUARDSTAT_TIED)
- showText(TX_SPEAKER_ELASI_GUARD, TX_TUG2L086);
+ showText(TX_SPEAKER_ELASI_GUARD, 86, true, true);
else if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED)
- showText(TX_SPEAKER_MCCOY, TX_TUG2_012);
+ showText(TX_SPEAKER_MCCOY, 12, true);
}
void Room::tug2TalkToGuard2() {
if (_awayMission->tug.guard2Status == GUARDSTAT_TIED)
- showText(TX_SPEAKER_ELASI_GUARD, TX_TUG2L086);
+ showText(TX_SPEAKER_ELASI_GUARD, 86, true, true);
else if (_awayMission->tug.guard2Status == GUARDSTAT_STUNNED)
- showText(TX_SPEAKER_MCCOY, TX_TUG2_013);
+ showText(TX_SPEAKER_MCCOY, 13, true);
}
void Room::tug2UseMedkitOnBomb() {
- showText(TX_SPEAKER_MCCOY, TX_TUG2_017);
+ showText(TX_SPEAKER_MCCOY, 17, true);
}
void Room::tug2UseMedkitOnGuard1() {
if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED)
- showText(TX_SPEAKER_MCCOY, TX_TUG2_014);
+ showText(TX_SPEAKER_MCCOY, 14, true);
}
void Room::tug2UseMedkitOnGuard2() {
if (_awayMission->tug.guard2Status == GUARDSTAT_STUNNED)
- showText(TX_SPEAKER_MCCOY, TX_TUG2_014);
+ showText(TX_SPEAKER_MCCOY, 14, true);
}
void Room::tug2LookAnywhere() {
if (_awayMission->tug.guard1Status == GUARDSTAT_DEAD && _awayMission->tug.guard2Status == GUARDSTAT_DEAD && _awayMission->tug.field35 == 6)
- showDescription(TX_TUG2N019);
+ showDescription(19, true);
else if (_awayMission->tug.guard1Status == GUARDSTAT_DEAD && _awayMission->tug.guard2Status == GUARDSTAT_DEAD && !_awayMission->tug.brigForceFieldDown)
- showDescription(TX_TUG2N017);
+ showDescription(17, true);
else if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED && _awayMission->tug.guard2Status == GUARDSTAT_STUNNED && _awayMission->tug.field35 == 6)
- showDescription(TX_TUG2N020);
+ showDescription(20, true);
else if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED && _awayMission->tug.guard2Status == GUARDSTAT_STUNNED && !_awayMission->tug.brigForceFieldDown)
- showDescription(TX_TUG2N018);
+ showDescription(18, true);
else if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED && _awayMission->tug.guard2Status == GUARDSTAT_STUNNED && _awayMission->tug.brigForceFieldDown)
- showDescription(TX_TUG2N021);
+ showDescription(21, true);
else if (_awayMission->tug.guard1Status == GUARDSTAT_DEAD && _awayMission->tug.guard2Status == GUARDSTAT_DEAD && _awayMission->tug.brigForceFieldDown)
- showDescription(TX_TUG2N022);
+ showDescription(22, true);
else
- showDescription(TX_TUG2N023);
+ showDescription(23, true);
}
void Room::tug2TalkToBrig() {
@@ -845,12 +845,12 @@ void Room::tug2TalkToBrig() {
if (_awayMission->tug.brigForceFieldDown && !_awayMission->tug.talkedToBrigCrewman) {
loadActorAnim2(OBJECT_BRIG, "fld10d", 0, 0, 0);
- showText(TX_SPEAKER_MASADA_CREWMAN, TX_TUG2_026);
+ showText(TX_SPEAKER_MASADA_CREWMAN, 26, true);
_awayMission->tug.talkedToBrigCrewman = true;
}
if (_awayMission->tug.brigForceFieldDown && _awayMission->tug.talkedToBrigCrewman)
- showText(TX_SPEAKER_MASADA_CREWMAN, TX_TUG2_027);
+ showText(TX_SPEAKER_MASADA_CREWMAN, 27, true);
else if (!_awayMission->tug.brigForceFieldDown)
mccoyScan(DIR_E, TX_TUG2_015, true);
}
diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp
index 9fd2a075e0..6374983967 100644
--- a/engines/startrek/rooms/tug3.cpp
+++ b/engines/startrek/rooms/tug3.cpp
@@ -54,7 +54,7 @@ void Room::tug3Tick40() {
}
void Room::tug3LookAnywhere() {
- showDescription(TX_TUG3N007);
+ showDescription(7, true);
}
void Room::tug3ElasiSurrendered() {
@@ -102,7 +102,7 @@ void Room::tug3ElasiDrawPhasers() {
// If brig guards are alive & untied, kill the hostages
if (_awayMission->tug.guard1Status == 0 || _awayMission->tug.guard2Status == 0) {
- showText(TX_SPEAKER_ELASI_CLANSMAN, TX_TUG3L081);
+ showText(TX_SPEAKER_ELASI_CLANSMAN, 81, true, true);
_awayMission->tug.missionScore = 0;
}
@@ -226,16 +226,16 @@ void Room::tug3TalkToElasi1() {
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- TX_TUG3_004,
- TX_TUG3_003,
- TX_TUG3_002,
+ 4,
+ 3,
+ 2,
TX_BLANK
};
- int choice = showMultipleTexts(choices);
+ int choice = showMultipleTexts(choices, true);
switch (choice) {
case 0: // They surrender
- showText(TX_SPEAKER_ELASI_CERETH, TX_TUG3L084);
+ showText(TX_SPEAKER_ELASI_CERETH, 84, true, true);
_awayMission->tug.bridgeElasi1Status = GUARDSTAT_SURRENDERED;
loadActorAnim2(OBJECT_ELASI_1, "p1surr", -1, -1, 0);
tug3ElasiSurrendered();
@@ -252,7 +252,7 @@ void Room::tug3TalkToElasi1() {
case 2: // Cereth shoots console and surrenders
_awayMission->disableInput = true;
- showText(TX_SPEAKER_ELASI_CERETH, TX_TUG3L083);
+ showText(TX_SPEAKER_ELASI_CERETH, 83, true, true);
loadActorAnim2(OBJECT_ELASI_1, "p1draw", -1, -1, 5);
// BUGFIX: they're going to surrender, so stop the firefight.
@@ -282,7 +282,7 @@ void Room::tug3Elasi1DrewPhaser2() {
}
void Room::tug3Elasi1ShotConsoleAndSurrenders() {
- showText(TX_SPEAKER_ELASI_CERETH, TX_TUG3L080);
+ showText(TX_SPEAKER_ELASI_CERETH, 80, true, true);
tug3ElasiSurrendered();
_awayMission->disableInput = false;
_awayMission->tug.bridgeWinMethod = 3;
@@ -290,15 +290,15 @@ void Room::tug3Elasi1ShotConsoleAndSurrenders() {
}
void Room::tug3LookAtMccoy() {
- showDescription(TX_TUG3N000);
+ showDescription(0, true);
}
void Room::tug3LookAtSpock() {
- showDescription(TX_TUG3N002);
+ showDescription(2, true);
}
void Room::tug3LookAtRedshirt() {
- showDescription(TX_TUG3N001);
+ showDescription(1, true);
}
void Room::tug3LookAtElasi1() {
@@ -309,61 +309,61 @@ void Room::tug3LookAtElasi1() {
// instead of just checking if he's stunned.
if (_awayMission->tug.bridgeElasi1Status == GUARDSTAT_STUNNED || _awayMission->tug.bridgeElasi1Status == GUARDSTAT_DEAD)
- showDescription(TX_TUG3N003);
+ showDescription(3, true);
else
- showDescription(TX_TUG3N008);
+ showDescription(8, true);
}
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)
- showDescription(TX_TUG3N004);
+ showDescription(4, true);
else
- showDescription(TX_TUG3N005);
+ showDescription(5, true);
}
void Room::tug3LookAtElasi3() {
if (_awayMission->tug.bridgeElasi3Status == GUARDSTAT_DEAD || _awayMission->tug.bridgeElasi2Status == GUARDSTAT_STUNNED)
- showDescription(TX_TUG3N004);
+ showDescription(4, true);
else
- showDescription(TX_TUG3N005);
+ showDescription(5, true);
}
void Room::tug3LookAtElasi4() {
if (_awayMission->tug.bridgeElasi4Status == GUARDSTAT_DEAD || _awayMission->tug.bridgeElasi2Status == GUARDSTAT_STUNNED)
- showDescription(TX_TUG3N004);
+ showDescription(4, true);
else
- showDescription(TX_TUG3N005);
+ showDescription(5, true);
}
void Room::tug3TalkToMccoy() {
if (_awayMission->tug.orbitalDecayCounter != 0 || _awayMission->tug.bridgeElasi1Status != GUARDSTAT_UP) {
if (_awayMission->tug.orbitalDecayCounter >= 10) {
if (_awayMission->tug.orbitalDecayCounter < 16)
- showText(TX_SPEAKER_MCCOY, TX_TUG3_011);
+ showText(TX_SPEAKER_MCCOY, 11, true);
} else if (_awayMission->tug.orbitalDecayCounter != 0) {
// BUGFIX: original game displays a blank textbox. An appropriate audio file
// exists, but the corresponding text was written from scratch for ScummVM.
// TODO: check if original floppy version has text for this.
- showText(TX_SPEAKER_MCCOY, TX_TUG3_012);
+ showText(TX_SPEAKER_MCCOY, 12, true);
}
} else
- showText(TX_SPEAKER_MCCOY, TX_TUG3_013);
+ showText(TX_SPEAKER_MCCOY, 13, true);
}
void Room::tug3TalkToSpock() {
if (_awayMission->tug.orbitalDecayCounter != 0) {
if (_awayMission->tug.orbitalDecayCounter >= 10) {
if (_awayMission->tug.orbitalDecayCounter < 16)
- showText(TX_SPEAKER_SPOCK, TX_TUG3_008);
+ showText(TX_SPEAKER_SPOCK, 8, true);
} else
- showText(TX_SPEAKER_SPOCK, TX_TUG3_009);
+ showText(TX_SPEAKER_SPOCK, 9, true);
}
}
void Room::tug3TalkToRedshirt() {
- showText(TX_SPEAKER_CHRISTENSEN, TX_TUG3L003);
+ showText(TX_SPEAKER_CHRISTENSEN, 3, true, true);
}
void Room::tug3UseCommunicator() {
@@ -371,8 +371,8 @@ void Room::tug3UseCommunicator() {
return;
if (_awayMission->tug.orbitalDecayCounter < 10) {
- showText(TX_SPEAKER_KIRK, TX_TUG3_007);
- showText(TX_SPEAKER_SULU, TX_TUG3_015);
+ showText(TX_SPEAKER_KIRK, 7, true);
+ showText(TX_SPEAKER_SULU, 15, true);
showText(TX_SPEAKER_SHIPS_COMPUTER, TX_COMPA180);
_awayMission->timers[1] = 0;
@@ -388,7 +388,7 @@ void Room::tug3UseCommunicator() {
tug3EndMission();
} else {
if (_awayMission->tug.orbitalDecayCounter < 16) {
- showText(TX_SPEAKER_KIRK, TX_TUG3_006);
+ showText(TX_SPEAKER_KIRK, 6, true);
showText(TX_SPEAKER_SCOTT, TX_TUG3_S07);
playMidiMusicTracks(-1, -1);
@@ -462,14 +462,14 @@ void Room::tug3Timer1Expired() {
_awayMission->timers[1] = 100;
_awayMission->tug.orbitalDecayCounter++;
} else { // Game over
- showDescription(TX_TUG3N006);
+ showDescription(6, true);
showGameOverMenu();
}
}
void Room::tug3EndMission() {
playMidiMusicTracks(28, -1);
- showText(TX_SPEAKER_KIRK, TX_TUG3_001);
+ showText(TX_SPEAKER_KIRK, 1, true);
playSoundEffectIndex(SND_TRANSMAT);
loadActorAnim2(OBJECT_13, "rteleb", 0x14, 0xa0, 7);
loadActorAnim2(OBJECT_14, "rteleb", 0x118, 0xa0, 0);
@@ -481,7 +481,7 @@ void Room::tug3SecurityTeamBeamedIn() {
loadActorAnim2(OBJECT_14, "rdraws", -1, -1, 9);
loadActorAnim2(OBJECT_15, "rfiren", -1, -1, 10);
- showText(TX_SPEAKER_KIRK, TX_TUG3_005);
+ showText(TX_SPEAKER_KIRK, 5, true);
showText(TX_SPEAKER_SCOTT, TX_TUG3_S08);
playMidiMusicTracks(-1, -1);