diff options
author | Filippos Karapetis | 2019-10-30 01:42:03 +0200 |
---|---|---|
committer | Filippos Karapetis | 2019-10-30 01:42:47 +0200 |
commit | 78958a01f80bc6dbe43c45bfd0f63092f4b49b2c (patch) | |
tree | 165804bf5236feed6c8bd2807f79cbe69317cddf /engines/startrek/rooms | |
parent | 8dca2bf30a3c2002490c33fc0a812e719a4998d3 (diff) | |
download | scummvm-rg350-78958a01f80bc6dbe43c45bfd0f63092f4b49b2c.tar.gz scummvm-rg350-78958a01f80bc6dbe43c45bfd0f63092f4b49b2c.tar.bz2 scummvm-rg350-78958a01f80bc6dbe43c45bfd0f63092f4b49b2c.zip |
STARTREK: Load more messages from RDF files
Diffstat (limited to 'engines/startrek/rooms')
-rw-r--r-- | engines/startrek/rooms/demon1.cpp | 2 | ||||
-rw-r--r-- | engines/startrek/rooms/demon3.cpp | 2 | ||||
-rw-r--r-- | engines/startrek/rooms/feather1.cpp | 2 | ||||
-rw-r--r-- | engines/startrek/rooms/lovea.cpp | 22 | ||||
-rw-r--r-- | engines/startrek/rooms/mudd4.cpp | 6 | ||||
-rw-r--r-- | engines/startrek/rooms/sins2.cpp | 4 | ||||
-rw-r--r-- | engines/startrek/rooms/trial0.cpp | 4 | ||||
-rw-r--r-- | engines/startrek/rooms/tug0.cpp | 8 | ||||
-rw-r--r-- | engines/startrek/rooms/tug3.cpp | 6 | ||||
-rw-r--r-- | engines/startrek/rooms/veng1.cpp | 2 | ||||
-rw-r--r-- | engines/startrek/rooms/veng2.cpp | 6 | ||||
-rw-r--r-- | engines/startrek/rooms/venga.cpp | 6 |
12 files changed, 35 insertions, 35 deletions
diff --git a/engines/startrek/rooms/demon1.cpp b/engines/startrek/rooms/demon1.cpp index 899f76095c..0e64e6dff2 100644 --- a/engines/startrek/rooms/demon1.cpp +++ b/engines/startrek/rooms/demon1.cpp @@ -249,7 +249,7 @@ void Room::demon1KlingonDropsHand() { if (_roomVar.demon.numKlingonsKilled == 3) return; - showText(TX_SPEAKER_KLINGON, TX_DEM1_F23); + showText(TX_SPEAKER_KLINGON, 23 + FOLLOWUP_MESSAGE_OFFSET, true); _awayMission->timers[1] = 1; } diff --git a/engines/startrek/rooms/demon3.cpp b/engines/startrek/rooms/demon3.cpp index 1218292bfb..9b8b34b3e6 100644 --- a/engines/startrek/rooms/demon3.cpp +++ b/engines/startrek/rooms/demon3.cpp @@ -459,7 +459,7 @@ void Room::demon3GetMiner() { void Room::demon3TalkToMiner() { if (!_awayMission->demon.healedMiner) return; - showText(TX_SPEAKER_KANDREY, TX_DEM3_F21); + showText(TX_SPEAKER_KANDREY, 21 + FOLLOWUP_MESSAGE_OFFSET, true); } void Room::demon3TalkToKirk() { diff --git a/engines/startrek/rooms/feather1.cpp b/engines/startrek/rooms/feather1.cpp index ada6e6693f..5decbf26a6 100644 --- a/engines/startrek/rooms/feather1.cpp +++ b/engines/startrek/rooms/feather1.cpp @@ -314,7 +314,7 @@ void Room::feather1UseSnakeOnKirk() { } void Room::feather1UseSnakeOnMccoy() { - showText(TX_SPEAKER_MCCOY, TX_FEA1_F25); + showText(TX_SPEAKER_MCCOY, 25 + FOLLOWUP_MESSAGE_OFFSET, true); } void Room::feather1UseSnakeOnRedshirt() { diff --git a/engines/startrek/rooms/lovea.cpp b/engines/startrek/rooms/lovea.cpp index 12dc564916..3fd2dd795b 100644 --- a/engines/startrek/rooms/lovea.cpp +++ b/engines/startrek/rooms/lovea.cpp @@ -81,7 +81,7 @@ void Room::loveaUseCureSampleOnSpock() { walkCrewman(OBJECT_SPOCK, _roomVar.love.cmnXPosToCureSpock, _roomVar.love.cmnYPosToCureSpock, 99); walkCrewman(OBJECT_MCCOY, _roomVar.love.cmnXPosToCureSpock, _roomVar.love.cmnYPosToCureSpock + 10, 99); } else - showText(TX_SPEAKER_MCCOY, TX_LOVA_F55); + showText(TX_SPEAKER_MCCOY, 55 + COMMON_MESSAGE_OFFSET, true); } @@ -123,13 +123,13 @@ void Room::loveaTimer2Expired() { showText(TX_SPEAKER_SPOCK, TX_SPOKCOFF); _awayMission->love.spockInfectionCounter++; } else if (_awayMission->love.spockInfectionCounter == 30) { - showText(TX_SPEAKER_MCCOY, TX_LOVA_F08); + showText(TX_SPEAKER_MCCOY, 8 + COMMON_MESSAGE_OFFSET, true); _awayMission->love.spockInfectionCounter++; } else if (_awayMission->love.spockInfectionCounter == 45) { showText(TX_SPEAKER_SPOCK, TX_SPOKCOFF); _awayMission->love.spockInfectionCounter++; } else if (_awayMission->love.spockInfectionCounter == 60) { - showText(TX_SPEAKER_SPOCK, TX_LOVA_F54); + showText(TX_SPEAKER_SPOCK, 54 + COMMON_MESSAGE_OFFSET, true); _awayMission->love.romulansUnconsciousFromVirus = true; _awayMission->love.spockInfectionCounter++; } @@ -144,26 +144,26 @@ void Room::loveaUseMTricorderOnSpock() { playSoundEffectIndex(SND_TRICORDER); if (_awayMission->love.spockCured) - showText(TX_SPEAKER_MCCOY, TX_LOVA_F01); + showText(TX_SPEAKER_MCCOY, 1 + COMMON_MESSAGE_OFFSET, true); else if (!_awayMission->love.knowAboutVirus) - showText(TX_SPEAKER_MCCOY, TX_LOVA_F02); + showText(TX_SPEAKER_MCCOY, 2 + COMMON_MESSAGE_OFFSET, true); else if (_awayMission->love.spockInfectionCounter < 10) - showText(TX_SPEAKER_MCCOY, TX_LOVA_F04); + showText(TX_SPEAKER_MCCOY, 4 + COMMON_MESSAGE_OFFSET, true); else if (_awayMission->love.spockInfectionCounter < 30) - showText(TX_SPEAKER_MCCOY, TX_LOVA_F03); + showText(TX_SPEAKER_MCCOY, 3 + COMMON_MESSAGE_OFFSET, true); else if (_awayMission->love.spockInfectionCounter < 50) - showText(TX_SPEAKER_MCCOY, TX_LOVA_F08); + showText(TX_SPEAKER_MCCOY, 8 + COMMON_MESSAGE_OFFSET, true); else if (_awayMission->love.spockInfectionCounter < 70) // BUGFIX: < 70 instead of == 70 showText(TX_SPEAKER_MCCOY, COMMON_MESSAGE_OFFSET + 10, true); // TX_TUG2_010 else if (_awayMission->love.spockInfectionCounter < 100) - showText(TX_SPEAKER_MCCOY, TX_LOVA_F10); + showText(TX_SPEAKER_MCCOY, 10 + COMMON_MESSAGE_OFFSET, true); else showText(TX_SPEAKER_MCCOY, COMMON_MESSAGE_OFFSET + 100); } void Room::loveaUseMTricorderOnHuman() { playSoundEffectIndex(SND_TRICORDER); - showText(TX_SPEAKER_MCCOY, TX_LOVA_F07); + showText(TX_SPEAKER_MCCOY, 7 + COMMON_MESSAGE_OFFSET, true); } void Room::loveaUseRomulanLaughingGas() { @@ -200,7 +200,7 @@ void Room::loveaUseCommunicator() { showText(TX_SPEAKER_KIRK, TX_MUD4_018); showText(TX_SPEAKER_UHURA, TX_BRIDU146); - showText(TX_SPEAKER_KIRK, TX_VENA_F41); + showText(TX_SPEAKER_KIRK, 41 + COMMON_MESSAGE_OFFSET, true); _awayMission->love.contactedEnterpriseBeforeCure = true; } diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp index 4cbb8a31b8..9118aff823 100644 --- a/engines/startrek/rooms/mudd4.cpp +++ b/engines/startrek/rooms/mudd4.cpp @@ -280,14 +280,14 @@ void Room::mudd4KirkUsedCommunications() { if (!_awayMission->mudd.contactedEnterpriseFirstTime) { _awayMission->mudd.missionScore++; showText(TX_SPEAKER_KIRK, 25, true); - showText(TX_SPEAKER_SCOTT, TX_MUD4_S02); + showText(TX_SPEAKER_SCOTT, 2 + SCOTTY_MESSAGE_OFFSET, true); if (_awayMission->mudd.torpedoStatus == 1) showText(TX_SPEAKER_KIRK, 27, true); else showText(TX_SPEAKER_KIRK, 28, true); - showText(TX_SPEAKER_SCOTT, TX_MUD4_S04); + showText(TX_SPEAKER_SCOTT, 4 + SCOTTY_MESSAGE_OFFSET, true); const TextRef choices[] = { TX_SPEAKER_KIRK, @@ -316,7 +316,7 @@ void Room::mudd4KirkUsedCommunications() { }; showText(TX_SPEAKER_KIRK, 20, true); - showText(TX_SPEAKER_SCOTT, TX_MUD4_S03); + showText(TX_SPEAKER_SCOTT, 3 + SCOTTY_MESSAGE_OFFSET, true); int choice = showMultipleTexts(choices); if (choice == 1) { diff --git a/engines/startrek/rooms/sins2.cpp b/engines/startrek/rooms/sins2.cpp index b045f0113e..2d6fb5ad81 100644 --- a/engines/startrek/rooms/sins2.cpp +++ b/engines/startrek/rooms/sins2.cpp @@ -228,7 +228,7 @@ void Room::sins2Tick40() { 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_MCCOY, 26 + FOLLOWUP_MESSAGE_OFFSET, true); showText(TX_SPEAKER_UHURA, 96, true); showText(TX_SPEAKER_MCCOY, 19, true); showText(TX_SPEAKER_KIRK, 4, true); @@ -294,7 +294,7 @@ void Room::sins2LookAtDoor() { void Room::sins2UseSpockOnDoor() { if (!_awayMission->sins.openedInnerDoor) { - showText(TX_SPEAKER_SPOCK, TX_SIN2_F12); + showText(TX_SPEAKER_SPOCK, 12 + FOLLOWUP_MESSAGE_OFFSET, true); showText(TX_SPEAKER_MOSHER, 48, true); showText(TX_SPEAKER_SPOCK, 30, true); } diff --git a/engines/startrek/rooms/trial0.cpp b/engines/startrek/rooms/trial0.cpp index 1a4a778445..e1d45e609e 100644 --- a/engines/startrek/rooms/trial0.cpp +++ b/engines/startrek/rooms/trial0.cpp @@ -249,7 +249,7 @@ void Room::trial0TalkToVlict() { } void Room::trial0TalkToGuard() { - showText(TX_SPEAKER_KLINGON_GUARD, TX_TRI0_F24); + showText(TX_SPEAKER_KLINGON_GUARD, 24 + FOLLOWUP_MESSAGE_OFFSET, true); showText(TX_SPEAKER_BENNIE, 65, true); showText(TX_SPEAKER_KIRK, 7, true); showText(TX_SPEAKER_BENNIE, 64, true); @@ -285,7 +285,7 @@ void Room::trial0UseSnakeOnVlict() { void Room::trial0UseSnakeOnGuard() { // Unused, since the snake item doesn't carry over to the courtroom - showText(TX_SPEAKER_KLINGON_GUARD, TX_TRI0_F24); + showText(TX_SPEAKER_KLINGON_GUARD, 24 + FOLLOWUP_MESSAGE_OFFSET, true); } void Room::trial0UseMTricorderOnQuetzecoatl() { diff --git a/engines/startrek/rooms/tug0.cpp b/engines/startrek/rooms/tug0.cpp index df9aab88b9..912b44e703 100644 --- a/engines/startrek/rooms/tug0.cpp +++ b/engines/startrek/rooms/tug0.cpp @@ -179,7 +179,7 @@ void Room::tug0MccoyHealedEngineer() { } void Room::tug0EngineerGotUp() { - showText(TX_SPEAKER_SIMPSON, TX_TUG0_F31); + showText(TX_SPEAKER_SIMPSON, 31 + FOLLOWUP_MESSAGE_OFFSET, true); _awayMission->tug.engineerConscious = true; loadActorAnim2(8, "tcshow", 0x27, 0xa8, 0); loadActorAnim2(9, "popen", 0x27, 0xa9, 0); @@ -329,9 +329,9 @@ void Room::tug0BombExploded() { showText(TX_SPEAKER_SPOCK, 37, true); showText(TX_SPEAKER_MCCOY, 27, true); showText(TX_SPEAKER_KIRK, 4, true); - showText(TX_SPEAKER_SCOTT, TX_TUG0_S11); + showText(TX_SPEAKER_SCOTT, 11 + SCOTTY_MESSAGE_OFFSET, true); showText(TX_SPEAKER_KIRK, 3, true); - showText(TX_SPEAKER_SCOTT, TX_TUG0_S06); + showText(TX_SPEAKER_SCOTT, 6 + SCOTTY_MESSAGE_OFFSET, true); _awayMission->tug.field2d = 1; _awayMission->disableInput = true; @@ -433,7 +433,7 @@ void Room::tug0TalkToRedshirt() { void Room::tug0TalkToEngineer() { if (_awayMission->tug.engineerConscious) { - showText(TX_SPEAKER_SIMPSON, TX_TUG0_F30); + showText(TX_SPEAKER_SIMPSON, 30 + FOLLOWUP_MESSAGE_OFFSET, true); showText(TX_SPEAKER_MCCOY, 26, true); showText(TX_SPEAKER_KIRK, 12, true); } diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp index 6374983967..c16d58eba0 100644 --- a/engines/startrek/rooms/tug3.cpp +++ b/engines/startrek/rooms/tug3.cpp @@ -246,7 +246,7 @@ void Room::tug3TalkToElasi1() { case 1: // Cereth shoots console, doesn't surrender _awayMission->disableInput = true; - showText(TX_SPEAKER_ELASI_CERETH, TX_TUG3_F27); + showText(TX_SPEAKER_ELASI_CERETH, 27 + FOLLOWUP_MESSAGE_OFFSET, true); loadActorAnim2(OBJECT_ELASI_1, "p1draw", -1, -1, 3); break; @@ -389,7 +389,7 @@ void Room::tug3UseCommunicator() { } else { if (_awayMission->tug.orbitalDecayCounter < 16) { showText(TX_SPEAKER_KIRK, 6, true); - showText(TX_SPEAKER_SCOTT, TX_TUG3_S07); + showText(TX_SPEAKER_SCOTT, 7 + SCOTTY_MESSAGE_OFFSET, true); playMidiMusicTracks(-1, -1); @@ -482,7 +482,7 @@ void Room::tug3SecurityTeamBeamedIn() { loadActorAnim2(OBJECT_15, "rfiren", -1, -1, 10); showText(TX_SPEAKER_KIRK, 5, true); - showText(TX_SPEAKER_SCOTT, TX_TUG3_S08); + showText(TX_SPEAKER_SCOTT, 8 + SCOTTY_MESSAGE_OFFSET, true); playMidiMusicTracks(-1, -1); _awayMission->disableInput = true; diff --git a/engines/startrek/rooms/veng1.cpp b/engines/startrek/rooms/veng1.cpp index 82c4036223..48578a2c02 100644 --- a/engines/startrek/rooms/veng1.cpp +++ b/engines/startrek/rooms/veng1.cpp @@ -294,7 +294,7 @@ void Room::veng1KirkAccessedPanel() { loadActorAnim2(OBJECT_DEBRIS, "s7r1p2", 0xd1, 0x6a); loadActorStandAnim(OBJECT_PANEL); } else - showDescription(TX_VEN1_F33); + showDescription(33 + FOLLOWUP_MESSAGE_OFFSET, true); walkCrewman(OBJECT_KIRK, 0xc9, 0x98); } diff --git a/engines/startrek/rooms/veng2.cpp b/engines/startrek/rooms/veng2.cpp index 15b81ab640..72be99376b 100644 --- a/engines/startrek/rooms/veng2.cpp +++ b/engines/startrek/rooms/veng2.cpp @@ -578,8 +578,8 @@ void Room::veng2KirkFiredTorpedo() { void Room::veng2TorpedoStruckElasiShip() { loadActorAnim2(OBJECT_VIEWSCREEN, "s7r2p1", VIEWSCREEN_X, VIEWSCREEN_Y); 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_WEAPONS_MASTER, 29 + FOLLOWUP_MESSAGE_OFFSET, true); + showText(TX_SPEAKER_ELASI_CREWMAN, 28 + FOLLOWUP_MESSAGE_OFFSET, true); showText(TX_SPEAKER_ELASI_CAPTAIN, 101, true); showText(TX_SPEAKER_KIRK, 14, true); showText(TX_SPEAKER_ELASI_CAPTAIN, 106, true); @@ -619,7 +619,7 @@ void Room::veng2CrewmanInPositionToBeamOut() { } void Room::veng2UseSTricorderOnTorpedoButton() { - spockScan(DIR_N, TX_VEN2_F35); // ENHANCEMENT: Use spockScan (don't just show text) + spockScan(DIR_N, 35 + FOLLOWUP_MESSAGE_OFFSET, true); // ENHANCEMENT: Use spockScan (don't just show text) } void Room::veng2UseSTricorderOnMiddleConsole() { diff --git a/engines/startrek/rooms/venga.cpp b/engines/startrek/rooms/venga.cpp index 57a4ec25aa..5efb7316a4 100644 --- a/engines/startrek/rooms/venga.cpp +++ b/engines/startrek/rooms/venga.cpp @@ -60,7 +60,7 @@ void Room::vengaTick() { _awayMission->veng.counterUntilElasiDestroyShip--; if (_awayMission->veng.counterUntilElasiDestroyShip == 0 && !_awayMission->veng.firedTorpedo) { // Elasi fire torpedoes at you since you wouldn't lower your shields. - showDescription(TX_VENA_F40); + showDescription(40 + COMMON_MESSAGE_OFFSET, true); showGameOverMenu(); return; } @@ -76,12 +76,12 @@ void Room::vengaTick() { } void Room::vengaElasiBeamOver() { - showDescription(TX_VENA_F32); + showDescription(32 + COMMON_MESSAGE_OFFSET, true); showGameOverMenu(); } void Room::vengaUsePhaserAnywhere() { - showText(TX_SPEAKER_SPOCK, TX_VENA_F34); + showText(TX_SPEAKER_SPOCK, 34 + COMMON_MESSAGE_OFFSET, true); } void Room::vengaLookAtHypo() { |