aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/rooms
diff options
context:
space:
mode:
Diffstat (limited to 'engines/startrek/rooms')
-rw-r--r--engines/startrek/rooms/feather0.cpp98
-rw-r--r--engines/startrek/rooms/feather1.cpp156
-rw-r--r--engines/startrek/rooms/feather2.cpp38
-rw-r--r--engines/startrek/rooms/feather3.cpp108
-rw-r--r--engines/startrek/rooms/feather4.cpp44
-rw-r--r--engines/startrek/rooms/feather5.cpp106
-rw-r--r--engines/startrek/rooms/feather6.cpp118
-rw-r--r--engines/startrek/rooms/feather7.cpp54
8 files changed, 361 insertions, 361 deletions
diff --git a/engines/startrek/rooms/feather0.cpp b/engines/startrek/rooms/feather0.cpp
index 482a5ebd93..1c52850310 100644
--- a/engines/startrek/rooms/feather0.cpp
+++ b/engines/startrek/rooms/feather0.cpp
@@ -52,73 +52,73 @@ void Room::feather0Tick60() {
void Room::feather0TalkToQuetzecoatl() {
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- TX_FEA0_006,
- TX_FEA0_007,
- TX_FEA0_011,
+ 6,
+ 7,
+ 11,
TX_BLANK
};
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_028);
- int choice = showMultipleTexts(choices);
+ showText(TX_SPEAKER_QUETZECOATL, 28, true);
+ int choice = showMultipleTexts(choices, true);
bool alreadyAngered = false;
if (choice == 0) {
const TextRef choices0[] = {
TX_SPEAKER_KIRK,
- TX_FEA0_009,
- TX_FEA0_004,
+ 9,
+ 4,
TX_BLANK
};
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_032);
- choice = showMultipleTexts(choices0);
+ showText(TX_SPEAKER_QUETZECOATL, 32, true);
+ choice = showMultipleTexts(choices0, true);
} else if (choice == 1) {
const TextRef choices0[] = {
TX_SPEAKER_KIRK,
- TX_FEA0_002,
- TX_FEA0_012,
+ 2,
+ 12,
TX_BLANK
};
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_031);
- choice = showMultipleTexts(choices0);
+ showText(TX_SPEAKER_QUETZECOATL, 31, true);
+ choice = showMultipleTexts(choices0, true);
} else if (choice == 2) {
const TextRef choices0[] = {
TX_SPEAKER_KIRK,
- TX_FEA0_014,
- TX_FEA0_008,
+ 14,
+ 8,
TX_BLANK
};
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_033);
- choice = showMultipleTexts(choices0);
+ showText(TX_SPEAKER_QUETZECOATL, 33, true);
+ choice = showMultipleTexts(choices0, true);
if (choice == 0) {
alreadyAngered = true;
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_024);
+ showText(TX_SPEAKER_QUETZECOATL, 24, true);
}
} else
showDescription(TX_DIALOG_ERROR);
if (!alreadyAngered) {
if (choice == 0)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_030);
+ showText(TX_SPEAKER_QUETZECOATL, 30, true);
else // choice == 1
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_101);
- showText(TX_SPEAKER_KIRK, TX_FEA0_010);
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_026);
+ showText(TX_SPEAKER_QUETZECOATL, 101, true);
+ showText(TX_SPEAKER_KIRK, 10, true);
+ showText(TX_SPEAKER_QUETZECOATL, 26, true);
const TextRef choices1[] = {
TX_SPEAKER_KIRK,
- TX_FEA0_013,
- TX_FEA0_005,
+ 13,
+ 5,
TX_BLANK
};
- choice = showMultipleTexts(choices1);
+ choice = showMultipleTexts(choices1, true);
if (choice == 0) {
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_029);
- showText(TX_SPEAKER_KIRK, TX_FEA0_003);
+ showText(TX_SPEAKER_QUETZECOATL, 29, true);
+ showText(TX_SPEAKER_KIRK, 3, true);
}
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_027);
+ showText(TX_SPEAKER_QUETZECOATL, 27, true);
}
// Quetzecoatl ultimately warps the crew away no matter what
@@ -144,81 +144,81 @@ void Room::feather0Timer1Expired() {
}
void Room::feather0UsePhaserOnQuetzecoatl() {
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_025);
+ showText(TX_SPEAKER_QUETZECOATL, 25, true);
}
void Room::feather0UsePhaserOnMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA0_016);
+ showText(TX_SPEAKER_MCCOY, 16, true);
}
void Room::feather0UseMedkit() {
- showText(TX_SPEAKER_MCCOY, TX_FEA0_108);
+ showText(TX_SPEAKER_MCCOY, 108, true);
}
void Room::feather0LookAtQuetzecoatl() {
- showDescription(TX_FEA0N008);
+ showDescription(8, true);
}
void Room::feather0LookAtMoon() {
- showDescription(TX_FEA0N007);
+ showDescription(7, true);
}
void Room::feather0LookAtLog() {
- showDescription(TX_FEA0N006);
+ showDescription(6, true);
}
void Room::feather0LookAtHut() {
- showDescription(TX_FEA0N001);
+ showDescription(1, true);
}
void Room::feather0LookAnywhere() {
- showDescription(TX_FEA0N009);
+ showDescription(9, true);
}
void Room::feather0LookAtEyes() {
- showDescription(TX_FEA0N000);
+ showDescription(0, true);
}
void Room::feather0LookAtTree() {
- showDescription(TX_FEA0N003);
+ showDescription(3, true);
}
void Room::feather0LookAtMccoy() {
- showDescription(TX_FEA0N004);
+ showDescription(4, true);
}
void Room::feather0LookAtSpock() {
- showDescription(TX_FEA0N005);
+ showDescription(5, true);
}
void Room::feather0LookAtRedshirt() {
- showDescription(TX_FEA0N002);
+ showDescription(2, true);
}
void Room::feather0TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA0_017);
- showText(TX_SPEAKER_SPOCK, TX_FEA0_021);
+ showText(TX_SPEAKER_MCCOY, 17, true);
+ showText(TX_SPEAKER_SPOCK, 21, true);
}
void Room::feather0TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA0_022);
- showText(TX_SPEAKER_MCCOY, TX_FEA0_018);
+ showText(TX_SPEAKER_SPOCK, 22, true);
+ showText(TX_SPEAKER_MCCOY, 18, true);
}
void Room::feather0TalkToRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA0_023);
+ showText(TX_SPEAKER_STRAGEY, 23, true);
}
void Room::feather0UseSTricorderOnQuetzecoatl() {
- spockScan(DIR_S, TX_FEA0_020, false);
+ spockScan(DIR_S, 20, false, true);
}
void Room::feather0UseSTricorderAnywhere() {
- spockScan(DIR_S, TX_FEA0_019, false);
+ spockScan(DIR_S, 19, false, true);
}
void Room::feather0UseMTricorderOnQuetzecoatl() {
- mccoyScan(DIR_S, TX_FEA0_015, false);
+ mccoyScan(DIR_S, 15, false, true);
}
}
diff --git a/engines/startrek/rooms/feather1.cpp b/engines/startrek/rooms/feather1.cpp
index 66b3c6fcbc..ada6e6693f 100644
--- a/engines/startrek/rooms/feather1.cpp
+++ b/engines/startrek/rooms/feather1.cpp
@@ -1,4 +1,4 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM - Graphic Adventure Engine3
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
@@ -173,7 +173,7 @@ void Room::feather1Tick45() {
void Room::feather1Tick85() {
if (_awayMission->feather.vineState == 0)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA1_057);
+ showText(TX_SPEAKER_QUETZECOATL, 57, true);
}
void Room::feather1Tick95() {
@@ -188,21 +188,21 @@ void Room::feather1QuetzecoatlDisappeared() {
}
void Room::feather1GetRightVine() {
- showDescription(TX_FEA1N008);
+ showDescription(8, true);
}
void Room::feather1GetLeftVine() {
if (_awayMission->feather.vineState == 0)
- showDescription(TX_FEA1N009);
+ showDescription(9, true);
else
- showDescription(TX_FEA1N008);
+ showDescription(8, true);
}
void Room::feather1GetRocks() {
if (_roomVar.feather.crewEscaped[OBJECT_KIRK])
- showDescription(TX_FEA1N021);
+ showDescription(21, true);
else if (_awayMission->feather.gotRock)
- showDescription(TX_FEA1N019);
+ showDescription(19, true);
else {
walkCrewmanC(OBJECT_KIRK, 0x90, 0xb6, &Room::feather1ReachedRocks);
_awayMission->disableInput = true;
@@ -217,7 +217,7 @@ void Room::feather1PickedUpRocks() {
_awayMission->disableInput = false;
loadActorStandAnim(OBJECT_KIRK);
giveItem(OBJECT_IROCK);
- showDescription(TX_FEA1N022);
+ showDescription(22, true);
_awayMission->feather.gotRock = true;
}
@@ -229,7 +229,7 @@ void Room::feather1GetSnake() {
walkCrewmanC(OBJECT_KIRK, 0x90, 0xbe, &Room::feather1ReachedSnake);
_awayMission->disableInput = true;
} else
- showDescription(TX_FEA1N021);
+ showDescription(21, true);
}
void Room::feather1ReachedSnake() {
@@ -267,14 +267,14 @@ void Room::feather1Timer0Expired() { // Snake comes back out of hole
}
void Room::feather1UseCommunicator() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_023);
+ showText(TX_SPEAKER_SPOCK, 23, true);
}
void Room::feather1UseRockOnHole() {
if (_roomVar.feather.crewEscaped[OBJECT_KIRK])
- showDescription(TX_FEA1N021);
+ showDescription(21, true);
else if (_awayMission->feather.holeBlocked)
- showDescription(TX_FEA1N005);
+ showDescription(5, true);
else {
_awayMission->feather.missionScore++;
walkCrewmanC(OBJECT_KIRK, 0xa3, 0xb6, &Room::feather1ReachedHole);
@@ -300,17 +300,17 @@ void Room::feather1PutRockInHole() {
}
void Room::feather1UseSnakeOnLeftVine() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_037);
+ showText(TX_SPEAKER_SPOCK, 37, true);
}
void Room::feather1UseSnakeOnSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_041);
- showText(TX_SPEAKER_KIRK, TX_FEA1_001);
- showText(TX_SPEAKER_MCCOY, TX_FEA1_018);
+ showText(TX_SPEAKER_SPOCK, 41, true);
+ showText(TX_SPEAKER_KIRK, 1, true);
+ showText(TX_SPEAKER_MCCOY, 18, true);
}
void Room::feather1UseSnakeOnKirk() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_026);
+ showText(TX_SPEAKER_SPOCK, 26, true);
}
void Room::feather1UseSnakeOnMccoy() {
@@ -318,7 +318,7 @@ void Room::feather1UseSnakeOnMccoy() {
}
void Room::feather1UseSnakeOnRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_050);
+ showText(TX_SPEAKER_STRAGEY, 50, true);
}
void Room::feather1UseRockOnSnake() {
@@ -326,69 +326,69 @@ void Room::feather1UseRockOnSnake() {
loadActorAnim2(OBJECT_SNAKE, "s5r1si");
_awayMission->timers[0] = 80;
_roomVar.feather.snakeInHole = true;
- showText(TX_SPEAKER_SPOCK, TX_FEA1_034); // BUGFIX: speaker is Spock, not Stragey
+ showText(TX_SPEAKER_SPOCK, 34, true); // BUGFIX: speaker is Spock, not Stragey
}
}
void Room::feather1UseSpockOnSnake() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_035);
+ showText(TX_SPEAKER_SPOCK, 35, true);
}
void Room::feather1UseMccoyOnSnake() {
- showText(TX_SPEAKER_MCCOY, TX_FEA1_005);
+ showText(TX_SPEAKER_MCCOY, 5, true);
}
void Room::feather1UseRedshirtOnSnake() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_046);
+ showText(TX_SPEAKER_STRAGEY, 46, true);
}
void Room::feather1UseSpockOnHole() {
if (_roomVar.feather.snakeInHole)
- showText(TX_SPEAKER_SPOCK, TX_FEA1_025);
+ showText(TX_SPEAKER_SPOCK, 25, true);
else
- showText(TX_SPEAKER_SPOCK, TX_FEA1_027);
+ showText(TX_SPEAKER_SPOCK, 27, true);
}
void Room::feather1UseMccoyOnHole() {
if (_roomVar.feather.snakeInHole)
- showText(TX_SPEAKER_MCCOY, TX_FEA1_004);
+ showText(TX_SPEAKER_MCCOY, 4, true);
else
- showText(TX_SPEAKER_MCCOY, TX_FEA1_010);
+ showText(TX_SPEAKER_MCCOY, 10, true);
}
void Room::feather1UseRedshirtOnHole() {
if (_roomVar.feather.snakeInHole)
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_047);
+ showText(TX_SPEAKER_STRAGEY, 47, true);
else
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_051);
+ showText(TX_SPEAKER_STRAGEY, 51, true);
}
void Room::feather1UseRockOnMoss() {
- showDescription(TX_FEA1N006);
+ showDescription(6, true);
}
void Room::feather1UseRockOnSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_032);
+ showText(TX_SPEAKER_SPOCK, 32, true);
}
void Room::feather1UseRockOnMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA1_009);
+ showText(TX_SPEAKER_MCCOY, 9, true);
}
void Room::feather1UseRockOnRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_045);
+ showText(TX_SPEAKER_STRAGEY, 45, true);
}
void Room::feather1UseSpockOnMoss() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_033);
+ showText(TX_SPEAKER_SPOCK, 33, true);
}
void Room::feather1UseMccoyOnMoss() {
- showText(TX_SPEAKER_MCCOY, TX_FEA1_015);
+ showText(TX_SPEAKER_MCCOY, 15, true);
}
void Room::feather1UseRedshirtOnMoss() {
- showText(TX_SPEAKER_MCCOY, TX_FEA1_049);
+ showText(TX_SPEAKER_MCCOY, 49, true);
}
void Room::feather1UseRockOnLeftVine() {
@@ -414,9 +414,9 @@ void Room::feather1ThrewRock1() {
_awayMission->disableInput = false;
loadActorStandAnim(OBJECT_KIRK);
- showText(TX_SPEAKER_SPOCK, TX_FEA1_042);
- showText(TX_SPEAKER_MCCOY, TX_FEA1_017);
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_054);
+ showText(TX_SPEAKER_SPOCK, 42, true);
+ showText(TX_SPEAKER_MCCOY, 17, true);
+ showText(TX_SPEAKER_STRAGEY, 54, true);
}
void Room::feather1ReadyToThrowRock2() {
@@ -431,9 +431,9 @@ void Room::feather1ThrewRock2() {
loadActorStandAnim(OBJECT_KIRK);
_awayMission->disableInput = false;
- showText(TX_SPEAKER_SPOCK, TX_FEA1_043);
- showText(TX_SPEAKER_MCCOY, TX_FEA1_021);
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_053);
+ showText(TX_SPEAKER_SPOCK, 43, true);
+ showText(TX_SPEAKER_MCCOY, 21, true);
+ showText(TX_SPEAKER_STRAGEY, 53, true);
}
@@ -450,7 +450,7 @@ void Room::feather1UseMccoyOnVine() {
_roomVar.feather.crewmanClimbingVine = OBJECT_MCCOY;
feather1CrewmanClimbVine();
} else
- showText(TX_SPEAKER_MCCOY, TX_FEA1_013);
+ showText(TX_SPEAKER_MCCOY, 13, true);
}
void Room::feather1UseRedshirtOnVine() {
@@ -458,7 +458,7 @@ void Room::feather1UseRedshirtOnVine() {
_roomVar.feather.crewmanClimbingVine = OBJECT_REDSHIRT;
feather1CrewmanClimbVine();
} else
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_052);
+ showText(TX_SPEAKER_STRAGEY, 52, true);
}
void Room::feather1UseKirkOnVine() {
@@ -466,7 +466,7 @@ void Room::feather1UseKirkOnVine() {
_roomVar.feather.crewmanClimbingVine = OBJECT_KIRK;
feather1CrewmanClimbVine();
} else
- showDescription(TX_FEA1N010);
+ showDescription(10, true);
}
// This was refactored, due to the similarity of the code for each crewman. Originally, the
@@ -542,76 +542,76 @@ void Room::feather1ClimbedDownVine() {
}
void Room::feather1UsePhaser() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_028);
+ showText(TX_SPEAKER_SPOCK, 28, true);
}
void Room::feather1UseSTricorderOnRightVine() {
- spockScan(DIR_N, TX_FEA1_039);
+ spockScan(DIR_N, 39, false, true);
}
void Room::feather1UseSTricorderOnSnake() {
- spockScan(DIR_S, TX_FEA1_029);
+ spockScan(DIR_S, 29, false, true);
}
void Room::feather1UseSTricorderOnMoss() {
- spockScan(DIR_E, TX_FEA1_038);
+ spockScan(DIR_E, 38, false, true);
}
void Room::feather1UseSTricorderOnHole() {
if (_roomVar.feather.snakeInHole)
- spockScan(DIR_E, TX_FEA1_030);
+ spockScan(DIR_E, 30, false, true);
else
- spockScan(DIR_E, TX_FEA1_031);
+ spockScan(DIR_E, 31, false, true);
}
void Room::feather1UseSTricorderAnywhere() {
- spockScan(DIR_S, TX_FEA1_024);
+ spockScan(DIR_S, 24, false, true);
}
void Room::feather1UseSTricorderOnRocks() {
- spockScan(DIR_E, TX_FEA1_003);
+ spockScan(DIR_E, 3, false, true);
}
void Room::feather1UseMTricorderOnVine() {
// ENHANCEMENT: Original didn't play tricorder sound, etc
- mccoyScan(DIR_E, TX_FEA1_007);
+ mccoyScan(DIR_E, 7, false, true);
}
void Room::feather1UseMTricorderOnMoss() {
- mccoyScan(DIR_E, TX_FEA1_014);
+ mccoyScan(DIR_E, 14, false, true);
}
void Room::feather1UseMTricorderOnHole() {
if (_roomVar.feather.snakeInHole)
- mccoyScan(DIR_E, TX_FEA1_011);
+ mccoyScan(DIR_E, 11, false, true);
else
- mccoyScan(DIR_E, TX_FEA1_012);
+ mccoyScan(DIR_E, 12, false, true);
}
void Room::feather1UseMTricorderOnSnake() {
- mccoyScan(DIR_S, TX_FEA1_019);
+ mccoyScan(DIR_S, 19, false, true);
if (!_roomVar.feather.scannedSnake) {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_044);
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_055);
- showText(TX_SPEAKER_KIRK, TX_FEA1_002);
+ showText(TX_SPEAKER_SPOCK, 44, true);
+ showText(TX_SPEAKER_STRAGEY, 55, true);
+ showText(TX_SPEAKER_KIRK, 2, true);
_roomVar.feather.scannedSnake = true;
}
}
void Room::feather1UseMedkit() {
- showText(TX_SPEAKER_MCCOY, TX_FEA1_008);
+ showText(TX_SPEAKER_MCCOY, 8, true);
}
void Room::feather1TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA1_006);
+ showText(TX_SPEAKER_MCCOY, 6, true);
}
void Room::feather1TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA1_040);
+ showText(TX_SPEAKER_SPOCK, 40, true);
}
void Room::feather1TalkToRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA1_048);
+ showText(TX_SPEAKER_STRAGEY, 48, true);
}
void Room::feather1WalkToExit() {
@@ -619,58 +619,58 @@ void Room::feather1WalkToExit() {
}
void Room::feather1LookAnywhere() {
- showDescription(TX_FEA1N020);
+ showDescription(20, true);
}
void Room::feather1LookAtSnake() {
- showDescription(TX_FEA1N017);
+ showDescription(17, true);
}
void Room::feather1LookAtRightVine() {
- showDescription(TX_FEA1N015);
+ showDescription(15, true);
}
void Room::feather1LookAtHole() {
- showDescription(TX_FEA1N014);
+ showDescription(14, true);
}
void Room::feather1LookAtMoss() {
- showDescription(TX_FEA1N016);
+ showDescription(16, true);
}
void Room::feather1LookAtRocks() {
- showDescription(TX_FEA1N011);
+ showDescription(11, true);
}
void Room::feather1LookAtLight() {
- showDescription(TX_FEA1N013);
+ showDescription(13, true);
}
void Room::feather1LookAtEyes() {
- showDescription(TX_FEA1N000);
+ showDescription(0, true);
}
void Room::feather1LookAtKirk() {
- showDescription(TX_FEA1N001);
+ showDescription(1, true);
}
void Room::feather1LookAtSpock() {
- showDescription(TX_FEA1N004);
+ showDescription(4, true);
}
void Room::feather1LookAtMccoy() {
- showDescription(TX_FEA1N003);
+ showDescription(3, true);
}
void Room::feather1LookAtRedshirt() {
- showDescription(TX_FEA1N002);
+ showDescription(2, true);
}
void Room::feather1LookAtLeftVine() {
if (_awayMission->feather.vineState == 0)
- showDescription(TX_FEA1N012);
+ showDescription(12, true);
else
- showDescription(TX_FEA1N015);
+ showDescription(15, true);
}
}
diff --git a/engines/startrek/rooms/feather2.cpp b/engines/startrek/rooms/feather2.cpp
index c81ce67143..cd829c4cfa 100644
--- a/engines/startrek/rooms/feather2.cpp
+++ b/engines/startrek/rooms/feather2.cpp
@@ -66,44 +66,44 @@ void Room::feather2Tick1() {
}
void Room::feather2UseCommunicator() {
- showText(TX_SPEAKER_SPOCK, TX_FEA2_006);
+ showText(TX_SPEAKER_SPOCK, 6, true);
}
void Room::feather2UsePhaser() {
// FIXME: Why does McCoy say "They're dead, Jim"?
- showText(TX_SPEAKER_MCCOY, TX_FEA2_003);
+ showText(TX_SPEAKER_MCCOY, 3, true);
}
void Room::feather2UseSTricorderAnywhere() {
- spockScan(DIR_S, TX_FEA2_007);
+ spockScan(DIR_S, 7, true);
}
void Room::feather2UseMTricorderAnywhere() {
// ENHANCEMENT: Original didn't play tricorder sound, etc
- mccoyScan(DIR_S, TX_FEA2_002);
+ mccoyScan(DIR_S, 2, true);
}
void Room::feather2TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA2_004);
+ showText(TX_SPEAKER_MCCOY, 4, true);
}
void Room::feather2TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA2_008);
+ showText(TX_SPEAKER_SPOCK, 8, true);
}
void Room::feather2TalkToRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA2_009);
+ showText(TX_SPEAKER_STRAGEY, 9, true);
}
void Room::feather2LookAtVines() {
// NOTE: This might be unused? I can't find where HOTSPOT_VINES is supposed to be.
- showDescription(TX_FEA2N000);
- showText(TX_SPEAKER_STRAGEY, TX_FEA2_010);
- showText(TX_SPEAKER_MCCOY, TX_FEA2_005);
+ showDescription(0, true);
+ showText(TX_SPEAKER_STRAGEY, 10, true);
+ showText(TX_SPEAKER_MCCOY, 5, true);
}
void Room::feather2UseMedkit() {
- showText(TX_SPEAKER_MCCOY, TX_FEA2_001);
+ showText(TX_SPEAKER_MCCOY, 1, true);
}
void Room::feather2WalkToLeftExit() {
@@ -111,35 +111,35 @@ void Room::feather2WalkToLeftExit() {
}
void Room::feather2LookAtEyes() {
- showDescription(TX_FEA2N001);
+ showDescription(1, true);
}
void Room::feather2LookAtBigTree() {
- showDescription(TX_FEA2N006);
+ showDescription(6, true);
}
void Room::feather2LookAtTrees() {
- showDescription(TX_FEA2N007);
+ showDescription(7, true);
}
void Room::feather2LookAnywhere() {
- showDescription(TX_FEA2N008);
+ showDescription(8, true);
}
void Room::feather2LookAtKirk() {
- showDescription(TX_FEA2N002);
+ showDescription(2, true);
}
void Room::feather2LookAtSpock() {
- showDescription(TX_FEA2N005);
+ showDescription(5, true);
}
void Room::feather2LookAtMccoy() {
- showDescription(TX_FEA2N004);
+ showDescription(4, true);
}
void Room::feather2LookAtRedshirt() {
- showDescription(TX_FEA2N003);
+ showDescription(3, true);
}
}
diff --git a/engines/startrek/rooms/feather3.cpp b/engines/startrek/rooms/feather3.cpp
index 95680727ee..8ac18f8687 100644
--- a/engines/startrek/rooms/feather3.cpp
+++ b/engines/startrek/rooms/feather3.cpp
@@ -106,60 +106,60 @@ void Room::feather3Tick1() {
void Room::feather3Tick40() {
if (!_awayMission->feather.tlaoxacTestPassed)
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_036);
+ showText(TX_SPEAKER_TLAOXAC, 36, true);
}
void Room::feather3TouchedHotspot0() { // Tlaoxac prevents you from passing this point
if (!_awayMission->feather.tlaoxacTestPassed)
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_035);
+ showText(TX_SPEAKER_TLAOXAC, 35, true);
}
void Room::feather3UseSpockOnTlaoxac() {
- showText(TX_SPEAKER_SPOCK, TX_FEA3_026);
- showText(TX_SPEAKER_MCCOY, TX_FEA3_018);
- showText(TX_SPEAKER_SPOCK, TX_FEA3_028);
- showText(TX_SPEAKER_MCCOY, TX_FEA3_015);
+ showText(TX_SPEAKER_SPOCK, 26, true);
+ showText(TX_SPEAKER_MCCOY, 18, true);
+ showText(TX_SPEAKER_SPOCK, 28, true);
+ showText(TX_SPEAKER_MCCOY, 15, true);
}
void Room::feather3UseMccoyOnTlaoxac() {
- showText(TX_SPEAKER_MCCOY, TX_FEA3_016);
- showText(TX_SPEAKER_SPOCK, TX_FEA3_027);
- showText(TX_SPEAKER_MCCOY, TX_FEA3_017);
+ showText(TX_SPEAKER_MCCOY, 16, true);
+ showText(TX_SPEAKER_SPOCK, 27, true);
+ showText(TX_SPEAKER_MCCOY, 17, true);
}
void Room::feather3UseRedshirtOnTlaoxac() {
if (!_awayMission->redshirtDead)
- showText(TX_SPEAKER_STRAGEY, TX_FEA3_029);
+ showText(TX_SPEAKER_STRAGEY, 29, true);
}
void Room::feather3UseCrewmanOnLeftExit() {
if (!_awayMission->feather.tlaoxacTestPassed)
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_041);
+ showText(TX_SPEAKER_TLAOXAC, 41, true);
}
void Room::feather3UseCommunicator() {
- showText(TX_SPEAKER_SPOCK, TX_FEA3_024);
+ showText(TX_SPEAKER_SPOCK, 24, true);
}
void Room::feather3UseSnakeOnKirk() {
if (!_awayMission->feather.tlaoxacTestPassed && !_awayMission->redshirtDead) {
if (_roomVar.feather.showedSnakeToTlaoxac && _awayMission->feather.numRocksThrownAtTlaoxac == 0) {
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_043);
+ showText(TX_SPEAKER_TLAOXAC, 43, true);
_awayMission->feather.tlaoxacTestPassed = true;
_awayMission->feather.missionScore += 2;
loadMapFile("feather3");
loadActorAnim(OBJECT_KNIFE, "s5r3nf", KNIFE_X, KNIFE_Y);
_awayMission->feather.field2e = true;
} else
- showDescription(TX_FEA3N004);
+ showDescription(4, true);
}
}
void Room::feather3UseSnakeOnSpock() {
if (_roomVar.feather.showedSnakeToTlaoxac)
- showText(TX_SPEAKER_SPOCK, TX_FEA3_004);
+ showText(TX_SPEAKER_SPOCK, 4, true);
else
- showText(TX_SPEAKER_SPOCK, TX_FEA3_020);
+ showText(TX_SPEAKER_SPOCK, 20, true);
}
void Room::feather3UseSnakeOnRedshirt() {
@@ -168,15 +168,15 @@ void Room::feather3UseSnakeOnRedshirt() {
walkCrewmanC(OBJECT_KIRK, 0x7c, 0xbc, &Room::feather3KirkReachedRedshirtWithSnake);
_awayMission->disableInput = true;
} else
- showText(TX_SPEAKER_STRAGEY, TX_FEA3_031);
+ showText(TX_SPEAKER_STRAGEY, 31, true);
}
}
void Room::feather3KirkReachedRedshirtWithSnake() {
_awayMission->disableInput = false;
- showText(TX_SPEAKER_STRAGEY, TX_FEA3_034);
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_044);
+ showText(TX_SPEAKER_STRAGEY, 34, true);
+ showText(TX_SPEAKER_TLAOXAC, 44, true);
_awayMission->feather.tlaoxacTestPassed = true;
_awayMission->feather.missionScore += 1;
@@ -186,12 +186,12 @@ void Room::feather3KirkReachedRedshirtWithSnake() {
}
void Room::feather3UseSnakeOnMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA3_007);
+ showText(TX_SPEAKER_MCCOY, 7, true);
}
void Room::feather3UseSnakeOnTlaoxac() {
if (!_awayMission->feather.tlaoxacTestPassed && _awayMission->feather.numRocksThrownAtTlaoxac == 0) {
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_039);
+ showText(TX_SPEAKER_TLAOXAC, 39, true);
_roomVar.feather.showedSnakeToTlaoxac = true;
if (!_awayMission->feather.showedSnakeToTlaoxac) {
_awayMission->feather.showedSnakeToTlaoxac = true;
@@ -201,21 +201,21 @@ void Room::feather3UseSnakeOnTlaoxac() {
}
void Room::feather3UseKnifeOnSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA3_025);
+ showText(TX_SPEAKER_SPOCK, 25, true);
}
void Room::feather3UseKnifeOnMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA3_011); // BUGFIX: Speaker is Mccoy, not Spock.
+ showText(TX_SPEAKER_MCCOY, 11, true); // BUGFIX: Speaker is Mccoy, not Spock.
}
void Room::feather3UseKnifeOnRedshirt() {
if (!_awayMission->redshirtDead)
- showText(TX_SPEAKER_STRAGEY, TX_FEA3_033); // BUGFIX: Speaker is Stragey, not Spock.
+ showText(TX_SPEAKER_STRAGEY, 33, true); // BUGFIX: Speaker is Stragey, not Spock.
}
void Room::feather3UseRockOnTlaoxac() {
if (_roomVar.feather.tlaoxacUnconscious)
- showText(TX_SPEAKER_MCCOY, TX_FEA3_009);
+ showText(TX_SPEAKER_MCCOY, 9, true);
else {
_awayMission->feather.numRocksThrownAtTlaoxac++;
_awayMission->disableInput = true;
@@ -259,10 +259,10 @@ void Room::feather3Timer3Expired() {
void Room::feather3TlaoxacKnockedOutFromRockThrow() {
_awayMission->disableInput = false;
loadActorStandAnim(OBJECT_KIRK);
- showDescription(TX_FEA3N006);
+ showDescription(6, true);
if (!_awayMission->feather.tookKnife && !_awayMission->feather.field2e)
- showText(TX_SPEAKER_MCCOY, TX_FEA3_008);
+ showText(TX_SPEAKER_MCCOY, 8, true);
_awayMission->feather.tlaoxacTestPassed = true;
_roomVar.feather.tlaoxacUnconscious = true;
@@ -270,42 +270,42 @@ void Room::feather3TlaoxacKnockedOutFromRockThrow() {
}
void Room::feather3UsePhaser() {
- showText(TX_SPEAKER_SPOCK, TX_FEA3_023);
+ showText(TX_SPEAKER_SPOCK, 23, true);
}
void Room::feather3TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA3_005);
+ showText(TX_SPEAKER_MCCOY, 5, true);
}
void Room::feather3TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA3_022);
+ showText(TX_SPEAKER_SPOCK, 22, true);
}
void Room::feather3TalkToRedshirt() {
if (!_awayMission->redshirtDead)
- showText(TX_SPEAKER_STRAGEY, TX_FEA3_032);
+ showText(TX_SPEAKER_STRAGEY, 32, true);
}
void Room::feather3TalkToTlaoxac() {
if (!_awayMission->feather.tlaoxacTestPassed && !_awayMission->redshirtDead && !_roomVar.feather.tlaoxacUnconscious) {
if (!_roomVar.feather.showedSnakeToTlaoxac)
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_038);
+ showText(TX_SPEAKER_TLAOXAC, 38, true);
else if (_awayMission->feather.numRocksThrownAtTlaoxac != 0)
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_038);
+ showText(TX_SPEAKER_TLAOXAC, 38, true);
else {
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- TX_FEA3_001, TX_FEA3_002, TX_FEA3_003,
+ 1, 2, 3,
TX_BLANK
};
- int choice = showMultipleTexts(choices);
+ int choice = showMultipleTexts(choices, true);
if (choice == 0)
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_037);
+ showText(TX_SPEAKER_TLAOXAC, 37, true);
else if (choice == 1)
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_042);
+ showText(TX_SPEAKER_TLAOXAC, 42, true);
else if (choice == 2) { // Accidentally insulted Quetzecoatl
- showText(TX_SPEAKER_TLAOXAC, TX_FEA3_040);
+ showText(TX_SPEAKER_TLAOXAC, 40, true);
_awayMission->disableInput = true;
loadActorAnimC(OBJECT_TLAOXAC, "s5r3aj", -1, -1, &Room::feather3TlaoxacKilledRedshirt);
playMidiMusicTracks(2);
@@ -323,14 +323,14 @@ void Room::feather3TlaoxacKilledRedshirt() {
void Room::feather3UseMTricorderOnTlaoxac() {
if (_roomVar.feather.tlaoxacUnconscious)
- mccoyScan(DIR_W, TX_FEA3_010);
+ mccoyScan(DIR_W, 10, false, true);
else
- mccoyScan(DIR_W, TX_FEA3_014);
+ mccoyScan(DIR_W, 14, false, true);
}
void Room::feather3UseMedkitOnTlaoxac() {
if (_awayMission->feather.knockedOutTlaoxac)
- showText(TX_SPEAKER_MCCOY, TX_FEA3_012);
+ showText(TX_SPEAKER_MCCOY, 12, true);
}
void Room::feather3UseMedkitOnRedshirt() {
@@ -339,19 +339,19 @@ void Room::feather3UseMedkitOnRedshirt() {
}
void Room::feather3UseMedkitAnywhere() {
- showText(TX_SPEAKER_MCCOY, TX_FEA3_006);
+ showText(TX_SPEAKER_MCCOY, 6, true);
}
void Room::feather3UseMTricorderOnLight() {
- mccoyScan(DIR_W, TX_FEA3_013);
+ mccoyScan(DIR_W, 13, false, true);
}
void Room::feather3UseSTricorderOnLight() {
- spockScan(DIR_W, TX_FEA3_019);
+ spockScan(DIR_W, 19, false, true);
}
void Room::feather3UseSTricorderAnywhere() {
- spockScan(DIR_S, TX_FEA3_021);
+ spockScan(DIR_S, 21, false, true);
}
void Room::feather3GetKnife() {
@@ -373,40 +373,40 @@ void Room::feather3Timer1Expired() {
void Room::feather3PickedUpKnife() {
_awayMission->disableInput = false;
loadActorStandAnim(OBJECT_KIRK);
- showDescription(TX_FEA3N010);
+ showDescription(10, true);
}
void Room::feather3LookAtSpock() {
if (!_awayMission->feather.knockedOutTlaoxac && !_awayMission->feather.tlaoxacTestPassed)
- showDescription(TX_FEA3N002);
+ showDescription(2, true);
else // ENHANCEMENT: Originally did nothing here. Fall back to default behaviour in the engine.
_awayMission->rdfStillDoDefaultAction = true;
}
void Room::feather3LookAtRedshirt() {
if (_awayMission->redshirtDead)
- showDescription(TX_FEA3N005);
+ showDescription(5, true);
else
- showDescription(TX_FEA3N012);
+ showDescription(12, true);
}
void Room::feather3LookAtTlaoxac() {
if (_awayMission->feather.knockedOutTlaoxac)
- showDescription(TX_FEA3N003);
+ showDescription(3, true);
else
- showDescription(TX_FEA3N007);
+ showDescription(7, true);
}
void Room::feather3LookAtLight() {
- showDescription(TX_FEA3N001);
+ showDescription(1, true);
}
void Room::feather3LookAtMccoy() {
- showDescription(TX_FEA3N000);
+ showDescription(0, true);
}
void Room::feather3LookAtKnife() {
- showDescription(TX_FEA3N011);
+ showDescription(11, true);
}
}
diff --git a/engines/startrek/rooms/feather4.cpp b/engines/startrek/rooms/feather4.cpp
index 1118350706..7b883032cd 100644
--- a/engines/startrek/rooms/feather4.cpp
+++ b/engines/startrek/rooms/feather4.cpp
@@ -73,91 +73,91 @@ void Room::feather4Tick1() {
}
void Room::feather4UseCommunicator() {
- showText(TX_SPEAKER_MCCOY, TX_FEA4_005); // BUGFIX: Original played wrong audio file (TX_FEA4N008)
+ showText(TX_SPEAKER_MCCOY, 5, true); // BUGFIX: Original played wrong audio file (TX_FEA4N008)
}
void Room::feather4UsePhaser() {
- showText(TX_SPEAKER_SPOCK, TX_FEA4_011);
+ showText(TX_SPEAKER_SPOCK, 11, true);
}
void Room::feather4UseSTricorderOnLight() {
- spockScan(DIR_W, TX_FEA4_010);
+ spockScan(DIR_W, 10, true);
}
void Room::feather4UseSTricorderOnMushroom() {
- spockScan(DIR_W, TX_FEA4_012);
+ spockScan(DIR_W, 12, true);
}
void Room::feather4UseSTricorderOnFern() {
- spockScan(DIR_W, TX_FEA4_009);
+ spockScan(DIR_W, 9, false, true);
}
void Room::feather4UseSTricorderAnywhere() {
- spockScan(DIR_W, TX_FEA4_008);
+ spockScan(DIR_W, 8, false, true);
}
void Room::feather4UseMTricorderOnLight() {
- mccoyScan(DIR_W, TX_FEA4_001);
+ mccoyScan(DIR_W, 1, false, true);
}
void Room::feather4UseMTricorderOnMushroom() {
- mccoyScan(DIR_W, TX_FEA4_003);
+ mccoyScan(DIR_W, 3, false, true);
}
void Room::feather4UseMTricorderAnywhere() {
- mccoyScan(DIR_W, TX_FEA4_006);
+ mccoyScan(DIR_W, 6, false, true);
}
void Room::feather4UseMedkitAnywhere() {
- showText(TX_SPEAKER_MCCOY, TX_FEA4_002);
+ showText(TX_SPEAKER_MCCOY, 2, true);
}
void Room::feather4TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA4_004);
+ showText(TX_SPEAKER_MCCOY, 4, true);
}
void Room::feather4TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA4_007);
+ showText(TX_SPEAKER_SPOCK, 7, true);
}
void Room::feather4TalkToRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA4_013);
+ showText(TX_SPEAKER_STRAGEY, 13, true);
}
void Room::feather4LookAtEyes() {
- showDescription(TX_FEA4N003);
+ showDescription(3, true);
}
void Room::feather4LookAnywhere() {
- showDescription(TX_FEA4N008);
+ showDescription(8, true);
}
void Room::feather4LookAtMushroom() {
- showDescription(TX_FEA4N001);
+ showDescription(1, true);
}
void Room::feather4LookAtFern() {
- showDescription(TX_FEA4N000);
+ showDescription(0, true);
}
void Room::feather4LookAtLight() {
- showDescription(TX_FEA4N002);
+ showDescription(2, true);
}
void Room::feather4LookAtKirk() {
- showDescription(TX_FEA4N004);
+ showDescription(4, true);
}
void Room::feather4LookAtSpock() {
- showDescription(TX_FEA4N007);
+ showDescription(7, true);
}
void Room::feather4LookAtMccoy() {
- showDescription(TX_FEA4N006);
+ showDescription(6, true);
}
void Room::feather4LookAtRedshirt() {
- showDescription(TX_FEA4N005);
+ showDescription(5, true);
}
}
diff --git a/engines/startrek/rooms/feather5.cpp b/engines/startrek/rooms/feather5.cpp
index 2f86a1e468..1ce527a035 100644
--- a/engines/startrek/rooms/feather5.cpp
+++ b/engines/startrek/rooms/feather5.cpp
@@ -126,27 +126,27 @@ void Room::feather5Tick1() {
void Room::feather5TouchedHotspot0() { // Approached the log
if (!_awayMission->feather.waterMonsterRetreated) {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_005);
+ showText(TX_SPEAKER_SPOCK, 5, true);
if (!_awayMission->redshirtDead)
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_033);
+ showText(TX_SPEAKER_STRAGEY, 33, true);
}
}
void Room::feather5UseSpockOnFern() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_004);
+ showText(TX_SPEAKER_SPOCK, 4, true);
}
void Room::feather5UseMccoyOnFern() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_009);
+ showText(TX_SPEAKER_MCCOY, 9, true);
}
void Room::feather5UseRedshirtOnFern() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_035);
+ showText(TX_SPEAKER_STRAGEY, 35, true);
}
void Room::feather5UseRedshirtOnLeftExit() {
if (!_awayMission->feather.waterMonsterRetreated) {
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_034);
+ showText(TX_SPEAKER_STRAGEY, 34, true);
_awayMission->disableInput = true;
loadMapFile("feath5b");
walkCrewmanC(OBJECT_REDSHIRT, 0x8f, 0x64, &Room::feather5RedshirtReachedLog);
@@ -169,32 +169,32 @@ void Room::feather5RedshirtDeathFinished() {
void Room::feather5UseSpockOnLeftExit() {
if (!_awayMission->feather.waterMonsterRetreated)
- showText(TX_SPEAKER_SPOCK, TX_FEA5_002);
+ showText(TX_SPEAKER_SPOCK, 2, true);
}
void Room::feather5UseMccoyOnLeftExit() {
if (!_awayMission->feather.waterMonsterRetreated)
- showText(TX_SPEAKER_MCCOY, TX_FEA5_015);
+ showText(TX_SPEAKER_MCCOY, 15, true);
}
void Room::feather5UseSnakeOnKirk() {
- showText(TX_SPEAKER_KIRK, TX_FEA5N010);
+ showText(TX_SPEAKER_KIRK, 10, true);
}
void Room::feather5UseSnakeOnSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_032);
+ showText(TX_SPEAKER_SPOCK, 32, true);
}
void Room::feather5UseSnakeOnMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_020);
+ showText(TX_SPEAKER_MCCOY, 20, true);
}
void Room::feather5UseSnakeOnRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_040);
+ showText(TX_SPEAKER_STRAGEY, 40, true);
}
void Room::feather5UseSnakeOnWater() {
- showDescription(TX_FEA5N011);
+ showDescription(11, true);
loseItem(OBJECT_ISNAKE);
}
@@ -203,36 +203,36 @@ void Room::feather5UseKnifeOnKirk() {
// However, there is an unused audio file for text that otherwise only appears in the
// mac version. (DOS floppy version has yet another variation for this text.)
// We'll use that unused audio file here...
- showText(TX_SPEAKER_KIRK, TX_FEA5_001);
+ showText(TX_SPEAKER_KIRK, 1, true);
}
void Room::feather5UseKnifeOnSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_029);
+ showText(TX_SPEAKER_SPOCK, 29, true);
}
void Room::feather5UseKnifeOnMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_008);
+ showText(TX_SPEAKER_MCCOY, 8, true);
}
void Room::feather5UseKnifeOnRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_039);
+ showText(TX_SPEAKER_STRAGEY, 39, true);
}
void Room::feather5UseKnifeOnWater() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_018);
+ showText(TX_SPEAKER_MCCOY, 18, true);
}
void Room::feather5UseKnifeOnMonster() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_006);
+ showText(TX_SPEAKER_SPOCK, 6, true);
}
void Room::feather5GetFern() {
- showDescription(TX_FEA5N008);
+ showDescription(8, true);
}
void Room::feather5UseKnifeOnFern() {
if (_awayMission->feather.gotFern)
- showDescription(TX_FEA5N015);
+ showDescription(15, true);
else {
walkCrewmanC(OBJECT_KIRK, 0x106, 0x8a, &Room::feather5ReachedFern);
_awayMission->disableInput = true;
@@ -280,141 +280,141 @@ void Room::feather5FernFellIntoWater() {
}
void Room::feather5Timer1Expired() { // Spock explains that the creature retreated
- showText(TX_SPEAKER_SPOCK, TX_FEA5_025);
+ showText(TX_SPEAKER_SPOCK, 25, true);
}
void Room::feather5UseRockOnSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_027);
+ showText(TX_SPEAKER_SPOCK, 27, true);
}
void Room::feather5UseRockOnMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_019);
+ showText(TX_SPEAKER_MCCOY, 19, true);
}
void Room::feather5UseRockOnRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_038);
+ showText(TX_SPEAKER_STRAGEY, 38, true);
}
void Room::feather5UseCrewmanOnThrownFern() {
// This might be unused? The object in question (OBJECT_THROWN_FERN) shouldn't be
// visible while player control is active.
- showDescription(TX_FEA5N003);
+ showDescription(3, true);
}
void Room::feather5UseSpockOnMonster() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_003);
+ showText(TX_SPEAKER_SPOCK, 3, true);
}
void Room::feather5UseMccoyOnMonster() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_016);
+ showText(TX_SPEAKER_MCCOY, 16, true);
}
void Room::feather5UseRedshirtOnMonster() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_037);
+ showText(TX_SPEAKER_STRAGEY, 37, true);
}
void Room::feather5UsePhaser() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_028);
+ showText(TX_SPEAKER_SPOCK, 28, true);
}
void Room::feather5LookAnywhere() {
- showDescription(TX_FEA5N012);
+ showDescription(12, true);
}
void Room::feather5LookAtLog() {
- showDescription(TX_FEA5N007);
+ showDescription(7, true);
}
void Room::feather5LookAtWater() {
- showDescription(TX_FEA5N009);
+ showDescription(9, true);
}
void Room::feather5LookAtFern() {
- showDescription(TX_FEA5N014);
+ showDescription(14, true);
}
void Room::feather5LookAtInsects() {
- showDescription(TX_FEA5N005);
+ showDescription(5, true);
}
void Room::feather5LookAtCave() {
- showDescription(TX_FEA5N013);
+ showDescription(13, true);
}
void Room::feather5LookAtMonster() {
- showDescription(TX_FEA5N000);
+ showDescription(0, true);
}
void Room::feather5LookAtSpock() {
- showDescription(TX_FEA5N006);
+ showDescription(6, true);
}
void Room::feather5LookAtKirk() {
if (!_awayMission->feather.waterMonsterRetreated)
- showDescription(TX_FEA5N001);
+ showDescription(1, true);
else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing
_awayMission->rdfStillDoDefaultAction = true;
}
void Room::feather5LookAtMccoy() {
if (!_awayMission->feather.waterMonsterRetreated)
- showDescription(TX_FEA5N002);
+ showDescription(2, true);
else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing
_awayMission->rdfStillDoDefaultAction = true;
}
void Room::feather5LookAtRedshirt() {
if (!_awayMission->feather.waterMonsterRetreated)
- showDescription(TX_FEA5N004);
+ showDescription(4, true);
else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing
_awayMission->rdfStillDoDefaultAction = true;
}
void Room::feather5TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_007);
+ showText(TX_SPEAKER_MCCOY, 7, true);
}
void Room::feather5TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, TX_FEA5_022);
+ showText(TX_SPEAKER_SPOCK, 22, true);
}
void Room::feather5TalkToRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA5_036);
+ showText(TX_SPEAKER_STRAGEY, 36, true);
}
void Room::feather5UseMTricorderOnWater() {
if (_awayMission->feather.waterMonsterRetreated)
- mccoyScan(DIR_W, TX_FEA5_011);
+ mccoyScan(DIR_W, 11, false, true);
else
- mccoyScan(DIR_W, TX_FEA5_014);
+ mccoyScan(DIR_W, 14, false, true);
}
void Room::feather5UseMTricorderOnMonster() {
- mccoyScan(DIR_W, TX_FEA5_013);
+ mccoyScan(DIR_W, 13, false, true);
}
void Room::feather5UseSTricorderOnMonster() {
- spockScan(DIR_W, TX_FEA5_024);
+ spockScan(DIR_W, 24, false, true);
}
void Room::feather5UseSTricorderAnywhere() {
- spockScan(DIR_W, TX_FEA5_026);
+ spockScan(DIR_W, 26, false, true);
}
void Room::feather5UseSTricorderOnWater() {
if (_awayMission->feather.waterMonsterRetreated)
- spockScan(DIR_W, TX_FEA5_031);
+ spockScan(DIR_W, 31, false, true);
else
- spockScan(DIR_W, TX_FEA5_030);
+ spockScan(DIR_W, 30, false, true);
}
void Room::feather5UseSTricorderOnFern() {
- spockScan(DIR_N, TX_FEA5_023);
+ spockScan(DIR_N, 23, false, true);
}
void Room::feather5UseMedkitAnywhere() {
- showText(TX_SPEAKER_MCCOY, TX_FEA5_010);
+ showText(TX_SPEAKER_MCCOY, 10, true);
}
}
diff --git a/engines/startrek/rooms/feather6.cpp b/engines/startrek/rooms/feather6.cpp
index dba3f42f99..65935be31c 100644
--- a/engines/startrek/rooms/feather6.cpp
+++ b/engines/startrek/rooms/feather6.cpp
@@ -109,19 +109,19 @@ void Room::feather6Tick1() {
}
void Room::feather6TouchedHotspot0() { // McCoy warns you not to go back to the river
- showText(TX_SPEAKER_MCCOY, TX_FEA6_014);
+ showText(TX_SPEAKER_MCCOY, 14, true);
}
void Room::feather6UseSpockOnCrystals() {
- showText(TX_SPEAKER_SPOCK, TX_FEA6_020);
+ showText(TX_SPEAKER_SPOCK, 20, true);
}
void Room::feather6UseMccoyOnCrystals() {
- showText(TX_SPEAKER_MCCOY, TX_FEA6_009);
+ showText(TX_SPEAKER_MCCOY, 9, true);
}
void Room::feather6UseRedshirtOnCrystals() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA6_040);
+ showText(TX_SPEAKER_STRAGEY, 40, true);
}
@@ -146,8 +146,8 @@ void Room::feather6KirkDiedFromStalactites() {
_awayMission->feather.missionScore -= 3;
_awayMission->feather.diedFromStalactites = true;
_awayMission->disableInput = false;
- showDescription(TX_FEA6N000);
- showDescription(TX_FEA6N004);
+ showDescription(0, true);
+ showDescription(4, true);
loadRoomIndex(7, 5);
}
@@ -174,7 +174,7 @@ void Room::feather6Tick() {
void Room::feather6HitCrystalsWithRockFirstTime() {
_awayMission->disableInput = false;
loadActorStandAnim(OBJECT_KIRK);
- showText(TX_SPEAKER_KIRK, TX_FEA6_001);
+ showText(TX_SPEAKER_KIRK, 1, true);
}
void Room::feather6HitCrystalsWithRockSecondTime() {
@@ -184,180 +184,180 @@ void Room::feather6HitCrystalsWithRockSecondTime() {
}
void Room::feather6UseRockOnStalagmites() {
- showText(TX_SPEAKER_SPOCK, TX_FEA6_019);
+ showText(TX_SPEAKER_SPOCK, 19, true);
}
void Room::feather6UseRockAnywhere() {
// ENHANCEMENT: There were two implementations of this function. The first (which took
// precedence) showed TX_FEA6N009, a generic "nothing happens" text. The second is
// Spock advising you not to use rocks, which is more interesting.
- showText(TX_SPEAKER_SPOCK, TX_FEA6_021);
+ showText(TX_SPEAKER_SPOCK, 21, true);
}
void Room::feather6UseKnifeOnStalagmites() {
- showText(TX_SPEAKER_SPOCK, TX_FEA6_028);
+ showText(TX_SPEAKER_SPOCK, 28, true);
}
void Room::feather6UseKnifeAnywhere() {
- showDescription(TX_FEA6N010);
+ showDescription(10, true);
}
void Room::feather6UseKnifeOnMccoy() {
// BUG: Stragey could be dead...
- showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+ showText(TX_SPEAKER_STRAGEY, 39, true); // BUGFIX: Speaker is Stragey (not Spock)
}
void Room::feather6UseKnifeOnSpock() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+ showText(TX_SPEAKER_STRAGEY, 39, true); // BUGFIX: Speaker is Stragey (not Spock)
}
void Room::feather6UseKnifeOnRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+ showText(TX_SPEAKER_STRAGEY, 39, true); // BUGFIX: Speaker is Stragey (not Spock)
}
void Room::feather6UseCrystalAnywhere() {
- showDescription(TX_FEA6N015);
+ showDescription(15, true);
}
void Room::feather6UseSnakeAnywhere() {
- showDescription(TX_FEA6N001);
+ showDescription(1, true);
}
void Room::feather6UseMedkitAnywhere() {
- showText(TX_SPEAKER_MCCOY, TX_FEA6_011);
+ showText(TX_SPEAKER_MCCOY, 11, true);
}
void Room::feather6UsePhaser() {
- showText(TX_SPEAKER_SPOCK, TX_FEA6_023);
+ showText(TX_SPEAKER_SPOCK, 23, true);
}
void Room::feather6LookAtEastExit() {
- showDescription(TX_FEA6N016);
+ showDescription(16, true);
}
void Room::feather6LookAnywhere() {
- showDescription(TX_FEA6N003);
+ showDescription(3, true);
}
void Room::feather6LookAtRocks() {
- showDescription(TX_FEA6N014);
+ showDescription(14, true);
}
void Room::feather6LookAtStalagmites() {
- showDescription(TX_FEA6N013);
+ showDescription(13, true);
}
void Room::feather6LookAtCrystals() {
- showDescription(TX_FEA6N005);
+ showDescription(5, true);
}
void Room::feather6LookAtKirk() {
- showDescription(TX_FEA6N007);
+ showDescription(7, true);
}
void Room::feather6LookAtSpock() {
- showDescription(TX_FEA6N011);
+ showDescription(11, true);
}
void Room::feather6LookAtMccoy() {
- showDescription(TX_FEA6N002);
+ showDescription(2, true);
}
void Room::feather6LookAtRedshirt() {
- showDescription(TX_FEA6N008);
+ showDescription(8, true);
}
void Room::feather6LookAtStalactites() {
- showDescription(TX_FEA6N012);
- showText(TX_SPEAKER_SPOCK, TX_FEA6_034);
- showText(TX_SPEAKER_MCCOY, TX_FEA6_017);
- showText(TX_SPEAKER_SPOCK, TX_FEA6_033);
+ showDescription(12, true);
+ showText(TX_SPEAKER_SPOCK, 34, true);
+ showText(TX_SPEAKER_MCCOY, 17, true);
+ showText(TX_SPEAKER_SPOCK, 33, true);
// BUG: Choice 2 (TX_FEA6_004) doesn't match with audio at all.
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- TX_FEA6_008, TX_FEA6_006, TX_FEA6_004,
+ 8, 6, 4,
TX_BLANK
};
- int choice = showMultipleTexts(choices);
+ int choice = showMultipleTexts(choices, true);
if (choice == 0)
- showText(TX_SPEAKER_SPOCK, TX_FEA6_032);
+ showText(TX_SPEAKER_SPOCK, 32, true);
else if (choice == 1)
- showText(TX_SPEAKER_SPOCK, TX_FEA6_036);
+ showText(TX_SPEAKER_SPOCK, 36, true);
else
- showText(TX_SPEAKER_SPOCK, TX_FEA6_037);
+ showText(TX_SPEAKER_SPOCK, 37, true);
}
void Room::feather6TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, TX_FEA6_013);
+ showText(TX_SPEAKER_MCCOY, 13, true);
}
void Room::feather6TalkToRedshirt() {
- showText(TX_SPEAKER_STRAGEY, TX_FEA6_042);
- showText(TX_SPEAKER_KIRK, TX_FEA6_002);
- showText(TX_SPEAKER_STRAGEY, TX_FEA6_041);
- showText(TX_SPEAKER_MCCOY, TX_FEA6_016);
- showText(TX_SPEAKER_STRAGEY, TX_FEA6_043);
+ showText(TX_SPEAKER_STRAGEY, 42, true);
+ showText(TX_SPEAKER_KIRK, 2, true);
+ showText(TX_SPEAKER_STRAGEY, 41, true);
+ showText(TX_SPEAKER_MCCOY, 16, true);
+ showText(TX_SPEAKER_STRAGEY, 43, true);
}
void Room::feather6TalkToSpock() {
if (!_awayMission->redshirtDead)
- showText(TX_SPEAKER_SPOCK, TX_FEA6_035);
+ showText(TX_SPEAKER_SPOCK, 35, true);
else {
- showText(TX_SPEAKER_SPOCK, TX_FEA6_038);
+ showText(TX_SPEAKER_SPOCK, 38, true);
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- TX_FEA6_003, TX_FEA6_005, TX_FEA6_007,
+ 3, 5, 7,
TX_BLANK
};
- int choice = showMultipleTexts(choices);
+ int choice = showMultipleTexts(choices, true);
if (choice == 0)
- showText(TX_SPEAKER_SPOCK, TX_FEA6_029);
+ showText(TX_SPEAKER_SPOCK, 29, true);
else if (choice == 1)
- showText(TX_SPEAKER_SPOCK, TX_FEA6_030);
+ showText(TX_SPEAKER_SPOCK, 30, true);
else
- showText(TX_SPEAKER_SPOCK, TX_FEA6_031);
+ showText(TX_SPEAKER_SPOCK, 31, true);
}
}
void Room::feather6UseMTricorderOnEastExit() {
- mccoyScan(DIR_E, TX_FEA6_012);
+ mccoyScan(DIR_E, 12, false, true);
}
void Room::feather6UseMTricorderOnRocks() {
// ENHANCEMENT: Original didn't play tricorder noise, etc
- mccoyScan(DIR_E, TX_FEA6_015);
+ mccoyScan(DIR_E, 15, false, true);
}
void Room::feather6UseSTricorderOnEastExit() {
- spockScan(DIR_E, TX_FEA6_024);
+ spockScan(DIR_E, 24, false, true);
}
void Room::feather6UseSTricorderAnywhere() {
- spockScan(DIR_S, TX_FEA6_022);
+ spockScan(DIR_S, 22, false, true);
}
void Room::feather6UseSTricorderOnRocks() {
- spockScan(DIR_N, TX_FEA6_018);
+ spockScan(DIR_N, 18, false, true);
}
void Room::feather6UseSTricorderOnCrystals() {
- spockScan(DIR_N, TX_FEA6_027);
+ spockScan(DIR_N, 27, false, true);
}
void Room::feather6UseSTricorderOnStalactites() {
- spockScan(DIR_N, TX_FEA6_025);
+ spockScan(DIR_N, 25, false, true);
}
void Room::feather6UseSTricorderOnStalagmites() {
- spockScan(DIR_N, TX_FEA6_026);
+ spockScan(DIR_N, 26, false, true);
}
void Room::feather6GetCrystals() {
- showDescription(TX_FEA6N020);
+ showDescription(20, true);
}
void Room::feather6UseKnifeOnCrystals() {
@@ -375,7 +375,7 @@ void Room::feather6DoneCuttingCrystals() {
loadActorStandAnim(OBJECT_KIRK);
_awayMission->feather.missionScore += 1;
giveItem(OBJECT_ICRYSTAL);
- showDescription(TX_FEA6N017);
+ showDescription(17, true);
}
void Room::feather6Timer4Expired() { // Crystal disappears when timer 4 expires
diff --git a/engines/startrek/rooms/feather7.cpp b/engines/startrek/rooms/feather7.cpp
index fcd213d6e8..21973d4906 100644
--- a/engines/startrek/rooms/feather7.cpp
+++ b/engines/startrek/rooms/feather7.cpp
@@ -49,19 +49,19 @@ void Room::feather7Tick1() {
void Room::feather7Tick40() {
if (_awayMission->feather.diedFromStalactites)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_017);
+ showText(TX_SPEAKER_QUETZECOATL, 17, true);
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_022);
+ showText(TX_SPEAKER_QUETZECOATL, 22, true);
if (_awayMission->redshirtDead)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_021);
+ showText(TX_SPEAKER_QUETZECOATL, 21, true);
// BUGFIX: Show this even if redshirt isn't dead (he wishes you wouldn't have knocked
// out Tlaoxac)
if (_awayMission->feather.knockedOutTlaoxac)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_023);
+ showText(TX_SPEAKER_QUETZECOATL, 23, true);
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_027);
+ showText(TX_SPEAKER_QUETZECOATL, 27, true);
walkCrewmanC(OBJECT_KIRK, 0x6c, 0x93, &Room::feather7KirkReachedSeat);
walkCrewmanC(OBJECT_SPOCK, 0xbb, 0x8c, &Room::feather7SpockReachedSeat);
@@ -88,57 +88,57 @@ void Room::feather7QuetzecoatlReachedSeat() {
void Room::feather7KirkSatDown() {
const TextRef choices1[] = {
TX_SPEAKER_KIRK,
- TX_FEA7_005, TX_FEA7_006, TX_FEA7_010,
+ 5, 6, 10,
TX_BLANK
};
- int choice = showMultipleTexts(choices1);
+ int choice = showMultipleTexts(choices1, true);
if (choice == 0) {
_roomVar.feather.insultedQuetzecoatl = true;
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_020);
+ showText(TX_SPEAKER_QUETZECOATL, 20, true);
} else if (choice == 1)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_019);
+ showText(TX_SPEAKER_QUETZECOATL, 19, true);
else
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_016);
+ showText(TX_SPEAKER_QUETZECOATL, 16, true);
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_029);
+ showText(TX_SPEAKER_QUETZECOATL, 29, true);
const TextRef choices2[] = {
TX_SPEAKER_KIRK,
- TX_FEA7_007, TX_FEA7_004, TX_FEA7_012,
+ 7, 4, 12,
TX_BLANK
};
- choice = showMultipleTexts(choices2);
+ choice = showMultipleTexts(choices2, true);
if (choice == 0) {
_roomVar.feather.insultedQuetzecoatl = true;
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_030);
+ showText(TX_SPEAKER_QUETZECOATL, 30, true);
} else if (choice == 1)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_018);
+ showText(TX_SPEAKER_QUETZECOATL, 18, true);
else {
_roomVar.feather.insultedQuetzecoatl = true;
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_026);
+ showText(TX_SPEAKER_QUETZECOATL, 26, true);
}
- showText(TX_SPEAKER_SPOCK, TX_FEA7_014);
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_024);
+ showText(TX_SPEAKER_SPOCK, 14, true);
+ showText(TX_SPEAKER_QUETZECOATL, 24, true);
const TextRef choices3[] = {
TX_SPEAKER_KIRK,
- TX_FEA7_008, TX_FEA7_009, TX_FEA7_011,
+ 8, 9, 11,
TX_BLANK
};
- choice = showMultipleTexts(choices3);
+ choice = showMultipleTexts(choices3, true);
if (choice == 0) {
_roomVar.feather.insultedQuetzecoatl = true;
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_025);
+ showText(TX_SPEAKER_QUETZECOATL, 25, true);
} else if (choice == 1)
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_028);
+ showText(TX_SPEAKER_QUETZECOATL, 28, true);
- showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_015);
- showText(TX_SPEAKER_MCCOY, TX_FEA7_013);
- showText(TX_SPEAKER_KIRK, TX_FEA7_003);
+ showText(TX_SPEAKER_QUETZECOATL, 15, true);
+ showText(TX_SPEAKER_MCCOY, 13, true);
+ showText(TX_SPEAKER_KIRK, 3, true);
loadActorAnimC(OBJECT_KIRK, "s5r7ku", -1, -1, &Room::feather7ReadyToBeamOut);
loadActorAnim2(OBJECT_SPOCK, "s5r7su");
@@ -147,10 +147,10 @@ void Room::feather7KirkSatDown() {
void Room::feather7ReadyToBeamOut() {
if (_awayMission->redshirtDead)
- showText(TX_SPEAKER_KIRK, TX_FEA7_002);
+ showText(TX_SPEAKER_KIRK, 2, true);
else {
_awayMission->feather.missionScore += 1;
- showText(TX_SPEAKER_KIRK, TX_FEA7_001);
+ showText(TX_SPEAKER_KIRK, 1, true);
}
if (!_roomVar.feather.insultedQuetzecoatl)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:15:13 +0000