diff options
author | Filippos Karapetis | 2019-10-29 21:32:41 +0200 |
---|---|---|
committer | Filippos Karapetis | 2019-10-30 01:42:46 +0200 |
commit | 8dca2bf30a3c2002490c33fc0a812e719a4998d3 (patch) | |
tree | 88cd2ad560cedfd0bc64ad44e9c9ce9778727e57 /engines/startrek/rooms | |
parent | 1adbc2feb7b937e0f263fd11eb2bfa8b0eb81384 (diff) | |
download | scummvm-rg350-8dca2bf30a3c2002490c33fc0a812e719a4998d3.tar.gz scummvm-rg350-8dca2bf30a3c2002490c33fc0a812e719a4998d3.tar.bz2 scummvm-rg350-8dca2bf30a3c2002490c33fc0a812e719a4998d3.zip |
STARTREK: Load the text for the VENG mission from RDF files
Diffstat (limited to 'engines/startrek/rooms')
-rw-r--r-- | engines/startrek/rooms/veng0.cpp | 126 | ||||
-rw-r--r-- | engines/startrek/rooms/veng1.cpp | 78 | ||||
-rw-r--r-- | engines/startrek/rooms/veng2.cpp | 308 | ||||
-rw-r--r-- | engines/startrek/rooms/veng3.cpp | 68 | ||||
-rw-r--r-- | engines/startrek/rooms/veng4.cpp | 86 | ||||
-rw-r--r-- | engines/startrek/rooms/veng5.cpp | 58 | ||||
-rw-r--r-- | engines/startrek/rooms/veng6.cpp | 88 | ||||
-rw-r--r-- | engines/startrek/rooms/veng7.cpp | 32 | ||||
-rw-r--r-- | engines/startrek/rooms/veng8.cpp | 96 |
9 files changed, 470 insertions, 470 deletions
diff --git a/engines/startrek/rooms/veng0.cpp b/engines/startrek/rooms/veng0.cpp index d19937fee3..cd09a21358 100644 --- a/engines/startrek/rooms/veng0.cpp +++ b/engines/startrek/rooms/veng0.cpp @@ -130,21 +130,21 @@ void Room::veng0Tick10() { void Room::veng0Tick50() { if (!_awayMission->veng.enteredRoom0FirstTime) { _awayMission->veng.enteredRoom0FirstTime = true; - showText(TX_SPEAKER_MCCOY, TX_VEN0_018); - showText(TX_SPEAKER_KIRK, TX_VEN0_006); - showText(TX_SPEAKER_SCOTT, TX_VEN0_S12); - showText(TX_SPEAKER_KIRK, TX_VEN0_008); - showText(TX_SPEAKER_SCOTT, TX_VEN0_S52); - showText(TX_SPEAKER_KIRK, TX_VEN0_007); - showText(TX_SPEAKER_SPOCK, TX_VEN0_030); - showText(TX_SPEAKER_SCOTT, TX_VEN0_S15); - showText(TX_SPEAKER_KIRK, TX_VEN0_005); - showText(TX_SPEAKER_CHEKOV, TX_VEN0_039); - showText(TX_SPEAKER_KIRK, TX_VEN0_009); - showText(TX_SPEAKER_SCOTT, TX_VEN0_S54); - showText(TX_SPEAKER_KIRK, TX_VEN0_011); - showText(TX_SPEAKER_KIRK, TX_VEN0_010); - showText(TX_SPEAKER_MCCOY, TX_VEN0_017); + showText(TX_SPEAKER_MCCOY, 18, true); + showText(TX_SPEAKER_KIRK, 6, true); + showText(TX_SPEAKER_SCOTT, 12 + SCOTTY_MESSAGE_OFFSET, true); + showText(TX_SPEAKER_KIRK, 8, true); + showText(TX_SPEAKER_SCOTT, 52 + SCOTTY_MESSAGE_OFFSET, true); + showText(TX_SPEAKER_KIRK, 7, true); + showText(TX_SPEAKER_SPOCK, 30, true); + showText(TX_SPEAKER_SCOTT, 15 + SCOTTY_MESSAGE_OFFSET, true); + showText(TX_SPEAKER_KIRK, 5, true); + showText(TX_SPEAKER_CHEKOV, 39, true); + showText(TX_SPEAKER_KIRK, 9, true); + showText(TX_SPEAKER_SCOTT, 54 + SCOTTY_MESSAGE_OFFSET, true); + showText(TX_SPEAKER_KIRK, 11, true); + showText(TX_SPEAKER_KIRK, 10, true); + showText(TX_SPEAKER_MCCOY, 17, true); _awayMission->veng.enterpriseLeftForDistressCall = true; } } @@ -159,13 +159,13 @@ void Room::veng0UseSTricorderOnComputerBank() { _awayMission->veng.scannedComputerBank = true; _awayMission->veng.field6c = true; - spockScan(DIR_S, TX_VEN0_028); - showText(TX_SPEAKER_KIRK, TX_VEN0_002); - showText(TX_SPEAKER_SPOCK, TX_VEN0_029); - showText(TX_SPEAKER_MCCOY, TX_VEN0_020); - showText(TX_SPEAKER_SPOCK, TX_VEN0_031); + spockScan(DIR_S, 28, false, true); + showText(TX_SPEAKER_KIRK, 2, true); + showText(TX_SPEAKER_SPOCK, 29, true); + showText(TX_SPEAKER_MCCOY, 20, true); + showText(TX_SPEAKER_SPOCK, 31, true); } else - showText(TX_SPEAKER_SPOCK, TX_VEN0_025); + showText(TX_SPEAKER_SPOCK, 25, true); } void Room::veng0UseSTricorderOnChair() { @@ -173,51 +173,51 @@ void Room::veng0UseSTricorderOnChair() { _awayMission->veng.scannedCaptainsChair = true; _awayMission->veng.field6b = true; - spockScan(DIR_S, TX_VEN0_32); - showText(TX_SPEAKER_PATTERSON, TX_VEN0_035); - showText(TX_SPEAKER_SPOCK, TX_VEN0_033); - showText(TX_SPEAKER_KIRK, TX_VEN0_004); + spockScan(DIR_S, 32, false, true); + showText(TX_SPEAKER_PATTERSON, 35, true); + showText(TX_SPEAKER_SPOCK, 33, true); + showText(TX_SPEAKER_KIRK, 4, true); } else - showText(TX_SPEAKER_SPOCK, TX_VEN0_026); + showText(TX_SPEAKER_SPOCK, 26, true); } void Room::veng0UseSTricorderAnywhere() { if (!_awayMission->veng.impulseEnginesOn) - spockScan(DIR_S, TX_VEN0_027); + spockScan(DIR_S, 27, false, true); } void Room::veng0UseMccoyOnBeam() { - showText(TX_SPEAKER_MCCOY, TX_VEN0_015); + showText(TX_SPEAKER_MCCOY, 15, true); } void Room::veng0UseSTricorderOnBeam() { - spockScan(DIR_W, TX_VEN0_034); - showText(TX_SPEAKER_MCCOY, TX_VEN0_021); + spockScan(DIR_W, 34, false, true); + showText(TX_SPEAKER_MCCOY, 21, true); } void Room::veng0UseRedshirtOnBeam() { - showText(TX_SPEAKER_KIJE, TX_VEN0_037); + showText(TX_SPEAKER_KIJE, 37, true); } void Room::veng0UseSpockOnConsole() { - showText(TX_SPEAKER_SPOCK, TX_VEN0_024); + showText(TX_SPEAKER_SPOCK, 24, true); } void Room::veng0UseRedshirtOnConsole() { - showText(TX_SPEAKER_KIJE, TX_VEN0_038); + showText(TX_SPEAKER_KIJE, 38, true); } void Room::veng0UsePhaserOnBeam() { - showText(TX_SPEAKER_SPOCK, TX_VEN0_013); + showText(TX_SPEAKER_SPOCK, 13, true); } void Room::veng0UseMccoyOnDeadCrewman() { - mccoyScan(DIR_S, TX_VEN0_016); + mccoyScan(DIR_S, 16, true); } void Room::veng0UseSawOnBeam() { if (_awayMission->veng.beamState == 1 || _awayMission->veng.beamState == 2) - showDescription(TX_VEN0N008); + showDescription(8, true); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_KIRK, 0x24, 0xc2, &Room::veng0KirkReachedSaw); @@ -241,7 +241,7 @@ void Room::veng0DoneCuttingBeam() { loadActorStandAnim(OBJECT_9); loadActorStandAnim(OBJECT_10); - showDescription(TX_VEN0N007); + showDescription(7, true); _awayMission->veng.beamState = 1; veng0GetBeam(); @@ -249,90 +249,90 @@ void Room::veng0DoneCuttingBeam() { void Room::veng0GetBeam() { if (_awayMission->veng.beamState == 1) { - showDescription(TX_VEN0N019); + showDescription(19, true); _awayMission->veng.beamState = 2; giveItem(OBJECT_IBEAM); loadActorAnim2(OBJECT_BEAM, "s7r0bf", 0x0e, 0x9a); } else - showDescription(TX_VEN0N009); + showDescription(9, true); } void Room::veng0TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_VEN0_001); + showText(TX_SPEAKER_KIRK, 1, true); } void Room::veng0TalkToMccoy() { - showText(TX_SPEAKER_MCCOY, TX_VEN0_014); + showText(TX_SPEAKER_MCCOY, 14, true); } void Room::veng0TalkToSpock() { if (_awayMission->veng.scannedComputerBank && _awayMission->veng.scannedCaptainsChair) - showText(TX_SPEAKER_SPOCK, TX_VEN0_012); + showText(TX_SPEAKER_SPOCK, 12, true); else - showText(TX_SPEAKER_SPOCK, TX_VEN0_023); + showText(TX_SPEAKER_SPOCK, 23, true); } void Room::veng0TalkToRedshirt() { - showText(TX_SPEAKER_KIJE, TX_VEN0_036); + showText(TX_SPEAKER_KIJE, 36, true); } void Room::veng0LookAtPatterson() { - showDescription(TX_VEN0N004); + showDescription(4, true); } void Room::veng0LookAtDeadCrewman2() { - showDescription(TX_VEN0N017); + showDescription(17, true); } void Room::veng0LookAtComputerBank() { - showDescription(TX_VEN0N005); + showDescription(5, true); } void Room::veng0LookAtChair() { - showDescription(TX_VEN0N015); + showDescription(15, true); } void Room::veng0LookAtKirk() { - showDescription(TX_VEN0N001); + showDescription(1, true); } void Room::veng0LookAtSpock() { - showDescription(TX_VEN0N006); + showDescription(6, true); } void Room::veng0LookAtMccoy() { - showDescription(TX_VEN0N002); + showDescription(2, true); } void Room::veng0LookAtRedshirt() { - showDescription(TX_VEN0N003); + showDescription(3, true); } void Room::veng0LookAtViewscreen() { - showDescription(TX_VEN0N010); + showDescription(10, true); } void Room::veng0LookAtHelmConsole() { - showDescription(TX_VEN0N011); + showDescription(11, true); } void Room::veng0LookAtNavConsole() { - showDescription(TX_VEN0N012); + showDescription(12, true); } void Room::veng0LookAtBeam() { if (_awayMission->veng.beamState == 1) - showDescription(TX_VEN0N013); + showDescription(13, true); else - showDescription(TX_VEN0N000); + showDescription(0, true); } void Room::veng0LookAnywhere() { - showDescription(TX_VEN0N018); + showDescription(18, true); } void Room::veng0LookAtDeadCrewman1() { - showDescription(TX_VEN0N016); + showDescription(16, true); } void Room::veng0UseMccoyOnLivingCrewman() { @@ -341,20 +341,20 @@ void Room::veng0UseMccoyOnLivingCrewman() { _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_E; walkCrewmanC(OBJECT_MCCOY, 0xdc, 0xa0, &Room::veng0MccoyReachedCrewman); } else - showText(TX_SPEAKER_MCCOY, TX_VEN0_016); + showText(TX_SPEAKER_MCCOY, 16, true); } void Room::veng0MccoyReachedCrewman() { _awayMission->veng.bridgeCrewmanDead = true; _awayMission->veng.field68 = true; - mccoyScan(DIR_E, TX_VEN0_022); - showText(TX_SPEAKER_KIRK, TX_VEN0_003); + mccoyScan(DIR_E, 22, false, true); + showText(TX_SPEAKER_KIRK, 3, true); loadActorAnimC(OBJECT_MCCOY, "mscane", -1, -1, &Room::veng0MccoyScannedCrewman); } void Room::veng0MccoyScannedCrewman() { - showText(TX_SPEAKER_MCCOY, TX_VEN0_019); + showText(TX_SPEAKER_MCCOY, 19, true); _awayMission->disableInput = false; } diff --git a/engines/startrek/rooms/veng1.cpp b/engines/startrek/rooms/veng1.cpp index 34e77fdf88..82c4036223 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 - showDescription(TX_VEN1N007); + showDescription(7, true); } void Room::veng1TouchedHotspot0() { @@ -184,94 +184,94 @@ void Room::veng1LookAtDeadGuy() { } void Room::veng1UseSTricorderOnVent() { - spockScan(DIR_W, TX_VEN1_011); + spockScan(DIR_W, 11, false, true); } void Room::veng1LookAtPanel() { if (!_awayMission->veng.openedPanel) - showDescription(TX_VEN1N022); + showDescription(22, true); else if (!_awayMission->veng.removedPanelDebris) - showDescription(TX_VEN1N019); + showDescription(19, true); else - showDescription(TX_VEN1N010); + showDescription(10, true); } void Room::veng1LookAtDoor() { - showDescription(TX_VEN1N021); + showDescription(21, true); } void Room::veng1LookAtSaw() { - showDescription(TX_VEN1N001); + showDescription(1, true); } void Room::veng1LookAtDebris() { - showDescription(TX_VEN1N000); + showDescription(0, true); } void Room::veng1LookAtKirk() { - showDescription(TX_VEN1N002); + showDescription(2, true); } void Room::veng1LookAtMccoy() { - showDescription(TX_VEN1N004); + showDescription(4, true); } void Room::veng1LookAtSpock() { - showDescription(TX_VEN1N003); + showDescription(3, true); } void Room::veng1LookAtRedshirt() { - showDescription(TX_VEN1N005); + showDescription(5, true); } void Room::veng1LookAnywhere() { - showDescription(TX_VEN1N020); + showDescription(20, true); } void Room::veng1TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_VEN1_001); + showText(TX_SPEAKER_KIRK, 1, true); } void Room::veng1TalkToSpock() { - showText(TX_SPEAKER_SPOCK, TX_VEN1_013); - showText(TX_SPEAKER_MCCOY, TX_VEN1_005); + showText(TX_SPEAKER_SPOCK, 13, true); + showText(TX_SPEAKER_MCCOY, 5, true); } void Room::veng1TalkToMccoy() { - showText(TX_SPEAKER_MCCOY, TX_VEN1_004); - showText(TX_SPEAKER_KIRK, TX_VEN1_002); + showText(TX_SPEAKER_MCCOY, 4, true); + showText(TX_SPEAKER_KIRK, 2, true); } void Room::veng1TalkToRedshirt() { - showText(TX_SPEAKER_KIJE, TX_VEN1_016); + showText(TX_SPEAKER_KIJE, 16, true); } void Room::veng1UsePhaserOnDoor() { - showText(TX_SPEAKER_KIJE, TX_VEN1_015); + showText(TX_SPEAKER_KIJE, 15, true); } void Room::veng1UsePhaserOnPanel() { - showText(TX_SPEAKER_SPOCK, TX_VEN1_008); + showText(TX_SPEAKER_SPOCK, 8, true); } void Room::veng1UseSTricorderOnSaw() { - spockScan(DIR_W, TX_VEN1_012); + spockScan(DIR_W, 12, false, true); } void Room::veng1UseSTricorderOnDoor() { if (_awayMission->veng.removedPanelDebris) - spockScan(DIR_N, TX_VEN1_009); + spockScan(DIR_N, 9, false, true); else - spockScan(DIR_N, TX_VEN1_007); + spockScan(DIR_N, 7, false, true); } void Room::veng1UseSTricorderOnPanel() { if (!_awayMission->veng.clearedPanelDebris) - spockScan(DIR_E, TX_VEN1_014); + spockScan(DIR_E, 14, false, true); else if (!_awayMission->veng.removedPanelDebris) - spockScan(DIR_E, TX_VEN1_006); + spockScan(DIR_E, 6, false, true); else - spockScan(DIR_E, TX_VEN1_010); + spockScan(DIR_E, 10, false, true); } void Room::veng1GetPanel() { @@ -287,10 +287,10 @@ void Room::veng1KirkAccessedPanel() { _awayMission->disableInput = false; if (!_awayMission->veng.clearedPanelDebris) { - showDescription(TX_VEN1N016); + showDescription(16, true); } else if (!_awayMission->veng.openedPanel) { _awayMission->veng.openedPanel = true; - showDescription(TX_VEN1N017); + showDescription(17, true); loadActorAnim2(OBJECT_DEBRIS, "s7r1p2", 0xd1, 0x6a); loadActorStandAnim(OBJECT_PANEL); } else @@ -300,19 +300,19 @@ void Room::veng1KirkAccessedPanel() { } void Room::veng1UseSawOnPanel() { - showDescription(TX_VEN1N013); + showDescription(13, true); } void Room::veng1UseSawOnDoor() { - showDescription(TX_VEN1N014); + showDescription(14, true); } void Room::veng1UseDrillOnDebris() { - showDescription(TX_VEN1N009); + showDescription(9, true); } void Room::veng1UseSawOnDebris() { - showDescription(TX_VEN1N018); + showDescription(18, true); } void Room::veng1UseDrillOnPanel() { @@ -330,7 +330,7 @@ void Room::veng1KirkDoneDrillingPanel() { _awayMission->disableInput = false; if (!_awayMission->veng.clearedPanelDebris) { _awayMission->veng.clearedPanelDebris = true; - showDescription(TX_VEN1N008); + showDescription(8, true); } } @@ -348,10 +348,10 @@ void Room::veng1KirkUsedHypoOnDebris() { _awayMission->disableInput = false; if (!_awayMission->veng.oilInHypo) - showDescription(TX_VEN1N012); + showDescription(12, true); else { _awayMission->veng.loosenedDebrisWithOil = true; - showDescription(TX_VEN1N015); + showDescription(15, true); } } @@ -366,7 +366,7 @@ void Room::veng1ReachedSaw() { void Room::veng1PickedUpSaw() { loadActorStandAnim(OBJECT_SAW); - showDescription(TX_VEN1N023); + showDescription(23, true); giveItem(OBJECT_ILMD); _awayMission->veng.tookMolecularSaw = true; @@ -387,11 +387,11 @@ void Room::veng1TriedToGetDebris() { _awayMission->disableInput = false; if (!_awayMission->veng.loosenedDebrisWithOil) - showDescription(TX_VEN1N006); + showDescription(6, true); else { loadActorStandAnim(OBJECT_DEBRIS); loadActorAnim2(OBJECT_PANEL, "s7r1p3", 0xd1, 0x6a); - showDescription(TX_VEN1N011); + showDescription(11, true); _awayMission->veng.removedPanelDebris = true; } } diff --git a/engines/startrek/rooms/veng2.cpp b/engines/startrek/rooms/veng2.cpp index 0c0b9ceffc..15b81ab640 100644 --- a/engines/startrek/rooms/veng2.cpp +++ b/engines/startrek/rooms/veng2.cpp @@ -256,12 +256,12 @@ void Room::veng2Timer0Expired() { // Elasi decloak if they haven't already void Room::veng2ElasiShipDecloaked() { _awayMission->disableInput = false; - showText(TX_SPEAKER_KIJE, TX_VEN2_093); - showText(TX_SPEAKER_KIRK, TX_VEN2_019); - showText(TX_SPEAKER_SPOCK, TX_VEN2_076); - showText(TX_SPEAKER_MCCOY, TX_VEN2_042); + showText(TX_SPEAKER_KIJE, 93, true); + showText(TX_SPEAKER_KIRK, 19, true); + showText(TX_SPEAKER_SPOCK, 76, true); + showText(TX_SPEAKER_MCCOY, 42, true); if (_awayMission->veng.poweredSystem != 2) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_032); + showText(TX_SPEAKER_SPOCK, 32, true); _awayMission->veng.counterUntilElasiBoardWithShieldsDown = 1800; } else veng2Timer2Expired(); @@ -272,38 +272,38 @@ void Room::veng2Timer2Expired() { // Elasi hail the Enterprise if they haven't a return; _awayMission->veng.elasiHailedRepublic = true; - showText(TX_SPEAKER_SPOCK, TX_VEN2_073); - showText(TX_SPEAKER_KIRK, TX_VEN2_016); + showText(TX_SPEAKER_SPOCK, 73, true); + showText(TX_SPEAKER_KIRK, 16, true); loadActorAnim2(OBJECT_VIEWSCREEN, "s7r2p1", VIEWSCREEN_X, VIEWSCREEN_Y); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_109); - showText(TX_SPEAKER_KIRK, TX_VEN2_027); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_113); - showText(TX_SPEAKER_KIRK, TX_VEN2_010); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_103); - showText(TX_SPEAKER_KIRK, TX_VEN2_006); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_111); - showText(TX_SPEAKER_KIRK, TX_VEN2_020); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_112); + showText(TX_SPEAKER_ELASI_CAPTAIN, 109, true); + showText(TX_SPEAKER_KIRK, 27, true); + showText(TX_SPEAKER_ELASI_CAPTAIN, 113, true); + showText(TX_SPEAKER_KIRK, 10, true); + showText(TX_SPEAKER_ELASI_CAPTAIN, 103, true); + showText(TX_SPEAKER_KIRK, 06, true); + showText(TX_SPEAKER_ELASI_CAPTAIN, 111, true); + showText(TX_SPEAKER_KIRK, 20, true); + showText(TX_SPEAKER_ELASI_CAPTAIN, 112, true); const TextRef choices[] = { TX_SPEAKER_KIRK, - TX_VEN2_012, TX_VEN2_011, + 12, 11, TX_BLANK }; - int choice = showMultipleTexts(choices); + int choice = showMultipleTexts(choices, true); if (choice == 0) { - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_099); - showText(TX_SPEAKER_KIRK, TX_VEN2_008); + showText(TX_SPEAKER_ELASI_CAPTAIN, 99, true); + showText(TX_SPEAKER_KIRK, 8, true); } - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_105); - showText(TX_SPEAKER_KIRK, TX_VEN2_021); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_102); - showText(TX_SPEAKER_SPOCK, TX_VEN2_072); - showText(TX_SPEAKER_MCCOY, TX_VEN2_044); - showText(TX_SPEAKER_KIRK, TX_VEN2_022); + showText(TX_SPEAKER_ELASI_CAPTAIN, 105, true); + showText(TX_SPEAKER_KIRK, 21, true); + showText(TX_SPEAKER_ELASI_CAPTAIN, 102, true); + showText(TX_SPEAKER_SPOCK, 72, true); + showText(TX_SPEAKER_MCCOY, 44, true); + showText(TX_SPEAKER_KIRK, 22, true); loadActorAnim2(OBJECT_VIEWSCREEN, "s7r2u2", VIEWSCREEN_X, VIEWSCREEN_Y); _awayMission->veng.counterUntilElasiAttack = 27000; @@ -317,147 +317,147 @@ void Room::veng2TouchedDoor() { void Room::veng2LookAtViewscreen() { if (!_awayMission->veng.elasiShipDecloaked) - showDescription(TX_VEN2N022); + showDescription(22, true); else - showDescription(TX_VEN2N002); + showDescription( 2, true); } void Room::veng2LookAtMiddleConsole() { - showDescription(TX_VEN2N030); + showDescription(30, true); } void Room::veng2LookAtDamageDisplay() { if (!_awayMission->veng.impulseEnginesOn) - showDescription(TX_VEN2N035); + showDescription(35, true); else - showDescription(TX_VEN2N032); + showDescription(32, true); // 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() { - showDescription(TX_VEN2N027); + showDescription(27, true); } void Room::veng2LookAtMTricorder() { - showDescription(TX_VEN2N024); + showDescription(24, true); } void Room::veng2LookAtTorpedoButton() { - showDescription(TX_VEN2N033); + showDescription(33, true); } // TODO: Consider merging "veng2LookAtTorpedoButton" with "veng2LookAtTorpedoControl" // (and the same for use actions) void Room::veng2LookAtTorpedoControl() { - showDescription(TX_VEN2N033); + showDescription(33, true); if (!_awayMission->veng.impulseEnginesOn) - showDescription(TX_VEN2N001); // Unused, since it can't be selected when impulse is off? + showDescription(1, true); // Unused, since it can't be selected when impulse is off? else if (!_awayMission->veng.torpedoLoaded) { - showDescription(TX_VEN2N000); + showDescription(0, true); if (!_awayMission->veng.elasiShipDecloaked) - showText(TX_SPEAKER_SPOCK, TX_VEN2_036); + showText(TX_SPEAKER_SPOCK, 36, true); else - showText(TX_SPEAKER_SPOCK, TX_VEN2_037); + showText(TX_SPEAKER_SPOCK, 37, true); _awayMission->veng.examinedTorpedoControl = true; } else if (!_awayMission->veng.firedTorpedo) - showDescription(TX_VEN2N021); + showDescription(21, true); else - showDescription(TX_VEN2N020); // Unused, since after firing the torpedo, the mission ends + showDescription(20, true); // Unused, since after firing the torpedo, the mission ends } void Room::veng2LookAtImpulseConsole() { - showDescription(TX_VEN2N034); + showDescription(34, true); if (!_awayMission->veng.impulseEnginesOn) - showDescription(TX_VEN2N008); + showDescription(8, true); else if (_awayMission->veng.tricordersPluggedIntoComputer != 3) - showDescription(TX_VEN2N009); + showDescription(9, true); else if (_awayMission->veng.poweredSystem == 0) - showDescription(TX_VEN2N009); + showDescription(9, true); else if (_awayMission->veng.poweredSystem == 1) - showDescription(TX_VEN2N007); + showDescription(7, true); else if (_awayMission->veng.poweredSystem == 2) - showDescription(TX_VEN2N005); + showDescription(5, true); else - showDescription(TX_VEN2N006); + showDescription(6, true); } void Room::veng2LookAtMainComputer() { if (_awayMission->veng.tricordersPluggedIntoComputer == 0) - showDescription(TX_VEN2N003); + showDescription( 3, true); else if (_awayMission->veng.tricordersPluggedIntoComputer == 1) // Med tricorder plugged in - showDescription(TX_VEN2N023); + showDescription(23, true); else if (_awayMission->veng.tricordersPluggedIntoComputer == 2) // Sci tricorder plugged in - showDescription(TX_VEN2N027); + showDescription(27, true); else // Both - showDescription(TX_VEN2N025); + showDescription(25, true); } void Room::veng2LookAtRecordDeck() { - showDescription(TX_VEN2N029); + showDescription(29, true); } void Room::veng2LookAtDeckIOConsole() { - showDescription(TX_VEN2N031); + showDescription(31, true); } void Room::veng2LookAtKirk() { - showDescription(TX_VEN2N010); + showDescription(10, true); } void Room::veng2LookAtSpock() { - showDescription(TX_VEN2N019); + showDescription(19, true); } void Room::veng2LookAtMccoy() { - showDescription(TX_VEN2N012); + showDescription(12, true); } void Room::veng2LookAtRedshirt() { - showDescription(TX_VEN2N004); + showDescription( 4, true); } void Room::veng2LookAnywhere() { - showDescription(TX_VEN2N035); + showDescription(35, true); } void Room::veng2TalkToKirk() { if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_KIRK, TX_VEN2_004); + showText(TX_SPEAKER_KIRK, 04, true); else - showText(TX_SPEAKER_KIRK, TX_VEN2_005); + showText(TX_SPEAKER_KIRK, 5, true); } void Room::veng2TalkToSpock() { if (_awayMission->veng.countdownStarted) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_075); - showText(TX_SPEAKER_KIRK, TX_VEN2_009); + showText(TX_SPEAKER_SPOCK, 75, true); + showText(TX_SPEAKER_KIRK, 9, true); } else showText(TX_SPEAKER_SPOCK, TX_VEN4_017); } void Room::veng2TalkToMccoy() { if (_awayMission->veng.countdownStarted) { - showText(TX_SPEAKER_MCCOY, TX_VEN2_041); - showText(TX_SPEAKER_KIRK, TX_VEN2_007); + showText(TX_SPEAKER_MCCOY, 41, true); + showText(TX_SPEAKER_KIRK, 7, true); } else - showText(TX_SPEAKER_MCCOY, TX_VEN2_039); + showText(TX_SPEAKER_MCCOY, 39, true); } void Room::veng2TalkToRedshirt() { if (_awayMission->veng.countdownStarted) { - showText(TX_SPEAKER_KIJE, TX_VEN2_094); - showText(TX_SPEAKER_SPOCK, TX_VEN2_078); + showText(TX_SPEAKER_KIJE, 94, true); + showText(TX_SPEAKER_SPOCK, 78, true); } else - showText(TX_SPEAKER_KIJE, TX_VEN2_086); + showText(TX_SPEAKER_KIJE, 86, true); } void Room::veng2UseTechJournalOnDeckIOConsole() { if (_awayMission->veng.readEngineeringJournal) - showText(TX_SPEAKER_SPOCK, TX_VEN2_046); + showText(TX_SPEAKER_SPOCK, 46, true); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_SPOCK, 0x112, 0x98, &Room::veng2ReachedDeckIOWithTechJournal); @@ -470,10 +470,10 @@ void Room::veng2ReachedDeckIOWithTechJournal() { void Room::veng2DoneReadingTechJournal() { _awayMission->disableInput = false; - showText(TX_SPEAKER_SPOCK, TX_VEN2_070); - showText(TX_SPEAKER_MCCOY, TX_VEN2_043); - showText(TX_SPEAKER_KIRK, TX_VEN2_017); - showText(TX_SPEAKER_SPOCK, TX_VEN2_081); + showText(TX_SPEAKER_SPOCK, 70, true); + showText(TX_SPEAKER_MCCOY, 43, true); + showText(TX_SPEAKER_KIRK, 17, true); + showText(TX_SPEAKER_SPOCK, 81, true); _awayMission->veng.readEngineeringJournal = true; } @@ -492,22 +492,22 @@ void Room::veng2LoadedLog() { _awayMission->veng.captainsLogIndex++; if (_awayMission->veng.captainsLogIndex == 1) - showText(TX_SPEAKER_PATTERSON, TX_VEN2_082); + showText(TX_SPEAKER_PATTERSON, 82, true); else if (_awayMission->veng.captainsLogIndex == 2) - showText(TX_SPEAKER_PATTERSON, TX_VEN2_083); + showText(TX_SPEAKER_PATTERSON, 83, true); else if (_awayMission->veng.captainsLogIndex == 3) - showText(TX_SPEAKER_PATTERSON, TX_VEN2_084); + showText(TX_SPEAKER_PATTERSON, 84, true); else if (_awayMission->veng.captainsLogIndex == 4) { - showText(TX_SPEAKER_ANDRADE, TX_VEN2_097); + showText(TX_SPEAKER_ANDRADE, 97, true); _awayMission->veng.readAllLogs = true; - showText(TX_SPEAKER_SPOCK, TX_VEN2_061); + showText(TX_SPEAKER_SPOCK, 61, true); } else - showText(TX_SPEAKER_SPOCK, TX_VEN2_061); + showText(TX_SPEAKER_SPOCK, 61, true); } void Room::veng2UseCommunicator() { if (_awayMission->veng.toldElasiToBeamOver) - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_098); + showText(TX_SPEAKER_ELASI_CAPTAIN, 98, true); else if (_awayMission->veng.countdownStarted) { const TextRef choices[] = { TX_SPEAKER_KIRK, @@ -518,47 +518,47 @@ void Room::veng2UseCommunicator() { if (choice == 0) { // Hail Elasi if (!_awayMission->veng.torpedoLoaded) - showText(TX_SPEAKER_MCCOY, TX_VEN2_040); + showText(TX_SPEAKER_MCCOY, 40, true); else { loadActorAnim2(OBJECT_VIEWSCREEN, "s7r2p1", VIEWSCREEN_X, VIEWSCREEN_Y); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_108); + showText(TX_SPEAKER_ELASI_CAPTAIN, 108, true); const TextRef choices2[] = { TX_SPEAKER_KIRK, - TX_VEN2_015, TX_VEN2_029, + 15, 29, TX_BLANK }; - choice = showMultipleTexts(choices2); + choice = showMultipleTexts(choices2, true); if (choice == 0) { // "We don't have it yet" - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_100); + showText(TX_SPEAKER_ELASI_CAPTAIN, 100, true); loadActorAnim2(OBJECT_VIEWSCREEN, "s7r2u2", VIEWSCREEN_X, VIEWSCREEN_Y); } else { // "You'll have to beam over" - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_114); - showText(TX_SPEAKER_KIRK, TX_VEN2_025); + showText(TX_SPEAKER_ELASI_CAPTAIN, 114, true); + showText(TX_SPEAKER_KIRK, 25, true); loadActorAnim2(OBJECT_VIEWSCREEN, "s7r2u2", VIEWSCREEN_X, VIEWSCREEN_Y); _awayMission->veng.counterUntilElasiNagToDisableShields = 1800; _awayMission->veng.toldElasiToBeamOver = true; } } } else if (choice == 1) // Hail enterprise - showText(TX_SPEAKER_SPOCK, TX_VEN2_066); + showText(TX_SPEAKER_SPOCK, 66, true); } else if (_awayMission->veng.elasiShipDecloaked) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_066); + showText(TX_SPEAKER_SPOCK, 66, true); } else { showText(TX_SPEAKER_KIRK, TX_MUD4_018); showText(TX_SPEAKER_UHURA, TX_VEN2U093); - showText(TX_SPEAKER_KIRK, TX_VEN2_028); + showText(TX_SPEAKER_KIRK, 28, true); } } void Room::veng2UseKirkOnTorpedoButton() { if (_awayMission->veng.poweredSystem != 1) - showDescription(TX_VEN2N028); + showDescription(28, true); else if (!_awayMission->veng.torpedoLoaded) - showText(TX_SPEAKER_SPOCK, TX_VEN2_058); + showText(TX_SPEAKER_SPOCK, 58, true); else if (!_awayMission->veng.elasiShieldsDown) - showText(TX_SPEAKER_SPOCK, TX_VEN2_054); // Probably unused; weapons can't be powered while elasi shields are up? + showText(TX_SPEAKER_SPOCK, 54, true); // Probably unused; weapons can't be powered while elasi shields are up? else { // Fire on the defenseless Elasi _awayMission->disableInput = true; walkCrewmanC(OBJECT_KIRK, 0x90, 0x95, &Room::veng2UseKirkReachedTorpedoButton); @@ -577,21 +577,21 @@ void Room::veng2KirkFiredTorpedo() { void Room::veng2TorpedoStruckElasiShip() { loadActorAnim2(OBJECT_VIEWSCREEN, "s7r2p1", VIEWSCREEN_X, VIEWSCREEN_Y); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_104); + showText(TX_SPEAKER_ELASI_CAPTAIN, 104, true); showText(TX_SPEAKER_ELASI_WEAPONS_MASTER, TX_VEN2_F29); showText(TX_SPEAKER_ELASI_CREWMAN, TX_VEN2_F28); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_101); - showText(TX_SPEAKER_KIRK, TX_VEN2_014); - showText(TX_SPEAKER_ELASI_CAPTAIN, TX_VEN2_106); + showText(TX_SPEAKER_ELASI_CAPTAIN, 101, true); + showText(TX_SPEAKER_KIRK, 14, true); + showText(TX_SPEAKER_ELASI_CAPTAIN, 106, true); loadActorAnimC(OBJECT_VIEWSCREEN, "s7r2rc", 0, 0, &Room::veng2ElasiRetreated); } void Room::veng2ElasiRetreated() { - showText(TX_SPEAKER_UHURA, TX_VEN2U094); - showText(TX_SPEAKER_KIRK, TX_VEN2_026); - showText(TX_SPEAKER_CHEKOV, TX_VEN2_115); - showText(TX_SPEAKER_KIRK, TX_VEN2_013); - showText(TX_SPEAKER_SCOTT, TX_VEN2_S09); + showText(TX_SPEAKER_UHURA, 94, true); + showText(TX_SPEAKER_KIRK, 26, true); + showText(TX_SPEAKER_CHEKOV, 115, true); + showText(TX_SPEAKER_KIRK, 13, true); + showText(TX_SPEAKER_SCOTT, 9 + SCOTTY_MESSAGE_OFFSET, true); _awayMission->veng.firedTorpedo = true; walkCrewmanC(OBJECT_KIRK, 0xec, 0x9d, &Room::veng2CrewmanInPositionToBeamOut); @@ -624,46 +624,46 @@ void Room::veng2UseSTricorderOnTorpedoButton() { void Room::veng2UseSTricorderOnMiddleConsole() { spockScan(DIR_N, -1); - showDescription(TX_VEN2N030); // This is a narration, not Spock speaking + showDescription(30, true); // This is a narration, not Spock speaking } void Room::veng2UseSTricorderOnTorpedoControl() { - showText(TX_SPEAKER_KIRK, TX_VEN2_001); + showText(TX_SPEAKER_KIRK, 01, true); spockScan(DIR_N, -1); // FIXME: delete this since Spock might not have his tricorder? if (_awayMission->veng.poweredSystem != 1) { // No power to weapons if (!_awayMission->veng.scannedMainComputer) - showText(TX_SPEAKER_SPOCK, TX_VEN2_062); + showText(TX_SPEAKER_SPOCK, 62, true); else - showText(TX_SPEAKER_SPOCK, TX_VEN2_064); + showText(TX_SPEAKER_SPOCK, 64, true); } else if (_awayMission->veng.tricordersPluggedIntoComputer != 3) - showText(TX_SPEAKER_SPOCK, TX_VEN2_055); + showText(TX_SPEAKER_SPOCK, 55, true); #if 0 // FIXME: Unused, since the same condition is above. Fix needed? else if (_awayMission->veng.poweredSystem != 1) - showText(TX_SPEAKER_SPOCK, TX_VEN2_065); + showText(TX_SPEAKER_SPOCK, 65, true); #endif else if (!_awayMission->veng.torpedoLoaded) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_068); + showText(TX_SPEAKER_SPOCK, 68, true); if (!_awayMission->veng.elasiShipDecloaked) - showText(TX_SPEAKER_SPOCK, TX_VEN2_036); + showText(TX_SPEAKER_SPOCK, 36, true); else - showText(TX_SPEAKER_SPOCK, TX_VEN2_037); + showText(TX_SPEAKER_SPOCK, 37, true); _awayMission->veng.examinedTorpedoControl = true; // TODO: consider making it easier to trigger the above flag? (using spock on it // won't work once the elasi are there, since you can't power the system; you need // to look at it instead.) } else - showText(TX_SPEAKER_SPOCK, TX_VEN2_050); + showText(TX_SPEAKER_SPOCK, 50, true); } void Room::veng2UseImpulseConsole() { if (!_awayMission->veng.impulseEnginesOn) { - showText(TX_SPEAKER_KIRK, TX_VEN2_003); - showText(TX_SPEAKER_SPOCK, TX_VEN2_063); + showText(TX_SPEAKER_KIRK, 3, true); + showText(TX_SPEAKER_SPOCK, 63, true); } else if (_awayMission->veng.tricordersPluggedIntoComputer != 3) { - showText(TX_SPEAKER_KIRK, TX_VEN2_003); - showText(TX_SPEAKER_SPOCK, TX_VEN2_057); + showText(TX_SPEAKER_KIRK, 3, true); + showText(TX_SPEAKER_SPOCK, 57, true); } else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_SPOCK, 0x22, 0x9b, &Room::veng2SpockReachedImpulseConsole); @@ -676,7 +676,7 @@ void Room::veng2SpockReachedImpulseConsole() { void Room::veng2SpockUsedImpulseConsole() { _awayMission->disableInput = false; - showText(TX_SPEAKER_SPOCK, TX_VEN2_069); + showText(TX_SPEAKER_SPOCK, 69, true); // Choose where to transfer power const TextRef choices[] = { @@ -694,52 +694,52 @@ powerWeapons: loadActorAnim2(OBJECT_DAMAGE_DISPLAY_1, "s7r2sh3", DAMAGE_DISPLAY_1_X, DAMAGE_DISPLAY_1_Y); } _awayMission->veng.poweredSystem = 1; - showText(TX_SPEAKER_KIJE, TX_VEN2_088); + showText(TX_SPEAKER_KIJE, 88, true); if (_awayMission->veng.toldElasiToBeamOver) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_052); + showText(TX_SPEAKER_SPOCK, 52, true); _awayMission->veng.elasiShieldsDown = true; _awayMission->veng.counterUntilElasiBoardWithInvitation = 900; } if (_awayMission->veng.elasiShipDecloaked && !_awayMission->veng.elasiHailedRepublic) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_033); + showText(TX_SPEAKER_SPOCK, 33, true); _awayMission->veng.counterUntilElasiBoardWithShieldsDown = 1800; } } else if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_SPOCK, TX_VEN2_035); + showText(TX_SPEAKER_SPOCK, 35, true); else if (_awayMission->veng.poweredSystem == 1) // Weapons already powered - showText(TX_SPEAKER_KIJE, TX_VEN2_091); + showText(TX_SPEAKER_KIJE, 91, true); else goto powerWeapons; } else if (choice == 1) { // Shields if (_awayMission->veng.poweredSystem == 2) // Shields already powered - showText(TX_SPEAKER_KIJE, TX_VEN2_089); + showText(TX_SPEAKER_KIJE, 89, true); else if (_awayMission->veng.toldElasiToBeamOver) - showText(TX_SPEAKER_KIJE, TX_VEN2_085); + showText(TX_SPEAKER_KIJE, 85, true); else { loadActorAnim2(OBJECT_DAMAGE_DISPLAY_1, "s7r2sh", DAMAGE_DISPLAY_1_X, DAMAGE_DISPLAY_1_Y); _awayMission->veng.poweredSystem = 2; if (_awayMission->veng.elasiShipDecloaked) _awayMission->timers[2] = 45; // Timer until the elasi hail the ship - showText(TX_SPEAKER_KIJE, TX_VEN2_092); + showText(TX_SPEAKER_KIJE, 92, true); } } else if (choice == 2) { // Transporter if (_awayMission->veng.countdownStarted) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_034); + showText(TX_SPEAKER_SPOCK, 34, true); if (_awayMission->veng.havePowerPack) { - showText(TX_SPEAKER_KIRK, TX_VEN2_018); - showText(TX_SPEAKER_SPOCK, TX_VEN2_077); + showText(TX_SPEAKER_KIRK, 18, true); + showText(TX_SPEAKER_SPOCK, 77, true); } } else if (_awayMission->veng.poweredSystem == 3) // Transporter already powered - showText(TX_SPEAKER_KIJE, TX_VEN2_090); // BUGFIX: audio didn't play properly + showText(TX_SPEAKER_KIJE, 90, true); // BUGFIX: audio didn't play properly else { if (_awayMission->veng.poweredSystem == 2) { playVoc("LD6BMOFF"); // ENHANCEMENT: make this consistent with the weapons code loadActorAnim2(OBJECT_DAMAGE_DISPLAY_1, "s7r2sh3", DAMAGE_DISPLAY_1_X, DAMAGE_DISPLAY_1_Y); } _awayMission->veng.poweredSystem = 3; - showText(TX_SPEAKER_KIJE, TX_VEN2_087); + showText(TX_SPEAKER_KIJE, 87, true); if (_awayMission->veng.elasiShipDecloaked && !_awayMission->veng.elasiHailedRepublic) { - showText(TX_SPEAKER_SPOCK, TX_VEN2_071); + showText(TX_SPEAKER_SPOCK, 71, true); _awayMission->veng.counterUntilElasiBoardWithShieldsDown = 1800; } } @@ -748,24 +748,24 @@ powerWeapons: } void Room::veng2UseMainComputer() { - showText(TX_SPEAKER_KIRK, TX_VEN2_002); + showText(TX_SPEAKER_KIRK, 02, true); if (_awayMission->veng.tricordersPluggedIntoComputer != 3) { - spockScan(DIR_W, TX_VEN2_079); - showText(TX_SPEAKER_KIRK, TX_VEN2_024); - showText(TX_SPEAKER_SPOCK, TX_VEN2_080); - showText(TX_SPEAKER_MCCOY, TX_VEN2_045); - showText(TX_SPEAKER_SPOCK, TX_VEN2_074); - showText(TX_SPEAKER_KIJE, TX_VEN2_096); + spockScan(DIR_W, 79, true); + showText(TX_SPEAKER_KIRK, 24, true); + showText(TX_SPEAKER_SPOCK, 80, true); + showText(TX_SPEAKER_MCCOY, 45, true); + showText(TX_SPEAKER_SPOCK, 74, true); + showText(TX_SPEAKER_KIJE, 96, true); _awayMission->veng.scannedMainComputer = true; } else - showText(TX_SPEAKER_SPOCK, TX_VEN2_059); + showText(TX_SPEAKER_SPOCK, 59, true); } void Room::veng2UseSTricorderOnMainComputer() { if (!_awayMission->veng.scannedMainComputer) veng2UseMainComputer(); else if (!_awayMission->veng.impulseEnginesOn) - showText(TX_SPEAKER_SPOCK, TX_VEN2_031); + showText(TX_SPEAKER_SPOCK, 31, true); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_SPOCK, 0x52, 0x84, &Room::veng2SpockReachedMainComputerToPutTricorder); @@ -789,7 +789,7 @@ void Room::veng2AttachedSTricorderToComputer() { loseItem(OBJECT_ISTRICOR); loadActorAnim2(OBJECT_STRICORDER, "s7r2t1", STRICORDER_POS_X, STRICORDER_POS_Y); - showDescription(TX_VEN2N017); + showDescription(17, true); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); if (_awayMission->veng.tricordersPluggedIntoComputer == 3) // Both tricorders plugged in @@ -798,7 +798,7 @@ void Room::veng2AttachedSTricorderToComputer() { void Room::veng2UseMTricorderOnMainComputer() { if (!_awayMission->veng.impulseEnginesOn) - showText(TX_SPEAKER_MCCOY, TX_VEN2_038); + showText(TX_SPEAKER_MCCOY, 38, true); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_SPOCK, 0x52, 0x84, &Room::veng2MccoyReachedMainComputerToPutTricorder); @@ -822,7 +822,7 @@ void Room::veng2AttachedMTricorderToComputer() { loseItem(OBJECT_IMTRICOR); loadActorAnim2(OBJECT_MTRICORDER, "s7r2t2", MTRICORDER_POS_X, MTRICORDER_POS_Y); - showDescription(TX_VEN2N016); + showDescription(16, true); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); if (_awayMission->veng.tricordersPluggedIntoComputer == 3) // Both tricorders plugged in @@ -831,22 +831,22 @@ void Room::veng2AttachedMTricorderToComputer() { void Room::veng2BothTricordersPluggedIn() { loadActorAnim2(OBJECT_MAIN_COMPUTER, "s7r2t3", MAIN_COMPUTER_X, MAIN_COMPUTER_Y); - showText(TX_SPEAKER_SPOCK, TX_VEN2_030); + showText(TX_SPEAKER_SPOCK, 30, true); } void Room::veng2UseSTricorderOnDeckIOConsole() { - spockScan(DIR_E, TX_VEN2_067); + spockScan(DIR_E, 67, true); } void Room::veng2UseSTricorderOnImpulseConsole() { if (!_awayMission->veng.impulseEnginesOn) - spockScan(DIR_W, TX_VEN2_056); + spockScan(DIR_W, 56, true); else - spockScan(DIR_W, TX_VEN2_051); + spockScan(DIR_W, 51, true); } void Room::veng2UseFusionPackOnMainComputer() { - showText(TX_SPEAKER_SPOCK, TX_VEN2_060); + showText(TX_SPEAKER_SPOCK, 60, true); } void Room::veng2GetLogDeck() { @@ -862,13 +862,13 @@ void Room::veng2PickedUpLogDeck() { loadActorStandAnim(OBJECT_DECK); _awayMission->disableInput = false; _awayMission->veng.tookRecordDeckFromAuxilaryControl = true; - showDescription(TX_VEN2N039); + showDescription(39, true); giveItem(OBJECT_IDECK); } void Room::veng2GetSTricorder() { if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_SPOCK, TX_VEN2_047); + showText(TX_SPEAKER_SPOCK, 47, true); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_SPOCK, 0x52, 0x84, &Room::veng2ReachedSTricorderToGet); @@ -886,12 +886,12 @@ void Room::veng2PickedUpSTricorder() { loadActorStandAnim(OBJECT_STRICORDER); loadActorStandAnim(OBJECT_MAIN_COMPUTER); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); - showDescription(TX_VEN2N015); + showDescription(15, true); } void Room::veng2GetMTricorder() { if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_SPOCK, TX_VEN2_047); + showText(TX_SPEAKER_SPOCK, 47, true); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_SPOCK, 0x52, 0x84, &Room::veng2ReachedMTricorderToGet); @@ -909,7 +909,7 @@ void Room::veng2PickedUpMTricorder() { loadActorStandAnim(OBJECT_MTRICORDER); loadActorStandAnim(OBJECT_MAIN_COMPUTER); walkCrewman(OBJECT_SPOCK, 0x5f, 0xaa); - showDescription(TX_VEN2N013); + showDescription(13, true); } } diff --git a/engines/startrek/rooms/veng3.cpp b/engines/startrek/rooms/veng3.cpp index 12c044b83d..046de3e327 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 - showDescription(TX_VEN3N006); + showDescription(6, true); } void Room::veng3ReachedTurbolift2() { @@ -175,62 +175,62 @@ void Room::veng3SickbayDoorOpened() { } void Room::veng3LookAtSupportBeam() { - showDescription(TX_VEN3N007); + showDescription(7, true); } void Room::veng3LookAtDebris() { if (!_awayMission->veng.clearedDebris) - showDescription(TX_VEN3N009); + showDescription(9, true); else - showDescription(TX_VEN3N007); // UNUSED (debris is gone) + showDescription(7, true); // UNUSED (debris is gone) } void Room::veng3LookAtTurbolift2Door() { - showDescription(TX_VEN3N012); + showDescription(12, true); if (!_awayMission->veng.lookedAtTurbolift2Door) { _awayMission->veng.lookedAtTurbolift2Door = true; if (!_awayMission->veng.clearedDebris) { - showText(TX_SPEAKER_SPOCK, TX_VEN3_013); - showText(TX_SPEAKER_MCCOY, TX_VEN3_006); + showText(TX_SPEAKER_SPOCK, 13, true); + showText(TX_SPEAKER_MCCOY, 6, true); } } } void Room::veng3LookAtSickbayDoor() { - showDescription(TX_VEN3N011); + showDescription(11, true); } void Room::veng3LookAtCable() { - showDescription(TX_VEN3N013); + showDescription(13, true); } void Room::veng3LookAtDeadGuy() { - showDescription(TX_VEN3N005); + showDescription(5, true); } void Room::veng3LookAtKirk() { - showDescription(TX_VEN3N001); + showDescription(1, true); } void Room::veng3LookAtMccoy() { - showDescription(TX_VEN3N002); + showDescription(2, true); } void Room::veng3LookAtSpock() { - showDescription(TX_VEN3N004); + showDescription(4, true); } void Room::veng3LookAtRedshirt() { - showDescription(TX_VEN3N000); + showDescription(0, true); } void Room::veng3LookAnywhere() { - showDescription(TX_VEN3N003); + showDescription(3, true); } void Room::veng3UseStunPhaserOnDebris() { - showText(TX_SPEAKER_SPOCK, TX_VEN3_002); + showText(TX_SPEAKER_SPOCK, 2, true); } void Room::veng3UseKillPhaserOnDebris() { @@ -258,7 +258,7 @@ void Room::veng3DebrisVaporized() { } else { _awayMission->disableInput = false; loadMapFile("veng3"); - showText(TX_SPEAKER_SPOCK, TX_VEN3_015); + showText(TX_SPEAKER_SPOCK, 15, true); _awayMission->veng.clearedDebris = true; } } @@ -266,30 +266,30 @@ void Room::veng3DebrisVaporized() { void Room::veng3DebrisFellAgain() { loadActorAnim2(OBJECT_DEBRIS, "s7r3d2", 0xa5, 0x68); _awayMission->disableInput = false; - showText(TX_SPEAKER_SPOCK, TX_VEN3_014); + showText(TX_SPEAKER_SPOCK, 14, true); } void Room::veng3UseSpockOnDebris() { if (!_awayMission->veng.putSupportBeamInSickbayHallway) - showText(TX_SPEAKER_SPOCK, TX_VEN3_008); + showText(TX_SPEAKER_SPOCK, 8, true); else { - showText(TX_SPEAKER_SPOCK, TX_VEN3_011); + showText(TX_SPEAKER_SPOCK, 11, true); // BUGFIX: Game would crash here due to jumping to non-code. } } void Room::veng3UseRedshirtOnDebris() { if (!_awayMission->veng.putSupportBeamInSickbayHallway) - showText(TX_SPEAKER_KIJE, TX_VEN3_017); + showText(TX_SPEAKER_KIJE, 17, true); else { // BUGFIX: Original had a "jne" opcode with no comparison beforehand, causing it - // to jump to some of Spock's code (TX_VEN3_007)? In any case, this makes more sense. - showText(TX_SPEAKER_KIJE, TX_VEN3_016); + // to jump to some of Spock's code (07, true)? In any case, this makes more sense. + showText(TX_SPEAKER_KIJE, 16, true); } } void Room::veng3UseMccoyOnDebris() { - showText(TX_SPEAKER_MCCOY, TX_VEN3_004); + showText(TX_SPEAKER_MCCOY, 04, true); } void Room::veng3UseBeamOnDebris() { @@ -311,34 +311,34 @@ void Room::veng3PlacedBeam() { void Room::veng3UseSTricorderOnDebris() { if (!_awayMission->veng.putSupportBeamInSickbayHallway) - spockScan(DIR_N, TX_VEN3_009); + spockScan(DIR_N, 9, true); else - spockScan(DIR_N, TX_VEN3_007); + spockScan(DIR_N, 7, true); } void Room::veng3UseMolecularSawOnDebris() { - showText(TX_SPEAKER_SPOCK, TX_VEN3_010); + showText(TX_SPEAKER_SPOCK, 10, true); } void Room::veng3TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_VEN3_001); + showText(TX_SPEAKER_KIRK, 01, true); } void Room::veng3TalkToSpock() { - showText(TX_SPEAKER_SPOCK, TX_VEN3_012); + showText(TX_SPEAKER_SPOCK, 12, true); } void Room::veng3TalkToMccoy() { - showText(TX_SPEAKER_MCCOY, TX_VEN3_003); + showText(TX_SPEAKER_MCCOY, 03, true); } void Room::veng3TalkToRedshirt() { - showText(TX_SPEAKER_KIJE, TX_VEN3_018); - showText(TX_SPEAKER_MCCOY, TX_VEN3_005); + showText(TX_SPEAKER_KIJE, 18, true); + showText(TX_SPEAKER_MCCOY, 05, true); } void Room::veng3GetDebris() { - showDescription(TX_VEN3N010); + showDescription(10, true); } void Room::veng3GetCable() { @@ -354,7 +354,7 @@ void Room::veng3ReachedCable() { void Room::veng3PickedUpCable() { _awayMission->disableInput = false; loadActorStandAnim(OBJECT_CABLE); - showDescription(TX_VEN3N014); + showDescription(14, true); giveItem(OBJECT_ICABLE2); _awayMission->veng.tookCableFromSickbayHallway = true; } diff --git a/engines/startrek/rooms/veng4.cpp b/engines/startrek/rooms/veng4.cpp index 9911ecc8e6..37729dabd5 100644 --- a/engines/startrek/rooms/veng4.cpp +++ b/engines/startrek/rooms/veng4.cpp @@ -136,27 +136,27 @@ void Room::veng4Tick1() { } void Room::veng4TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_VEN4_002); + showText(TX_SPEAKER_KIRK, 2, true); } void Room::veng4TalkToMccoy() { - showText(TX_SPEAKER_MCCOY, TX_VEN4_015); + showText(TX_SPEAKER_MCCOY, 15, true); } void Room::veng4TalkToSpock() { - showText(TX_SPEAKER_SPOCK, TX_VEN4_017); + showText(TX_SPEAKER_SPOCK, 17, true); } void Room::veng4TalkToRedshirt() { - showText(TX_SPEAKER_KIJE, TX_VEN4_022); + showText(TX_SPEAKER_KIJE, 22, true); } void Room::veng4UseMccoyOnDeadGuy() { - showText(TX_SPEAKER_MCCOY, TX_VEN4_007); + showText(TX_SPEAKER_MCCOY, 7, true); } void Room::veng4UseHypoOnBrittany() { - showText(TX_SPEAKER_MCCOY, TX_VEN4_008); + showText(TX_SPEAKER_MCCOY, 8, true); } void Room::veng4UseMedkitOnBrittany() { @@ -171,13 +171,13 @@ void Room::veng4UseMTricorderOnBrittany() { void Room::veng4UseMccoyOnBrittany() { if (_awayMission->veng.brittanyDead) - showText(TX_SPEAKER_MCCOY, TX_VEN4_013); + showText(TX_SPEAKER_MCCOY, 13, true); else if (_awayMission->veng.usedMedkitOnBrittany) - showText(TX_SPEAKER_MCCOY, TX_VEN4_009); + showText(TX_SPEAKER_MCCOY, 9, true); else { if (!_awayMission->veng.lookedAtBrittany) { _awayMission->veng.lookedAtBrittany = true; - showText(TX_SPEAKER_KIRK, TX_VEN4_005); + showText(TX_SPEAKER_KIRK, 5, true); } _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_E; walkCrewmanC(OBJECT_MCCOY, 0x3c, 0xa0, &Room::veng4MccoyReachedBrittany); @@ -198,12 +198,12 @@ void Room::veng4UsedMedkitOnBrittany() { _awayMission->veng.getPointsForHealingBrittany = true; _awayMission->veng.usedMedkitOnBrittany = true; _awayMission->veng.kirkShouldSuggestReestablishingPower = true; - showText(TX_SPEAKER_MCCOY, TX_VEN4_009); + showText(TX_SPEAKER_MCCOY, 9, true); } void Room::veng4MccoyScannedBrittany() { - showText(TX_SPEAKER_MCCOY, TX_VEN4_011); - showText(TX_SPEAKER_KIRK, TX_VEN4_001); + showText(TX_SPEAKER_MCCOY, 11, true); + showText(TX_SPEAKER_KIRK, 1, true); _roomVar.veng.usingMedkitOnBrittany = true; veng4UseMccoyOnBrittany(); @@ -211,20 +211,20 @@ void Room::veng4MccoyScannedBrittany() { void Room::veng4TalkToBrittany() { if (_awayMission->veng.talkedToBrittany) - showText(TX_SPEAKER_MCCOY, TX_VEN4_012); + showText(TX_SPEAKER_MCCOY, 12, true); else if (!_awayMission->veng.usedMedkitOnBrittany) - showText(TX_SPEAKER_MCCOY, TX_VEN4_010); + showText(TX_SPEAKER_MCCOY, 10, true); else { _awayMission->veng.talkedToBrittany = true; - showText(TX_SPEAKER_BRITTANY_MARATA, TX_VEN4_019); - showText(TX_SPEAKER_KIRK, TX_VEN4_004); - showText(TX_SPEAKER_BRITTANY_MARATA, TX_VEN4_020); - showText(TX_SPEAKER_KIRK, TX_VEN4_006); - showText(TX_SPEAKER_BRITTANY_MARATA, TX_VEN4_021); - showText(TX_SPEAKER_KIRK, TX_VEN4_003); + showText(TX_SPEAKER_BRITTANY_MARATA, 19, true); + showText(TX_SPEAKER_KIRK, 4, true); + showText(TX_SPEAKER_BRITTANY_MARATA, 20, true); + showText(TX_SPEAKER_KIRK, 6, true); + showText(TX_SPEAKER_BRITTANY_MARATA, 21, true); + showText(TX_SPEAKER_KIRK, 3, true); loadActorAnim2(OBJECT_BRITTANY, "s9r1bm", BRITTANY_X, BRITTANY_Y); - showText(TX_SPEAKER_MCCOY, TX_VEN4_016); + showText(TX_SPEAKER_MCCOY, 16, true); loadActorAnim2(OBJECT_LEFT_READINGS, "s7r4m1", LEFT_READINGS_X, LEFT_READINGS_Y); loadActorAnim2(OBJECT_BRITTANY, "s7r4bd", BRITTANY_X, BRITTANY_Y); _awayMission->veng.brittanyDead = true; @@ -234,31 +234,31 @@ void Room::veng4TalkToBrittany() { } void Room::veng4LookAtDeadGuy() { - showDescription(TX_VEN4N014); + showDescription(14, true); } void Room::veng4LookAtRightBedReadings() { - showDescription(TX_VEN4N013); + showDescription(13, true); } void Room::veng4LookAtDoorHotspot() { - showDescription(TX_VEN4N008); + showDescription(8, true); } void Room::veng4LookAtKirk() { - showDescription(TX_VEN4N002); + showDescription(2, true); } void Room::veng4LookAtSpock() { - showText(TX_SPEAKER_SPOCK, TX_VEN4N003); + showText(TX_SPEAKER_SPOCK, 3, true); } void Room::veng4LookAtMccoy() { - showText(TX_SPEAKER_MCCOY, TX_VEN4N000); + showText(TX_SPEAKER_MCCOY, 0, true); } void Room::veng4LookAtRedshirt() { - showText(TX_SPEAKER_KIJE, TX_VEN4N001); + showText(TX_SPEAKER_KIJE, 1, true); } void Room::veng4LookAtLeftBed() { @@ -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. - showDescription(TX_VEN4N017); + showDescription(17, true); } else - showDescription(TX_VEN4N007); + showDescription( 7, true); } void Room::veng4LookAtLeftBedReadings() { if (!_awayMission->veng.brittanyDead) - showDescription(TX_VEN4N006); + showDescription( 6, true); else - showDescription(TX_VEN4N005); + showDescription( 5, true); } void Room::veng4LookAtBrittany() { if (_awayMission->veng.brittanyDead) - showDescription(TX_VEN4N017); + showDescription(17, true); else if (!_awayMission->veng.lookedAtBrittany) { _awayMission->veng.lookedAtBrittany = true; - showText(TX_SPEAKER_KIRK, TX_VEN4_005); - showText(TX_SPEAKER_MCCOY, TX_VEN4_014); + showText(TX_SPEAKER_KIRK, 5, true); + showText(TX_SPEAKER_MCCOY, 14, true); } else if (_awayMission->veng.talkedToBrittany) - showDescription(TX_VEN4N017); + showDescription(17, true); else - showDescription(TX_VEN4N004); + showDescription( 4, true); } void Room::veng4LookAtDrill() { - showDescription(TX_VEN4N012); + showDescription(12, true); } void Room::veng4LookAtHypoOnTable() { - showDescription(TX_VEN4N010); + showDescription(10, true); } void Room::veng4LookAtDoorObject() { - showDescription(TX_VEN4N009); + showDescription( 9, true); } void Room::veng4LookAnywhere() { - showDescription(TX_VEN4N011); + showDescription(11, true); } void Room::veng4GetHypo() { @@ -320,7 +320,7 @@ void Room::veng4PickedUpHypo() { giveItem(OBJECT_IHYPO); _awayMission->veng.tookHypoFromSickbay = true; loadActorStandAnim(OBJECT_HYPO); - showDescription(TX_VEN4N015); + showDescription(15, true); 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); - showDescription(TX_VEN4N016); + showDescription(16, true); walkCrewman(OBJECT_KIRK, 0xcd, 0xc2); _awayMission->disableInput = false; } diff --git a/engines/startrek/rooms/veng5.cpp b/engines/startrek/rooms/veng5.cpp index 0ea475be35..d8461f3151 100644 --- a/engines/startrek/rooms/veng5.cpp +++ b/engines/startrek/rooms/veng5.cpp @@ -105,7 +105,7 @@ void Room::veng5Tick1() { void Room::veng5Tick45() { if (!_awayMission->veng.enteredRoom5FirstTime) { _awayMission->veng.enteredRoom5FirstTime = true; - showText(TX_SPEAKER_SPOCK, TX_VEN5_005); // "I'm picking up on a nearby power source" + showText(TX_SPEAKER_SPOCK, 5, true); // "I'm picking up on a nearby power source" } } @@ -130,51 +130,51 @@ void Room::veng5TouchedTurboliftDoor() { } void Room::veng5LookAtDoor() { - showDescription(TX_VEN5N007); + showDescription(7, true); } void Room::veng5LookAtLadder() { - showDescription(TX_VEN5N008); + showDescription(8, true); } void Room::veng5LookAtDeadGuy() { - showDescription(TX_VEN5N000); + showDescription(0, true); } void Room::veng5LookAtPowerPack() { - showDescription(TX_VEN5N009); + showDescription(9, true); } void Room::veng5LookAtDebris() { - showDescription(TX_VEN5N001); + showDescription(1, true); } void Room::veng5LookAtKirk() { - showDescription(TX_VEN5N003); + showDescription(3, true); } void Room::veng5LookAtSpock() { - showDescription(TX_VEN5N002); + showDescription(2, true); } void Room::veng5LookAtMccoy() { - showDescription(TX_VEN5N004); + showDescription(4, true); } void Room::veng5LookAtRedshirt() { - showDescription(TX_VEN5N005); + showDescription(5, true); } void Room::veng5LookAnywhere() { - showDescription(TX_VEN5N006); + showDescription(6, true); } void Room::veng5UsePhaserOnPowerPack() { - showText(TX_SPEAKER_MCCOY, TX_VEN5_007); + showText(TX_SPEAKER_MCCOY, 7, true); } void Room::veng5UseStunPhaserOnDebris() { - showText(TX_SPEAKER_SPOCK, TX_VEN5_013); + showText(TX_SPEAKER_SPOCK, 13, true); } void Room::veng5UseKillPhaserOnDebris() { @@ -195,42 +195,42 @@ void Room::veng5DrewPhaser() { void Room::veng5VaporizedDebris() { loadActorStandAnim(OBJECT_KIRK); - showText(TX_SPEAKER_MCCOY, TX_VEN5_011); - showText(TX_SPEAKER_SPOCK, TX_VEN5_018); - showText(TX_SPEAKER_MCCOY, TX_VEN5_010); - showText(TX_SPEAKER_SPOCK, TX_VEN5_019); - showText(TX_SPEAKER_KIRK, TX_VEN5_003); + showText(TX_SPEAKER_MCCOY, 11, true); + showText(TX_SPEAKER_SPOCK, 18, true); + showText(TX_SPEAKER_MCCOY, 10, true); + showText(TX_SPEAKER_SPOCK, 19, true); + showText(TX_SPEAKER_KIRK, 03, true); _awayMission->veng.clearedDebrisInRoom5 = true; _awayMission->disableInput = false; } void Room::veng5UseMTricorderOnDebris() { - mccoyScan(DIR_W, TX_VEN5_008); + mccoyScan(DIR_W, 8, false, true); } void Room::veng5UseSTricorderOnDebris() { - spockScan(DIR_N, TX_VEN5_012); + spockScan(DIR_N, 12, false, true); } void Room::veng5UseMTricorderOnPowerPack() { - mccoyScan(DIR_W, TX_VEN5_009); // ENHANCEMENT: Use mccoyScan, not showText + mccoyScan(DIR_W, 9, false, true); // ENHANCEMENT: Use mccoyScan, not showText } void Room::veng5UseSTricorderOnPowerPack() { - spockScan(DIR_N, TX_VEN5_004); + spockScan(DIR_N, 4, false, true); } void Room::veng5TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_VEN5_001); + showText(TX_SPEAKER_KIRK, 1, true); } void Room::veng5TalkToMccoy() { - showText(TX_SPEAKER_MCCOY, TX_VEN5_006); + showText(TX_SPEAKER_MCCOY, 6, true); } void Room::veng5TalkToSpock() { - showText(TX_SPEAKER_SPOCK, TX_VEN5_017); + showText(TX_SPEAKER_SPOCK, 17, true); showText(TX_SPEAKER_KIJE, TX_VEN5_R20); } @@ -239,12 +239,12 @@ void Room::veng5TalkToRedshirt() { } void Room::veng5TouchedHotspot0() { // Approached too close to fire - showText(TX_SPEAKER_SPOCK, TX_VEN5_015); + showText(TX_SPEAKER_SPOCK, 15, true); if (!_awayMission->veng.askedSpockAboutFire) { _awayMission->veng.askedSpockAboutFire = true; - showText(TX_SPEAKER_KIRK, TX_VEN5_002); - showText(TX_SPEAKER_SPOCK, TX_VEN5_016); + showText(TX_SPEAKER_KIRK, 2, true); + showText(TX_SPEAKER_SPOCK, 16, true); } } @@ -259,7 +259,7 @@ void Room::veng5ReachedPowerPack() { void Room::veng5PickedUpPowerPack() { if (!_awayMission->veng.havePowerPack) { loadActorStandAnim(OBJECT_POWER_PACK); - showDescription(TX_VEN5N010); + showDescription(10, true); _awayMission->veng.havePowerPack = true; giveItem(OBJECT_IFUSION); } diff --git a/engines/startrek/rooms/veng6.cpp b/engines/startrek/rooms/veng6.cpp index a5129420df..c67098efa5 100644 --- a/engines/startrek/rooms/veng6.cpp +++ b/engines/startrek/rooms/veng6.cpp @@ -189,11 +189,11 @@ void Room::veng6DoorOpened() { } void Room::veng6LookAtLeftPort() { - showDescription(TX_VEN6N018); + showDescription(18, true); } void Room::veng6LookAtRightPort() { - showDescription(TX_VEN6N016); + showDescription(16, true); } void Room::veng6LookAtDoor() { @@ -201,52 +201,52 @@ void Room::veng6LookAtDoor() { } void Room::veng6LookAtOilCanister() { - showDescription(TX_VEN6N011); + showDescription(11, true); } void Room::veng6LookAtCabinet() { - showDescription(TX_VEN6N015); + showDescription(15, true); } void Room::veng6LookAtCable() { - showDescription(TX_VEN6N013); + showDescription(13, true); } void Room::veng6LookAtRightConsole() { - showDescription(TX_VEN6N017); + showDescription(17, true); } void Room::veng6LookAtImpulseEngines() { - showDescription(TX_VEN6N010); + showDescription(10, true); } void Room::veng6LookAtLeftConsole() { - showDescription(TX_VEN6N009); + showDescription(9, true); } void Room::veng6LookAtJunctionBox() { - showDescription(TX_VEN6N012); + showDescription(12, true); } void Room::veng6LookAtJournal() { - showDescription(TX_VEN6N025); - showText(TX_SPEAKER_SPOCK, TX_VEN6_021); + showDescription(25, true); + showText(TX_SPEAKER_SPOCK, 21, true); } void Room::veng6LookAtKirk() { - showDescription(TX_VEN6N001); + showDescription(1, true); } void Room::veng6LookAtSpock() { - showDescription(TX_VEN6N003); + showDescription(3, true); } void Room::veng6LookAtMccoy() { - showDescription(TX_VEN6N002); + showDescription(2, true); } void Room::veng6LookAtRedshirt() { - showDescription(TX_VEN6N000); + showDescription(0, true); } void Room::veng6LookAtDeadGuy() { @@ -254,25 +254,25 @@ void Room::veng6LookAtDeadGuy() { } void Room::veng6LookAnywhere() { - showDescription(TX_VEN6N019); + showDescription(19, true); } void Room::veng6TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_VEN6_005); - showText(TX_SPEAKER_MCCOY, TX_VEN6_009); + showText(TX_SPEAKER_KIRK, 5, true); + showText(TX_SPEAKER_MCCOY, 9, true); } void Room::veng6TalkToSpock() { - showText(TX_SPEAKER_SPOCK, TX_VEN6_014); + showText(TX_SPEAKER_SPOCK, 14, true); } void Room::veng6TalkToMccoy() { - showText(TX_SPEAKER_MCCOY, TX_VEN6_008); - showText(TX_SPEAKER_SPOCK, TX_VEN6_018); + showText(TX_SPEAKER_MCCOY, 8, true); + showText(TX_SPEAKER_SPOCK, 18, true); } void Room::veng6TalkToRedshirt() { - showText(TX_SPEAKER_KIJE, TX_VEN6_023); + showText(TX_SPEAKER_KIJE, 23, true); } void Room::veng6UseCable1OnLeftPort() { @@ -303,7 +303,7 @@ void Room::veng6KirkOrSpockReachedLeftPort() { void Room::veng6AttachedLeftCable() { loadActorAnim(OBJECT_CABLE_1, "s7r6cl", CABLE_1_X, CABLE_1_Y); - showDescription(TX_VEN6N020); + showDescription(20, true); _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); - showDescription(TX_VEN6N022); + showDescription(22, true); _awayMission->veng.junctionCablesConnected |= 2; loseItem(_roomVar.veng.cableInUse); _awayMission->disableInput = false; @@ -345,19 +345,19 @@ void Room::veng6AttachedRightCable() { void Room::veng6UseCrewmanOnJunctionBox() { if (_awayMission->veng.impulseEnginesOn) - showText(TX_SPEAKER_SPOCK, TX_VEN6_012); + showText(TX_SPEAKER_SPOCK, 12, true); else if ((_awayMission->veng.junctionCablesConnected & 3) == 3) { showText(TX_SPEAKER_COMPUTER, TX_COMPA185); - showText(TX_SPEAKER_KIRK, TX_VEN6_003); + showText(TX_SPEAKER_KIRK, 3, true); if (!_awayMission->veng.readEngineeringJournal) - showText(TX_SPEAKER_SPOCK, TX_VEN6_017); + showText(TX_SPEAKER_SPOCK, 17, true); else { - showText(TX_SPEAKER_SPOCK, TX_VEN6_016); - showText(TX_SPEAKER_KIRK, TX_VEN6_002); + showText(TX_SPEAKER_SPOCK, 16, true); + showText(TX_SPEAKER_KIRK, 2, true); walkCrewmanC(OBJECT_SPOCK, 0x99, 0xb4, &Room::veng6SpockReachedJunctionBox); } } else - showText(TX_SPEAKER_SPOCK, TX_VEN6_011); + showText(TX_SPEAKER_SPOCK, 11, true); } void Room::veng6SpockReachedJunctionBox() { @@ -365,7 +365,7 @@ void Room::veng6SpockReachedJunctionBox() { } void Room::veng6SpockAdjustedJunctionBox() { - showText(TX_SPEAKER_SPOCK, TX_VEN6_019); + showText(TX_SPEAKER_SPOCK, 19, true); loadActorAnim(OBJECT_IMPULSE_ENGINES, "s7r6i1", IMPULSE_ENGINE_X, IMPULSE_ENGINE_Y); _awayMission->veng.impulseEnginesOn = true; stopAllVocSounds(); @@ -374,7 +374,7 @@ void Room::veng6SpockAdjustedJunctionBox() { void Room::veng6UseHypoOnOilCanister() { if (_awayMission->veng.oilInHypo) - showDescription(TX_VEN6N006); + showDescription(6, true); else { _awayMission->disableInput = true; walkCrewmanC(OBJECT_KIRK, 0x3c, 0x9e, &Room::veng6ReachedOilCanister); @@ -387,7 +387,7 @@ void Room::veng6ReachedOilCanister() { void Room::veng6FilledHypoWithOil() { _awayMission->disableInput = false; - showDescription(TX_VEN6N007); + showDescription(7, true); _awayMission->veng.oilInHypo = true; } @@ -412,33 +412,33 @@ void Room::veng6OpenedOrClosedCabinet() { playSoundEffectIndex(SND_DOOR1); _awayMission->veng.engineeringCabinetOpen = true; if (!_awayMission->veng.tookEngineeringJournal) - showDescription(TX_VEN6N005); + showDescription(5, true); } } void Room::veng6UseSTricorderOnImpulseEngines() { if (_awayMission->veng.impulseEnginesOn) - spockScan(DIR_S, TX_VEN6_010); + spockScan(DIR_S, 10, false, true); else { - spockScan(DIR_S, TX_VEN6_020); - showText(TX_SPEAKER_KIRK, TX_VEN6_001); - showText(TX_SPEAKER_SPOCK, TX_VEN6_022); + spockScan(DIR_S, 20, false, true); + showText(TX_SPEAKER_KIRK, 1, true); + showText(TX_SPEAKER_SPOCK, 22, true); } } void Room::veng6UseSTricorderOnRightConsole() { if (_awayMission->veng.impulseEnginesOn) - spockScan(DIR_S, TX_VEN6_013); + spockScan(DIR_S, 13, false, true); else - spockScan(DIR_S, TX_VEN6_007); + spockScan(DIR_S, 7, false, true); } void Room::veng6UseSTricorderOnJunctionBox() { - spockScan(DIR_S, TX_VEN6_015); + spockScan(DIR_S, 15, false, true); } void Room::veng6UsePowerPackOnLeftConsole() { - showText(TX_SPEAKER_SPOCK, TX_VEN6_006); + showText(TX_SPEAKER_SPOCK, 6, true); } void Room::veng6GetJunctionBox() { @@ -446,7 +446,7 @@ void Room::veng6GetJunctionBox() { } void Room::veng6GetOilCanister() { - showDescription(TX_VEN6N008); + showDescription(8, true); } void Room::veng6GetEngineeringJournal() { @@ -461,7 +461,7 @@ void Room::veng6ReachedEngineeringJournal() { void Room::veng6TookEngineeringJournal() { loadActorStandAnim(OBJECT_JOURNAL); _awayMission->disableInput = false; - showDescription(TX_VEN6N024); + showDescription(24, true); _awayMission->veng.tookEngineeringJournal = true; giveItem(OBJECT_ITECH); } diff --git a/engines/startrek/rooms/veng7.cpp b/engines/startrek/rooms/veng7.cpp index fbb068d2c6..d82a11eb90 100644 --- a/engines/startrek/rooms/veng7.cpp +++ b/engines/startrek/rooms/veng7.cpp @@ -107,53 +107,53 @@ void Room::veng7TouchedTurboliftDoor() { } void Room::veng7LookAtCollapsedSection() { - showDescription(TX_VEN7N001); + showDescription(1, true); } 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. - showDescription(TX_VEN7N000); + showDescription(0, true); } void Room::veng7LookAtDoor() { - showDescription(TX_VEN7N007); + showDescription(7, true); } void Room::veng7LookAtCable() { - showDescription(TX_VEN7N008); + showDescription(8, true); } void Room::veng7LookAtKirk() { - showDescription(TX_VEN7N003); + showDescription(3, true); } void Room::veng7LookAtSpock() { - showDescription(TX_VEN7N005); + showDescription(5, true); } void Room::veng7LookAtMccoy() { - showDescription(TX_VEN7N004); + showDescription(4, true); } void Room::veng7LookAtRedshirt() { - showDescription(TX_VEN7N002); + showDescription(2, true); } void Room::veng7LookAnywhere() { - showDescription(TX_VEN7N006); + showDescription(6, true); } void Room::veng7TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_VEN7_001); + showText(TX_SPEAKER_KIRK, 1, true); } void Room::veng7TalkToSpock() { - showText(TX_SPEAKER_SPOCK, TX_VEN7_005); + showText(TX_SPEAKER_SPOCK, 5, true); } void Room::veng7TalkToMccoy() { - // NOTE: TX_VEN7_007 could also fit here. It might be more fitting since it's not + // NOTE: 07, true could also fit here. It might be more fitting since it's not // reused. However, it mentions that McCoy gave up medical practice in Georgia. Maybe // they removed this for continuity reasons or something. I don't want to be // responsible for creating any possible confusion over his backstory. @@ -161,15 +161,15 @@ void Room::veng7TalkToMccoy() { } void Room::veng7TalkToRedshirt() { - showText(TX_SPEAKER_KIJE, TX_VEN7_007); + showText(TX_SPEAKER_KIJE, 7, true); } void Room::veng7UseSTricorderOnCollapsedSection() { - spockScan(DIR_S, TX_VEN7_006); + spockScan(DIR_S, 6, true); } void Room::veng7TouchedHotspot0() { // Got too close to the collapsed section - showText(TX_SPEAKER_SPOCK, TX_VEN7_003); + showText(TX_SPEAKER_SPOCK, 3, true); } void Room::veng7GetCable() { @@ -184,7 +184,7 @@ void Room::veng7ReachedCable() { void Room::veng7PickedUpCable() { loadActorStandAnim(OBJECT_CABLE); - showDescription(TX_VEN7N009); + showDescription(9, true); 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 594da88d43..12731da1a3 100644 --- a/engines/startrek/rooms/veng8.cpp +++ b/engines/startrek/rooms/veng8.cpp @@ -159,31 +159,31 @@ void Room::veng8SparkAnim2Done() { } void Room::veng8LookAtPowerPack() { - showDescription(TX_VEN8N004); + showDescription(4, true); } void Room::veng8LookAtDoor() { - showDescription(TX_VEN8N009); + showDescription(9, true); } void Room::veng8LookAtPowerCircuits() { - showDescription(TX_VEN8N006); + showDescription(6, true); } void Room::veng8LookAtControls() { - showDescription(TX_VEN8N007); + showDescription(7, true); } void Room::veng8LookAtDeadGuy() { - showDescription(TX_VEN8N003); // Unused, since the dead guy object isn't drawn + showDescription(3, true); // Unused, since the dead guy object isn't drawn } void Room::veng8LookAtSlider() { - showDescription(TX_VEN8N008); + showDescription(8, true); } void Room::veng8LookAtKirk() { - showDescription(TX_VEN8N001); + showDescription(1, true); } void Room::veng8LookAtSpock() { @@ -198,58 +198,58 @@ void Room::veng8LookAtMccoy() { } void Room::veng8LookAtRedshirt() { - showDescription(TX_VEN8N000); + showDescription(0, true); } void Room::veng8LookAtTransporter() { - showDescription(TX_VEN8N010); + showDescription(10, true); } void Room::veng8LookAnywhere() { - showDescription(TX_VEN8N005); + showDescription(5, true); } void Room::veng8TalkToKirk() { if (_awayMission->veng.torpedoLoaded) - showText(TX_SPEAKER_KIRK, TX_VEN8_002); + showText(TX_SPEAKER_KIRK, 2, true); else if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_KIRK, TX_VEN8_005); + showText(TX_SPEAKER_KIRK, 5, true); else - showText(TX_SPEAKER_KIRK, TX_VEN8_006); + showText(TX_SPEAKER_KIRK, 6, true); } void Room::veng8TalkToSpock() { if (_awayMission->veng.torpedoLoaded) - showText(TX_SPEAKER_SPOCK, TX_VEN8_032); + showText(TX_SPEAKER_SPOCK, 32, true); else if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_SPOCK, TX_VEN8_029); + showText(TX_SPEAKER_SPOCK, 29, true); else - showText(TX_SPEAKER_SPOCK, TX_VEN8_028); + showText(TX_SPEAKER_SPOCK, 28, true); } void Room::veng8TalkToMccoy() { if (_awayMission->veng.torpedoLoaded) { - showText(TX_SPEAKER_MCCOY, TX_VEN8_020); - showText(TX_SPEAKER_KIRK, TX_VEN8_001); + showText(TX_SPEAKER_MCCOY, 20, true); + showText(TX_SPEAKER_KIRK, 1, true); } else if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_MCCOY, TX_VEN8_021); + showText(TX_SPEAKER_MCCOY, 21, true); else - showText(TX_SPEAKER_MCCOY, TX_VEN8_018); + showText(TX_SPEAKER_MCCOY, 18, true); } void Room::veng8TalkToRedshirt() { if (_awayMission->veng.torpedoLoaded) { - showText(TX_SPEAKER_KIJE, TX_VEN8_034); - showText(TX_SPEAKER_MCCOY, TX_VEN8_023); - showText(TX_SPEAKER_KIJE, TX_VEN8_036); + showText(TX_SPEAKER_KIJE, 34, true); + showText(TX_SPEAKER_MCCOY, 23, true); + showText(TX_SPEAKER_KIJE, 36, true); } else if (_awayMission->veng.countdownStarted) - showText(TX_SPEAKER_KIJE, TX_VEN8_041); + showText(TX_SPEAKER_KIJE, 41, true); else - showText(TX_SPEAKER_KIJE, TX_VEN8_040); + showText(TX_SPEAKER_KIJE, 40, true); } void Room::veng8UseKirkOnControls() { - showText(TX_SPEAKER_KIRK, TX_VEN8_003); + showText(TX_SPEAKER_KIRK, 3, true); veng8UseSpockOnControls(); } @@ -266,13 +266,13 @@ void Room::veng8SpockUsedControls() { _awayMission->disableInput = false; if (!_awayMission->veng.powerPackPluggedIntoTransporter && !_awayMission->veng.impulseEnginesOn) - showText(TX_SPEAKER_SPOCK, TX_VEN8_026); + showText(TX_SPEAKER_SPOCK, 26, true); else if (!_awayMission->veng.powerPackPluggedIntoTransporter && _awayMission->veng.poweredSystem != 3) - showText(TX_SPEAKER_SPOCK, TX_VEN8_014); + showText(TX_SPEAKER_SPOCK, 14, true); else if (!_awayMission->veng.examinedTorpedoControl) - showText(TX_SPEAKER_SPOCK, TX_VEN8_030); + showText(TX_SPEAKER_SPOCK, 30, true); else { - showText(TX_SPEAKER_SPOCK, TX_VEN8_031); + showText(TX_SPEAKER_SPOCK, 31, true); _awayMission->veng.setTransporterCoordinates = true; } } @@ -280,9 +280,9 @@ void Room::veng8SpockUsedControls() { void Room::veng8UsePowerPackOnPowerCircuit() { if (!_awayMission->veng.powerPackPluggedIntoTransporter) { _awayMission->disableInput = true; - showText(TX_SPEAKER_KIRK, TX_VEN8_011); - showText(TX_SPEAKER_SPOCK, TX_VEN8_033); - showText(TX_SPEAKER_KIRK, TX_VEN8_009); + showText(TX_SPEAKER_KIRK, 11, true); + showText(TX_SPEAKER_SPOCK, 33, true); + showText(TX_SPEAKER_KIRK, 9, true); walkCrewmanC(OBJECT_SPOCK, 0xfa, 0xa4, &Room::veng8SpockReachedPowerCircuit); } } @@ -310,7 +310,7 @@ void Room::veng8TransporterPoweredUp() { } void Room::veng8UseKirkOnSlider() { - showText(TX_SPEAKER_KIRK, TX_VEN8_004); + showText(TX_SPEAKER_KIRK, 4, true); veng8UseSpockOnSlider(); } @@ -324,25 +324,25 @@ void Room::veng8SpockReachedSlider() { _awayMission->disableInput = false; if (!_awayMission->veng.powerPackPluggedIntoTransporter && !_awayMission->veng.impulseEnginesOn) - showText(TX_SPEAKER_SPOCK, TX_VEN8_027); + showText(TX_SPEAKER_SPOCK, 27, true); else if (!_awayMission->veng.powerPackPluggedIntoTransporter && _awayMission->veng.poweredSystem != 3) - showText(TX_SPEAKER_SPOCK, TX_VEN8_015); + showText(TX_SPEAKER_SPOCK, 15, true); else if (!_awayMission->veng.setTransporterCoordinates) { walkCrewman(OBJECT_SPOCK, 0x98, 0xb6); - showText(TX_SPEAKER_SPOCK, TX_VEN8_013); + showText(TX_SPEAKER_SPOCK, 13, true); } else if (_awayMission->veng.torpedoLoaded) - showText(TX_SPEAKER_KIJE, TX_VEN8_042); + showText(TX_SPEAKER_KIJE, 42, true); else { _awayMission->disableInput = true; - showText(TX_SPEAKER_KIRK, TX_VEN8_010); - showText(TX_SPEAKER_KIJE, TX_VEN8_035); + showText(TX_SPEAKER_KIRK, 10, true); + showText(TX_SPEAKER_KIJE, 35, true); walkCrewmanC(OBJECT_REDSHIRT, 0xc8, 0x7f, &Room::veng8RedshirtReachedTransporter); _awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_S; } } void Room::veng8RedshirtReachedTransporter() { - showText(TX_SPEAKER_KIRK, TX_VEN8_009); + showText(TX_SPEAKER_KIRK, 9, true); loadActorAnimC(OBJECT_SPOCK, "susehn", -1, -1, &Room::veng8SpockPulledSliderToBeamOut); playSoundEffectIndex(SND_TRANSENE); } @@ -355,12 +355,12 @@ void Room::veng8SpockPulledSliderToBeamOut() { void Room::veng8RedshirtBeamedOut() { loadActorStandAnim(OBJECT_REDSHIRT); - showText(TX_SPEAKER_KIJE, TX_VEN8_037); - showText(TX_SPEAKER_KIRK, TX_VEN8_012); - showText(TX_SPEAKER_KIJE, TX_VEN8_039); - showText(TX_SPEAKER_KIRK, TX_VEN8_008); - showText(TX_SPEAKER_KIJE, TX_VEN8_038); - showText(TX_SPEAKER_KIRK, TX_VEN8_007); + showText(TX_SPEAKER_KIJE, 37, true); + showText(TX_SPEAKER_KIRK, 12, true); + showText(TX_SPEAKER_KIJE, 39, true); + showText(TX_SPEAKER_KIRK, 8, true); + showText(TX_SPEAKER_KIJE, 38, true); + showText(TX_SPEAKER_KIRK, 7, true); loadActorAnimC(OBJECT_SPOCK, "susehn", -1, -1, &Room::veng8SpockPulledSliderToBeamIn); playSoundEffectIndex(SND_TRANSENE); } @@ -378,7 +378,7 @@ void Room::veng8RedshirtBeamedIn() { } void Room::veng8UseSTricorderOnConsole() { - spockScan(DIR_S, TX_VEN8_025); + spockScan(DIR_S, 25, true); } } |