diff options
Diffstat (limited to 'engines/startrek/rooms/sins2.cpp')
| -rw-r--r-- | engines/startrek/rooms/sins2.cpp | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/engines/startrek/rooms/sins2.cpp b/engines/startrek/rooms/sins2.cpp index b85ca345ed..b045f0113e 100644 --- a/engines/startrek/rooms/sins2.cpp +++ b/engines/startrek/rooms/sins2.cpp @@ -104,15 +104,15 @@ void Room::sins2Tick1() { } void Room::sins2UsePhaserOnDoor() { - showText(TX_SPEAKER_SPOCK, TX_SIN2_025); + showText(TX_SPEAKER_SPOCK, 25, true); } void Room::sins2UseSTricorderAnywhere() { - spockScan(DIR_S, TX_SIN2_026); + spockScan(DIR_S, 26, true); } void Room::sins2UseKirkOnTerminal() { - showText(TX_SPEAKER_KIRK, TX_SIN2_002); + showText(TX_SPEAKER_KIRK, 2, true); sins2UseSpockOnTerminal(); } @@ -127,56 +127,56 @@ void Room::sins2SpockReachedTerminal() { } void Room::sins2SpockUsedTerminal() { - showText(TX_SPEAKER_SPOCK, TX_SIN2_042); - showText(TX_SPEAKER_SPOCK, TX_SIN2_044); + showText(TX_SPEAKER_SPOCK, 42, true); + showText(TX_SPEAKER_SPOCK, 44, true); if (!_awayMission->sins.gotPointsForAccessingTerminal) { _awayMission->sins.missionScore += 2; _awayMission->sins.gotPointsForAccessingTerminal = true; } - showText(TX_SPEAKER_MCCOY, TX_SIN2_015); - showText(TX_SPEAKER_SPOCK, TX_SIN2_032); - showText(TX_SPEAKER_MOSHER, TX_SIN2_050); - showText(TX_SPEAKER_SPOCK, TX_SIN2_035); - showText(TX_SPEAKER_SPOCK, TX_SIN2_043); - showText(TX_SPEAKER_SPOCK, TX_SIN2_041); - showText(TX_SPEAKER_SPOCK, TX_SIN2_040); - showText(TX_SPEAKER_MCCOY, TX_SIN2_021); - showText(TX_SPEAKER_SPOCK, TX_SIN2_034); - showText(TX_SPEAKER_SPOCK, TX_SIN2_031); - showText(TX_SPEAKER_SPOCK, TX_SIN2_038); - showText(TX_SPEAKER_MCCOY, TX_SIN2_020); - showText(TX_SPEAKER_SPOCK, TX_SIN2_033); - showText(TX_SPEAKER_KIRK, TX_SIN2_007); - showText(TX_SPEAKER_SPOCK, TX_SIN2_037); - showText(TX_SPEAKER_MCCOY, TX_SIN2_022); - showText(TX_SPEAKER_SPOCK, TX_SIN2_029); + showText(TX_SPEAKER_MCCOY, 15, true); + showText(TX_SPEAKER_SPOCK, 32, true); + showText(TX_SPEAKER_MOSHER, 50, true); + showText(TX_SPEAKER_SPOCK, 35, true); + showText(TX_SPEAKER_SPOCK, 43, true); + showText(TX_SPEAKER_SPOCK, 41, true); + showText(TX_SPEAKER_SPOCK, 40, true); + showText(TX_SPEAKER_MCCOY, 21, true); + showText(TX_SPEAKER_SPOCK, 34, true); + showText(TX_SPEAKER_SPOCK, 31, true); + showText(TX_SPEAKER_SPOCK, 38, true); + showText(TX_SPEAKER_MCCOY, 20, true); + showText(TX_SPEAKER_SPOCK, 33, true); + showText(TX_SPEAKER_KIRK, 7, true); + showText(TX_SPEAKER_SPOCK, 37, true); + showText(TX_SPEAKER_MCCOY, 22, true); + showText(TX_SPEAKER_SPOCK, 29, true); } void Room::sins2UseMccoyOnTerminal() { - showText(TX_SPEAKER_MCCOY, TX_SIN2_012); + showText(TX_SPEAKER_MCCOY, 12, true); } void Room::sins2UseRedshirtOnTerminal() { - showText(TX_SPEAKER_MOSHER, TX_SIN2_045); + showText(TX_SPEAKER_MOSHER, 45, true); } void Room::sins2UseSTricorderOnTerminal() { - spockScan(DIR_W, TX_SIN2_009); + spockScan(DIR_W, 9, false, true); } void Room::sins2UseSTricorderOnKeypad() { - spockScan(DIR_N, TX_SIN2_028); + spockScan(DIR_N, 28, false, true); } void Room::sins2UseSTricorderOnDoor() { - spockScan(DIR_N, TX_SIN2_027); + spockScan(DIR_N, 27, false, true); } void Room::sins2UseKirkOnKeypad() { if (!_awayMission->sins.openedInnerDoor) { - showText(TX_SPEAKER_KIRK, TX_SIN2_001); + showText(TX_SPEAKER_KIRK, 01, true); sins2UseSpockOnKeypad(); } } @@ -212,105 +212,105 @@ void Room::sins2EnteredCorrectCode() { } void Room::sins2EnteredIncorrectCode() { - showText(TX_SPEAKER_SPOCK, TX_SIN2_024); // BUGFIX: Speaker is spock, not "none" + showText(TX_SPEAKER_SPOCK, 24, true); // BUGFIX: Speaker is spock, not "none" } void Room::sins2DoorFinishedOpening() { - showText(TX_SPEAKER_SPOCK, TX_SIN2_010); + showText(TX_SPEAKER_SPOCK, 10, true); } void Room::sins2Tick40() { if (!_awayMission->sins.enteredRoom2FirstTime) { _awayMission->disableInput = false; - showText(TX_SPEAKER_KIRK, TX_SIN2_005); - showText(TX_SPEAKER_SCOTT, TX_SIN2_S05); - showText(TX_SPEAKER_UHURA, TX_SIN2U085); - showText(TX_SPEAKER_KIRK, TX_SIN2_008); - showText(TX_SPEAKER_UHURA, TX_SIN2U097); + showText(TX_SPEAKER_KIRK, 5, true); + showText(TX_SPEAKER_SCOTT, 5 + SCOTTY_MESSAGE_OFFSET, true); + showText(TX_SPEAKER_UHURA, 85, true); + showText(TX_SPEAKER_KIRK, 8, true); + showText(TX_SPEAKER_UHURA, 97, true); showText(TX_SPEAKER_MCCOY, TX_SIN2_F26); - showText(TX_SPEAKER_UHURA, TX_SIN2U096); - showText(TX_SPEAKER_MCCOY, TX_SIN2_019); - showText(TX_SPEAKER_KIRK, TX_SIN2_004); + showText(TX_SPEAKER_UHURA, 96, true); + showText(TX_SPEAKER_MCCOY, 19, true); + showText(TX_SPEAKER_KIRK, 4, true); _awayMission->sins.enteredRoom2FirstTime = true; } } void Room::sins2LookAnywhere() { - showDescription(TX_SIN2N006); + showDescription(6, true); } void Room::sins2LookAtOpenDoor() { - showDescription(TX_SIN2N007); + showDescription(7, true); } void Room::sins2LookAtTerminal() { - showDescription(TX_SIN2N000); + showDescription(0, true); } void Room::sins2LookAtKeypad() { - showDescription(TX_SIN2N001); + showDescription(1, true); } void Room::sins2LookAtKirk() { - showDescription(TX_SIN2N003); + showDescription(3, true); } void Room::sins2LookAtSpock() { - showDescription(TX_SIN2N005); + showDescription(5, true); } void Room::sins2LookAtMccoy() { - showDescription(TX_SIN2N004); + showDescription(4, true); } void Room::sins2LookAtRedshirt() { - showDescription(TX_SIN2N002); + showDescription(2, true); } void Room::sins2TalkToKirk() { - showText(TX_SPEAKER_KIRK, TX_SIN2_003); + showText(TX_SPEAKER_KIRK, 3, true); } void Room::sins2TalkToSpock() { - showText(TX_SPEAKER_SPOCK, TX_SIN2_039); - showText(TX_SPEAKER_MCCOY, TX_SIN2_016); + showText(TX_SPEAKER_SPOCK, 39, true); + showText(TX_SPEAKER_MCCOY, 16, true); } void Room::sins2TalkToMccoy() { - showText(TX_SPEAKER_MCCOY, TX_SIN2_023); - showText(TX_SPEAKER_MOSHER, TX_SIN2_049); + showText(TX_SPEAKER_MCCOY, 23, true); + showText(TX_SPEAKER_MOSHER, 49, true); } void Room::sins2TalkToRedshirt() { - showText(TX_SPEAKER_MOSHER, TX_SIN2_047); + showText(TX_SPEAKER_MOSHER, 47, true); } void Room::sins2LookAtDoor() { if (!_awayMission->sins.openedInnerDoor) - showDescription(TX_SIN2N008); + showDescription(8, true); } void Room::sins2UseSpockOnDoor() { if (!_awayMission->sins.openedInnerDoor) { showText(TX_SPEAKER_SPOCK, TX_SIN2_F12); - showText(TX_SPEAKER_MOSHER, TX_SIN2_048); - showText(TX_SPEAKER_SPOCK, TX_SIN2_030); + showText(TX_SPEAKER_MOSHER, 48, true); + showText(TX_SPEAKER_SPOCK, 30, true); } } void Room::sins2UseCommunicator() { if (!_awayMission->sins.enteredRoom4FirstTime) { - showText(TX_SPEAKER_KIRK, TX_SIN2_006); - showText(TX_SPEAKER_SCOTT, TX_SIN2_S16); - showText(TX_SPEAKER_MCCOY, TX_SIN2_017); + showText(TX_SPEAKER_KIRK, 6, true); + showText(TX_SPEAKER_SCOTT, 16 + SCOTTY_MESSAGE_OFFSET, true); + showText(TX_SPEAKER_MCCOY, 17, true); } else - showText(TX_SPEAKER_UHURA, TX_SIN1U070); + showText(TX_SPEAKER_UHURA, 70, true); } void Room::sins2UseMedkitOnCrewman() { - showText(TX_SPEAKER_MCCOY, TX_SIN2_014); + showText(TX_SPEAKER_MCCOY, 14, true); } void Room::sins2UseMTricorderOnCrewman() { @@ -319,12 +319,12 @@ void Room::sins2UseMTricorderOnCrewman() { void Room::sins2UseMccoyOnKeypad() { if (!_awayMission->sins.openedInnerDoor) - showText(TX_SPEAKER_MCCOY, TX_SIN2_013); + showText(TX_SPEAKER_MCCOY, 13, true); } void Room::sins2UseRedshirtOnKeypad() { if (!_awayMission->sins.openedInnerDoor) - showText(TX_SPEAKER_MOSHER, TX_SIN2_046); + showText(TX_SPEAKER_MOSHER, 46, true); } void Room::sins2WalkToDoor() { |