[Scummvm-git-logs] scummvm master -> 31f2fc675cf52d6f1712feb2d4a561455bfb1768
bluegr
bluegr at gmail.com
Mon Feb 15 01:27:18 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2a6a3637ea STARTREK: Remove some obsolete TODOs
31f2fc675c STARTREK: Convert more rooms to the new text resource format
Commit: 2a6a3637ea3fcf20158318f847ecf7190a2fca13
https://github.com/scummvm/scummvm/commit/2a6a3637ea3fcf20158318f847ecf7190a2fca13
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-02-15T03:26:58+02:00
Commit Message:
STARTREK: Remove some obsolete TODOs
Changed paths:
engines/startrek/rooms/demon1.cpp
diff --git a/engines/startrek/rooms/demon1.cpp b/engines/startrek/rooms/demon1.cpp
index bdcfe88744..e3db4720b0 100644
--- a/engines/startrek/rooms/demon1.cpp
+++ b/engines/startrek/rooms/demon1.cpp
@@ -288,7 +288,6 @@ void Room::demon1Timer1Expired() {
strcpy(_roomVar.demon.d6, "klg1fk");
break;
default:
- // TODO
return;
}
} else if (!_roomVar.demon.klingonShot[1]) {
@@ -308,7 +307,6 @@ void Room::demon1Timer1Expired() {
strcpy(_roomVar.demon.d6, "klg2fk");
break;
default:
- // TODO
return;
}
} else {
@@ -328,7 +326,6 @@ void Room::demon1Timer1Expired() {
strcpy(_roomVar.demon.d6, "klg3fk");
break;
default:
- // TODO
return;
}
}
Commit: 31f2fc675cf52d6f1712feb2d4a561455bfb1768
https://github.com/scummvm/scummvm/commit/31f2fc675cf52d6f1712feb2d4a561455bfb1768
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-02-15T03:26:59+02:00
Commit Message:
STARTREK: Convert more rooms to the new text resource format
Changed paths:
engines/startrek/room.cpp
engines/startrek/rooms/function_map.h
engines/startrek/rooms/love5.cpp
engines/startrek/rooms/mudd1.cpp
engines/startrek/rooms/mudd2.cpp
engines/startrek/rooms/mudda.cpp
engines/startrek/rooms/trial1.cpp
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index 80d67363dc..c6443944a1 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -71,8 +71,8 @@ Room::Room(StarTrekEngine *vm, const Common::String &name) : _vm(vm), _awayMissi
ADD_ROOM(love5)
ADD_ROOM_COMMON(love)
ADD_ROOM(mudd0)
- //ADD_ROOM(mudd1)
- //ADD_ROOM(mudd2)
+ ADD_ROOM(mudd1)
+ ADD_ROOM(mudd2)
//ADD_ROOM(mudd3)
//ADD_ROOM(mudd4)
//ADD_ROOM(mudd5)
@@ -86,7 +86,7 @@ Room::Room(StarTrekEngine *vm, const Common::String &name) : _vm(vm), _awayMissi
ADD_ROOM(feather6)
ADD_ROOM(feather7)
ADD_ROOM(trial0)
- //ADD_ROOM(trial1)
+ ADD_ROOM(trial1)
//ADD_ROOM(trial2)
//ADD_ROOM(trial3)
//ADD_ROOM(trial4)
diff --git a/engines/startrek/rooms/function_map.h b/engines/startrek/rooms/function_map.h
index b34f5eaeb3..b1c70b2717 100644
--- a/engines/startrek/rooms/function_map.h
+++ b/engines/startrek/rooms/function_map.h
@@ -48,9 +48,9 @@ extern const RoomTextOffsets loveTextOffsets[];
extern const RoomAction mudd0ActionList[], mudd1ActionList[], mudd2ActionList[], mudd3ActionList[];
extern const RoomAction mudd4ActionList[], mudd5ActionList[];
-extern const RoomTextOffsets mudd0TextOffsets[];//, mudd1TextOffsets[], mudd2TextOffsets[], mudd3TextOffsets[];
+extern const RoomTextOffsets mudd0TextOffsets[], mudd1TextOffsets[], mudd2TextOffsets[];//, mudd3TextOffsets[];
//extern const RoomTextOffsets mudd4TextOffsets[], mudd5TextOffsets[];
-extern const RoomText mudd0Texts[];//, mudd1Texts[], mudd2Texts[], mudd3Texts[];
+extern const RoomText mudd0Texts[], mudd1Texts[], mudd2Texts[];//, mudd3Texts[];
//extern const RoomText mudd4Texts[], mudd5Texts[];
extern const RoomTextOffsets muddTextOffsets[];
@@ -63,9 +63,9 @@ extern const RoomText feather4Texts[], feather5Texts[], feather6Texts[], feather
extern const RoomAction trial0ActionList[], trial1ActionList[], trial2ActionList[], trial3ActionList[];
extern const RoomAction trial4ActionList[], trial5ActionList[];
-extern const RoomTextOffsets trial0TextOffsets[];//, trial1TextOffsets[], trial2TextOffsets[], trial3TextOffsets[];
+extern const RoomTextOffsets trial0TextOffsets[], trial1TextOffsets[];//, trial2TextOffsets[], trial3TextOffsets[];
//extern const RoomTextOffsets trial4TextOffsets[], trial5TextOffsets[];
-extern const RoomText trial0Texts[];//, trial1Texts[], trial2Texts[], trial3Texts[];
+extern const RoomText trial0Texts[], trial1Texts[];//, trial2Texts[], trial3Texts[];
//extern const RoomText trial4Texts[], trial5Texts[];
extern const RoomTextOffsets trialTextOffsets[];
diff --git a/engines/startrek/rooms/love5.cpp b/engines/startrek/rooms/love5.cpp
index 6017dfe056..e2d71247b4 100644
--- a/engines/startrek/rooms/love5.cpp
+++ b/engines/startrek/rooms/love5.cpp
@@ -123,7 +123,7 @@ enum love5TextIds {
TX_LOV5N003, TX_LOV5N004, TX_LOV5N005, TX_LOV5N006, TX_LOV5N007,
TX_LOV5N008, TX_LOV5N009, TX_LOV5N010, TX_LOV5N011, TX_LOV5N012,
TX_LOV5N013, TX_LOV5N014, TX_LOV5N016, TX_LOV5N017, TX_LOV5N018,
- TX_LOV5C001, TX_G_024, TX_DIALOG_ERROR
+ /*TX_LOV5C001,*/ TX_DEM0N009, TX_G_024, TX_DIALOG_ERROR
};
// TODO: Finish floppy offsets
@@ -247,13 +247,14 @@ extern const RoomTextOffsets love5TextOffsets[] = {
{ TX_LOV5N016, 9311, 0 },
{ TX_LOV5N017, 4320, 0 },
{ TX_LOV5N018, 3805, 0 },
- { TX_LOV5C001, 1598, 0 },
+ //{ TX_LOV5C001, 1598, 0 },
{ TX_DIALOG_ERROR, 11927, 0 },
{ -1, 0, 0 }
};
extern const RoomText love5Texts[] = {
- { -1, Common::UNK_LANG, "" }
+ { TX_DEM0N009, Common::EN_ANY, "#DEM0\\DEM0N009#Spock raises an eyebrow" },
+ { -1, Common::UNK_LANG, "" }
};
void Room::love5Tick1() {
@@ -400,8 +401,9 @@ void Room::love5TalkToPreax() {
showText(TX_SPEAKER_PREAX, TX_LOV5_061);
showText(TX_SPEAKER_KIRK, TX_LOV5_010);
- // NOTE: This just says "(Spock raises an eyebrow)". No audio associated.
- showText(TX_SPEAKER_SPOCK, TX_LOV5C001);
+ // ENHANCEMENT: Original text was just "(Spock raises eyebrow)" without any audio.
+ // This changes it to a narration to make it flow better.
+ showText(TX_SPEAKER_SPOCK, TX_DEM0N009);
showText(TX_SPEAKER_MCCOY, TX_LOV5_032);
@@ -437,8 +439,9 @@ void Room::love5MccoyCuredSpock() {
showText(TX_SPEAKER_MCCOY, TX_LOV5_030);
showText(TX_SPEAKER_SPOCK, TX_LOV5_038);
showText(TX_SPEAKER_MCCOY, TX_LOV5_027);
- // NOTE: This just says "(Spock raises an eyebrow)". No audio associated.
- showText(TX_SPEAKER_SPOCK, TX_LOV5C001);
+ // ENHANCEMENT: Original text was just "(Spock raises eyebrow)" without any audio.
+ // This changes it to a narration to make it flow better.
+ showText(TX_SPEAKER_SPOCK, TX_DEM0N009);
love5EndMission();
}
diff --git a/engines/startrek/rooms/mudd1.cpp b/engines/startrek/rooms/mudd1.cpp
index 8cfe1b7952..859435cd9c 100644
--- a/engines/startrek/rooms/mudd1.cpp
+++ b/engines/startrek/rooms/mudd1.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_CRANE 8
@@ -110,20 +109,73 @@ extern const RoomAction mudd1ActionList[] = {
};
enum mudd1TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_EVERTS,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_UHURA, TX_SPEAKER_BUCHERT,
+ TX_MUD1_001, TX_MUD1_003, TX_MUD1_004, TX_MUD1_005, TX_MUD1_006,
+ TX_MUD1_007, TX_MUD1_008, TX_MUD1_009, TX_MUD1_010, TX_MUD1_011,
+ TX_MUD1_012, TX_MUD1_013, TX_MUD1_014, TX_MUD1_015, TX_MUD1_016,
+ TX_MUD1_017, TX_MUD1_019, TX_MUD1_020, TX_MUD1_021, TX_MUD1_022,
+ TX_MUD1_023, TX_MUD1_024, TX_MUD1_025, TX_MUD1_026, TX_MUD1_027,
+ TX_MUD1_028, TX_MUD1N000, TX_MUD1N001, TX_MUD1N002, TX_MUD1N003,
+ TX_MUD1N005, TX_MUD1N006, TX_MUD1N007, TX_MUD1N008, TX_MUD1N009,
+ TX_MUD1N010, TX_MUD1N011, TX_MUD1N012, TX_MUD1N014, TX_MUD1N015,
+ TX_MUD1N016, TX_STATICU1, TX_DEM0N009
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd1TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
- //{ TX_SPEAKER_EVERTS, 2642, 0 },
+ { TX_SPEAKER_KIRK, 3119, 0 },
+ { TX_SPEAKER_MCCOY, 3130, 0 },
+ { TX_SPEAKER_SPOCK, 3140, 0 },
+ { TX_SPEAKER_UHURA, 3162, 0 },
+ { TX_SPEAKER_BUCHERT, 3150, 0 },
+ { TX_MUD1_001, 471, 0 },
+ { TX_MUD1_003, 5160, 0 },
+ { TX_MUD1_004, 5023, 0 },
+ { TX_MUD1_005, 5885, 0 },
+ { TX_MUD1_006, 5744, 0 },
+ { TX_MUD1_007, 5231, 0 },
+ { TX_MUD1_008, 5971, 0 },
+ { TX_MUD1_009, 3561, 0 },
+ { TX_MUD1_010, 3751, 0 },
+ { TX_MUD1_011, 1546, 0 },
+ { TX_MUD1_012, 6082, 0 },
+ { TX_MUD1_013, 5815, 0 },
+ { TX_MUD1_014, 6545, 0 },
+ { TX_MUD1_015, 6647, 0 },
+ { TX_MUD1_016, 6293, 0 },
+ { TX_MUD1_017, 6236, 0 },
+ { TX_MUD1_019, 5916, 0 },
+ { TX_MUD1_020, 4092, 0 },
+ { TX_MUD1_021, 4686, 0 },
+ { TX_MUD1_022, 4582, 0 },
+ { TX_MUD1_023, 4860, 0 },
+ { TX_MUD1_024, 4478, 0 },
+ { TX_MUD1_025, 3906, 0 },
+ { TX_MUD1_026, 3473, 0 },
+ { TX_MUD1_027, 4005, 0 },
+ { TX_MUD1_028, 4309, 0 },
+ { TX_MUD1N000, 6347, 0 },
+ { TX_MUD1N001, 6413, 0 },
+ { TX_MUD1N002, 3291, 0 },
+ { TX_MUD1N003, 3411, 0 },
+ { TX_MUD1N005, 5357, 0 },
+ { TX_MUD1N006, 5666, 0 },
+ { TX_MUD1N007, 2457, 0 },
+ { TX_MUD1N008, 5577, 0 },
+ { TX_MUD1N009, 5434, 0 },
+ { TX_MUD1N010, 2649, 0 },
+ { TX_MUD1N011, 3173, 0 },
+ { TX_MUD1N012, 3348, 0 },
+ { TX_MUD1N014, 3704, 0 },
+ { TX_MUD1N015, 6499, 0 },
+ { TX_MUD1N016, 6453, 0 },
+ { TX_STATICU1, 5318, 0 },
{ -1, 0, 0 }
};
extern const RoomText mudd1Texts[] = {
- { -1, Common::UNK_LANG, "" }
+ { TX_DEM0N009, Common::EN_ANY, "#DEM0\\DEM0N009#Spock raises an eyebrow" },
+ { -1, Common::UNK_LANG, "" }
};
void Room::mudd1Tick1() {
@@ -145,8 +197,8 @@ void Room::mudd1Timer1Expired() {
}
void Room::mudd1UseCommunicator() {
- showText(TX_SPEAKER_KIRK, 1);
- showText(TX_SPEAKER_UHURA_GLOBAL, TX_STATICU1);
+ showText(TX_SPEAKER_KIRK, TX_MUD1_001);
+ showText(TX_SPEAKER_UHURA, TX_STATICU1);
}
@@ -180,9 +232,9 @@ void Room::mudd1CraneFinishedMoving() {
walkCrewman(OBJECT_SPOCK, 0x43, 0x9f);
if (_awayMission->mudd.torpedoLoaded)
- showText(TX_SPEAKER_SPOCK, 17);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_017);
else
- showText(TX_SPEAKER_SPOCK, 16);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_016);
}
@@ -227,19 +279,19 @@ void Room::mudd1SpockReachedRedButton() {
void Room::mudd1SpockPressedRedButton() {
walkCrewman(OBJECT_SPOCK, 0x43, 0x9f);
- showText(TX_SPEAKER_SPOCK, 22);
- showText(TX_SPEAKER_SPOCK, 21);
- showText(TX_SPEAKER_SPOCK, 23);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_022);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_021);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_023);
_awayMission->disableInput = false;
_awayMission->mudd.knowAboutTorpedo = true;
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- 4,
- 3,
- 7,
- TX_BLANK
+ TX_MUD1_004,
+ TX_MUD1_003,
+ TX_MUD1_007,
+ TX_END
};
int choice = showMultipleTexts(choices);
@@ -250,120 +302,117 @@ void Room::mudd1SpockPressedRedButton() {
// ENHANCEMENT: Original text was just "(Spock raises eyebrow)" without any audio.
// This changes it to a narration to make it flow better.
- // TODO: This needs to be refactored
- //showDescription(TX_DEM0N009);
+ showDescription(TX_DEM0N009);
break;
case 1:
- showText(TX_SPEAKER_KIRK, 7);
+ showText(TX_SPEAKER_KIRK, TX_MUD1_007);
// fall through
case 2:
_awayMission->mudd.torpedoStatus = 1;
- showText(TX_SPEAKER_UHURA_GLOBAL, TX_STATICU1);
- break;
-
- default:
+ showText(TX_SPEAKER_UHURA, TX_STATICU1);
break;
}
}
+
void Room::mudd1GetTorpedo() {
- showDescription(14);
+ showDescription(TX_MUD1N014);
}
void Room::mudd1UseSTricorderOnTorpedo() {
- spockScan(DIR_W, 25, false);
- showText(TX_SPEAKER_BUCHERT, 27);
- showText(TX_SPEAKER_SPOCK, 20);
- showText(TX_SPEAKER_BUCHERT, 28);
- showText(TX_SPEAKER_SPOCK, 24);
+ spockScan(DIR_W, TX_MUD1_025, false);
+ showText(TX_SPEAKER_BUCHERT, TX_MUD1_027);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_020);
+ showText(TX_SPEAKER_BUCHERT, TX_MUD1_028);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_024);
}
void Room::mudd1UseSTricorderOnTorpedoLauncher() {
- spockScan(DIR_W, 10, false);
+ spockScan(DIR_W, TX_MUD1_010, false);
}
void Room::mudd1UseSTricorderOnButton() {
// ENHANCEMENT: Do the whole "spockScan" thing, don't just show the text
- spockScan(DIR_W, 15, false);
+ spockScan(DIR_W, TX_MUD1_015, false);
}
void Room::mudd1UseSTricorderOnCrane() {
// ENHANCEMENT: See above
- spockScan(DIR_N, 14, false);
+ spockScan(DIR_N, TX_MUD1_014, false);
}
void Room::mudd1UseMedkitAnywhere() {
- showText(TX_SPEAKER_MCCOY, 11);
+ showText(TX_SPEAKER_MCCOY, TX_MUD1_011);
}
void Room::mudd1LookAnywhere() {
- showDescription(11);
+ showDescription(TX_MUD1N011);
}
void Room::mudd1LookAtTorpedo() {
- showDescription(2);
+ showDescription(TX_MUD1N002);
}
void Room::mudd1LookAtFallenTorpedo() {
- showDescription(12);
+ showDescription(TX_MUD1N012);
}
void Room::mudd1LookAtTorpedoLauncher() {
- showDescription(3);
+ showDescription(TX_MUD1N003);
}
void Room::mudd1LookAtKirk() {
- showDescription(5);
+ showDescription(TX_MUD1N005);
}
void Room::mudd1LookAtSpock() {
- showDescription(9);
+ showDescription(TX_MUD1N009);
}
void Room::mudd1LookAtMccoy() {
- showDescription(8);
+ showDescription(TX_MUD1N008);
}
void Room::mudd1LookAtRedshirt() {
- showDescription(6);
+ showDescription(TX_MUD1N006);
}
void Room::mudd1LookAtCrane() {
- showDescription(0);
+ showDescription(TX_MUD1N000);
}
void Room::mudd1LookAtRedButton() {
- showDescription(1);
+ showDescription(TX_MUD1N001);
}
void Room::mudd1LookAtBlueButton() {
- showDescription(15);
+ showDescription(TX_MUD1N015);
}
void Room::mudd1LookAtYellowButton() {
- showDescription(16);
+ showDescription(TX_MUD1N016);
}
void Room::mudd1TalkToKirk() {
- showText(TX_SPEAKER_KIRK, 6);
- showText(TX_SPEAKER_MCCOY, 13);
- showText(TX_SPEAKER_KIRK, 5);
+ showText(TX_SPEAKER_KIRK, TX_MUD1_006);
+ showText(TX_SPEAKER_MCCOY, TX_MUD1_013);
+ showText(TX_SPEAKER_KIRK, TX_MUD1_005);
}
void Room::mudd1TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, 19);
- showText(TX_SPEAKER_KIRK, 8);
+ showText(TX_SPEAKER_SPOCK, TX_MUD1_019);
+ showText(TX_SPEAKER_KIRK, TX_MUD1_008);
}
void Room::mudd1TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, 12);
+ showText(TX_SPEAKER_MCCOY, TX_MUD1_012);
}
void Room::mudd1TalkToRedshirt() {
- showText(TX_SPEAKER_BUCHERT, 26);
- showText(TX_SPEAKER_KIRK, 9);
+ showText(TX_SPEAKER_BUCHERT, TX_MUD1_026);
+ showText(TX_SPEAKER_KIRK, TX_MUD1_009);
}
void Room::mudd1WalkToSouthDoor() {
@@ -405,4 +454,3 @@ void Room::mudd1TouchedHotspot0() { // Trigger door at west of room
}
}
-#endif
diff --git a/engines/startrek/rooms/mudd2.cpp b/engines/startrek/rooms/mudd2.cpp
index e3065fab78..8b559b6704 100644
--- a/engines/startrek/rooms/mudd2.cpp
+++ b/engines/startrek/rooms/mudd2.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_MUDD 8
@@ -105,15 +104,94 @@ extern const RoomAction mudd2ActionList[] = {
};
enum mudd2TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_EVERTS,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_UHURA, TX_SPEAKER_BUCHERT,
+ TX_SPEAKER_MUDD,
+ TX_MUD2_001, TX_MUD2_002, TX_MUD2_003, TX_MUD2_004, TX_MUD2_005,
+ TX_MUD2_006, TX_MUD2_007, TX_MUD2_008, TX_MUD2_009, TX_MUD2_010,
+ TX_MUD2_011, TX_MUD2_012, TX_MUD2_013, TX_MUD2_014, TX_MUD2_015,
+ TX_MUD2_016, TX_MUD2_018, TX_MUD2_019, TX_MUD2_020, TX_MUD2_021,
+ TX_MUD2_022, TX_MUD2_023, TX_MUD2_024, TX_MUD2_025, TX_MUD2_026,
+ TX_MUD2_027, TX_MUD2_028, TX_MUD2_029, TX_MUD2_030, TX_MUD2_031,
+ TX_MUD2_032, TX_MUD2_033, TX_MUD2_034, TX_MUD2_035, TX_MUD2_036,
+ TX_MUD2_037, TX_MUD2_038, TX_MUD2_039, TX_MUD2_040, TX_MUD2_042,
+ TX_MUD2_043, TX_MUD2_044, TX_MUD2_045, TX_MUD2_046, TX_MUD2_047,
+ TX_MUD2_048, TX_MUD2_049, TX_MUD2_050, TX_MUD2_051, TX_MUD2_052,
+ TX_MUD2_053, TX_MUD2_054, TX_MUD2_055, TX_MUD2N000, TX_MUD2N002,
+ TX_MUD2N003, TX_MUD2N004, TX_MUD2N005, TX_MUD2N006, TX_MUD2N007,
+ TX_MUD2N008, TX_MUD2N011, TX_STATICU1
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd2TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
- //{ TX_SPEAKER_EVERTS, 2642, 0 },
+ { TX_SPEAKER_KIRK, 333, 0 },
+ { TX_SPEAKER_MCCOY, 344, 0 },
+ { TX_SPEAKER_SPOCK, 354, 0 },
+ { TX_SPEAKER_UHURA, 376, 0 },
+ { TX_SPEAKER_BUCHERT, 364, 0 },
+ { TX_SPEAKER_MUDD, 386, 0 },
+ { TX_MUD2_001, 5240, 0 },
+ { TX_MUD2_002, 1977, 0 },
+ { TX_MUD2_003, 8694, 0 },
+ { TX_MUD2_004, 2392, 0 },
+ { TX_MUD2_005, 8288, 0 },
+ { TX_MUD2_006, 10058, 0 },
+ { TX_MUD2_007, 9467, 0 },
+ { TX_MUD2_008, 9763, 0 },
+ { TX_MUD2_009, 1719, 0 },
+ { TX_MUD2_010, 9121, 0 },
+ { TX_MUD2_011, 9266, 0 },
+ { TX_MUD2_012, 5126, 0 },
+ { TX_MUD2_013, 5690, 0 },
+ { TX_MUD2_014, 2729, 0 },
+ { TX_MUD2_015, 5973, 0 },
+ { TX_MUD2_016, 5875, 0 },
+ { TX_MUD2_018, 1307, 0 },
+ { TX_MUD2_019, 2458, 0 },
+ { TX_MUD2_020, 2937, 0 },
+ { TX_MUD2_021, 6114, 0 },
+ { TX_MUD2_022, 3515, 0 },
+ { TX_MUD2_023, 10226, 0 },
+ { TX_MUD2_024, 10113, 0 },
+ { TX_MUD2_025, 9366, 0 },
+ { TX_MUD2_026, 4089, 0 },
+ { TX_MUD2_027, 8547, 0 },
+ { TX_MUD2_028, 9050, 0 },
+ { TX_MUD2_029, 3045, 0 },
+ { TX_MUD2_030, 2232, 0 },
+ { TX_MUD2_031, 4278, 0 },
+ { TX_MUD2_032, 3764, 0 },
+ { TX_MUD2_033, 6423, 0 },
+ { TX_MUD2_034, 3292, 0 },
+ { TX_MUD2_035, 8400, 0 },
+ { TX_MUD2_036, 8737, 0 },
+ { TX_MUD2_037, 1165, 0 },
+ { TX_MUD2_038, 8446, 0 },
+ { TX_MUD2_039, 3202, 0 },
+ { TX_MUD2_040, 9223, 0 },
+ { TX_MUD2_042, 4656, 0 },
+ { TX_MUD2_043, 4831, 0 },
+ { TX_MUD2_044, 3575, 0 },
+ { TX_MUD2_045, 6564, 0 },
+ { TX_MUD2_046, 8342, 0 },
+ { TX_MUD2_047, 9841, 0 },
+ { TX_MUD2_048, 8883, 0 },
+ { TX_MUD2_049, 3917, 0 },
+ { TX_MUD2_050, 4442, 0 },
+ { TX_MUD2_051, 4190, 0 },
+ { TX_MUD2_052, 5521, 0 },
+ { TX_MUD2_053, 4525, 0 },
+ { TX_MUD2_054, 9535, 0 },
+ { TX_MUD2_055, 8611, 0 },
+ { TX_MUD2N000, 7954, 0 },
+ { TX_MUD2N002, 8128, 0 },
+ { TX_MUD2N003, 7795, 0 },
+ { TX_MUD2N004, 8028, 0 },
+ { TX_MUD2N005, 7449, 0 },
+ { TX_MUD2N006, 7899, 0 },
+ { TX_MUD2N007, 10590, 0 },
+ { TX_MUD2N008, 2122, 0 },
+ { TX_MUD2N011, 10479, 0 },
+ { TX_STATICU1, 1756, 0 },
{ -1, 0, 0 }
};
@@ -183,21 +261,21 @@ void Room::mudd2Timer1Expired() {
}
void Room::mudd2UseSTricorderAnywhere() {
- spockScan(DIR_S, 37, false);
+ spockScan(DIR_S, TX_MUD2_037, false);
}
void Room::mudd2UseSpockOnCapsules() {
- showText(TX_SPEAKER_MCCOY, 18);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_018);
}
void Room::mudd2GetCapsules() {
if (!_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
if (!_awayMission->mudd.translatedAlienLanguage)
- showText(TX_SPEAKER_MCCOY, 24);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_024);
else
walkCrewmanC(OBJECT_MCCOY, 0x9f, 0xbf, &Room::mudd2MccoyReachedCapsules);
} else {
- showText(TX_SPEAKER_MCCOY, 23);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_023);
}
}
@@ -212,42 +290,42 @@ void Room::mudd2MccoyPickedUpCapsules() {
}
void Room::mudd2UseCommunicator() {
- showText(TX_SPEAKER_KIRK, TX_MUD4_018); // originally TX_MUD4_019, this matches the audio
- showText(TX_SPEAKER_UHURA_GLOBAL, TX_STATICU1);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_009);
+ showText(TX_SPEAKER_UHURA, TX_STATICU1);
}
void Room::mudd2LookAtCapsules() {
- showDescription(8);
+ showDescription(TX_MUD2N008);
}
void Room::mudd2UseMTricorderOnCapsules() {
- mccoyScan(DIR_W, 30, false);
- showText(TX_SPEAKER_KIRK, 4);
- showText(TX_SPEAKER_MCCOY, 19);
+ mccoyScan(DIR_W, TX_MUD2_030, false);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_004);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_019);
}
void Room::mudd2UseCapsuleOnControlPanel() {
if (!_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious)
walkCrewmanC(OBJECT_MCCOY, 0x9f, 0xbf, &Room::mudd2MccoyReachedControlPanel);
else
- showText(TX_SPEAKER_MCCOY, 23);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_023);
}
void Room::mudd2MccoyReachedControlPanel() {
if (_awayMission->mudd.translatedAlienLanguage)
loadActorAnimC(OBJECT_MCCOY, "musehn", -1, -1, &Room::mudd2MccoyPutCapsuleInControlPanel);
else // NOTE: Unused, since you can't get capsules without translating the language first
- showText(TX_SPEAKER_MCCOY, 14);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_014);
}
void Room::mudd2MccoyPutCapsuleInControlPanel() {
_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_N;
loadActorStandAnim(OBJECT_MCCOY);
- showText(TX_SPEAKER_MCCOY, 20);
- showText(TX_SPEAKER_MCCOY, 29);
- showText(TX_SPEAKER_SPOCK, 39);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_020);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_029);
+ showText(TX_SPEAKER_SPOCK, TX_MUD2_039);
if (_awayMission->mudd.muddUnconscious)
- showText(TX_SPEAKER_MCCOY, 34);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_034);
_awayMission->mudd.putCapsuleInMedicalMachine = true;
@@ -266,12 +344,12 @@ void Room::mudd2UseKirkOnBed() {
void Room::mudd2KirkReachedBed() {
// BUGFIX: Speaker is mccoy, not none
- showText(TX_SPEAKER_MCCOY, 22);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_022);
}
void Room::mudd2MuddNoticedKirk() {
- showText(TX_SPEAKER_MUDD, 44);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_044);
playVoc("BATTYGAS");
loadActorAnimC(OBJECT_MUDD, "s4sbhb", 0x9f, 0xbf, &Room::mudd2MuddDroppedCapsule); // Drops the capsule
playMidiMusicTracks(0);
@@ -282,12 +360,12 @@ void Room::mudd2MuddDroppedCapsule() {
loadActorAnim2(OBJECT_CAPSULE, "s4sbvp", 0x93, 0xc3);
_awayMission->mudd.muddCurrentlyInsane = true;
- showText(TX_SPEAKER_MCCOY, 32);
- showText(TX_SPEAKER_MUDD, 49);
- showText(TX_SPEAKER_MCCOY, 26);
- showText(TX_SPEAKER_MUDD, 51);
- showText(TX_SPEAKER_MCCOY, 31);
- showText(TX_SPEAKER_MUDD, 50);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_032);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_049);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_026);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_051);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_031);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_050);
_awayMission->disableInput = false;
}
@@ -295,9 +373,9 @@ void Room::mudd2MuddDroppedCapsule() {
void Room::mudd2UsePhaserOnMudd() {
if (_awayMission->mudd.muddInhaledGas && !_awayMission->mudd.muddUnconscious) {
- showText(TX_SPEAKER_BUCHERT, 53);
- showText(TX_SPEAKER_MUDD, 42);
- showText(TX_SPEAKER_MUDD, 43);
+ showText(TX_SPEAKER_BUCHERT, TX_MUD2_053);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_042);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_043);
}
}
@@ -319,7 +397,7 @@ void Room::mudd2SpockPinchedMudd() {
loadActorAnim2(OBJECT_MUDD, "s4sbob", 0x9f, 0xba);
loadActorAnim2(OBJECT_SPOCK, "sstnde", 0xd0, 0xbd);
- showText(TX_SPEAKER_SPOCK, 12);
+ showText(TX_SPEAKER_SPOCK, TX_MUD2_012);
_awayMission->disableInput = false;
_awayMission->mudd.muddUnconscious = true;
@@ -329,12 +407,11 @@ void Room::mudd2SpockPinchedMudd() {
void Room::mudd2UseKirkOnMudd() {
if (_awayMission->mudd.muddInhaledGas && !_awayMission->mudd.muddUnconscious) {
- showText(TX_SPEAKER_KIRK, 1);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_001);
mudd2UseSpockOnMudd();
}
}
-
void Room::mudd2UseRedshirtOnMudd() {
if (_awayMission->mudd.muddInhaledGas && !_awayMission->mudd.muddUnconscious) {
_awayMission->disableInput = true;
@@ -357,7 +434,7 @@ void Room::mudd2MuddFinishedPushingRedshirt() {
}
void Room::mudd2RedshirtPushedAway() {
- showText(TX_SPEAKER_BUCHERT, 52);
+ showText(TX_SPEAKER_BUCHERT, TX_MUD2_052);
loadActorAnim(OBJECT_REDSHIRT, "rstnds", 0xd8, 0xc3);
_awayMission->disableInput = false;
_awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W;
@@ -371,7 +448,7 @@ void Room::mudd2RedshirtPushedAway() {
// The function itself was also modified (ie. condition for showing text was inverted).
void Room::mudd2UseMTricorderOnMudd() {
if (_awayMission->mudd.muddInhaledGas && !_awayMission->mudd.muddUnconscious)
- mccoyScan(DIR_W, 13, false);
+ mccoyScan(DIR_W, TX_MUD2_013, false);
}
@@ -380,13 +457,13 @@ void Room::mudd2UseMedkitOnMudd() {
return;
else if (_awayMission->mudd.muddUnconscious) {
if (!_awayMission->mudd.translatedAlienLanguage)
- showText(TX_SPEAKER_MCCOY, 15);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_015);
else if (!_awayMission->mudd.putCapsuleInMedicalMachine)
- showText(TX_SPEAKER_MCCOY, 21);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_021);
else
walkCrewmanC(OBJECT_MCCOY, 0xde, 0xaf, &Room::mudd2MccoyReachedMudd);
} else // Can't get to him since he's busy being crazy
- showText(TX_SPEAKER_MCCOY, 16);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_016);
}
void Room::mudd2MccoyReachedMudd() {
@@ -400,79 +477,79 @@ void Room::mudd2MccoyCuredMudd() {
_awayMission->mudd.muddCurrentlyInsane = false;
_awayMission->mudd.muddInhaledGas = false;
- showText(TX_SPEAKER_MCCOY, 33);
- showText(TX_SPEAKER_MUDD, 45);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_033);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_045);
_awayMission->mudd.muddUnconscious = false;
}
void Room::mudd2LookAtKirk() {
- showDescription(3);
+ showDescription(TX_MUD2N003);
}
void Room::mudd2LookAtSpock() {
- showDescription(6);
+ showDescription(TX_MUD2N006);
}
void Room::mudd2LookAtMccoy() {
- showDescription(0);
+ showDescription(TX_MUD2N000);
}
void Room::mudd2LookAtRedshirt() {
- showDescription(4);
+ showDescription(TX_MUD2N004);
}
void Room::mudd2LookAtMudd() {
- showDescription(2);
+ showDescription(TX_MUD2N002);
}
void Room::mudd2LookAtControlPanel() {
- showDescription(11);
+ showDescription(TX_MUD2N011);
}
void Room::mudd2LookAtBed() {
- showDescription(7);
+ showDescription(TX_MUD2N007);
}
void Room::mudd2TalkToKirk() {
// BUGFIX: second condition in if statement changed to "must be false" instead of
// "must be true". (Same applies to below talk functions.)
if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious)
- showText(TX_SPEAKER_KIRK, 10);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_010);
else {
- showText(TX_SPEAKER_KIRK, 5);
- showText(TX_SPEAKER_MUDD, 46);
- showText(TX_SPEAKER_MCCOY, 35);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_005);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_046);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_035);
}
}
void Room::mudd2TalkToSpock() {
if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
- showText(TX_SPEAKER_SPOCK, 40);
- showText(TX_SPEAKER_KIRK, 11);
+ showText(TX_SPEAKER_SPOCK, TX_MUD2_040);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_011);
} else {
- showText(TX_SPEAKER_SPOCK, 38);
+ showText(TX_SPEAKER_SPOCK, TX_MUD2_038);
}
}
void Room::mudd2TalkToMccoy() {
if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
- showText(TX_SPEAKER_MCCOY, 25);
- showText(TX_SPEAKER_KIRK, 7);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_025);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_007);
} else {
- showText(TX_SPEAKER_MCCOY, 27);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_027);
}
}
void Room::mudd2TalkToRedshirt() {
if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
- showText(TX_SPEAKER_BUCHERT, 54);
- showText(TX_SPEAKER_KIRK, 8);
+ showText(TX_SPEAKER_BUCHERT, TX_MUD2_054);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_008);
} else {
- showText(TX_SPEAKER_BUCHERT, 55);
- showText(TX_SPEAKER_KIRK, 3);
- showText(TX_SPEAKER_MCCOY, 36);
+ showText(TX_SPEAKER_BUCHERT, TX_MUD2_055);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_003);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_036);
}
}
@@ -480,13 +557,12 @@ void Room::mudd2TalkToMudd() {
if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious)
return;
else if (_awayMission->mudd.muddInhaledGas) {
- showText(TX_SPEAKER_MUDD, 48);
- showText(TX_SPEAKER_MCCOY, 28);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_048);
+ showText(TX_SPEAKER_MCCOY, TX_MUD2_028);
} else { // NOTE: Unused (assumes harry is in a normal state, which doesn't happen here)
- showText(TX_SPEAKER_MUDD, 47);
- showText(TX_SPEAKER_KIRK, 6);
+ showText(TX_SPEAKER_MUDD, TX_MUD2_047);
+ showText(TX_SPEAKER_KIRK, TX_MUD2_006);
}
}
}
-#endif
diff --git a/engines/startrek/rooms/mudda.cpp b/engines/startrek/rooms/mudda.cpp
index 991e16aa9a..efa0e8a5ba 100644
--- a/engines/startrek/rooms/mudda.cpp
+++ b/engines/startrek/rooms/mudda.cpp
@@ -28,19 +28,21 @@ namespace StarTrek {
enum muddTextIds {
TX_COMMON_IDS_OFFSET_START = 5000, // needed to distinguish common IDs
TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK,
- TX_MUD0N011, TX_MUD1N013, TX_MUD2N010, TX_MUD3N016, TX_MUD4N009,
- TX_MUD5N009, TX_MUD0_002, TX_MUD1_002, TX_MUD2_002, TX_MUD0_018,
- TX_MUD0_019, TX_MUD0_020, TX_MUD0N002, TX_MUD1N004, TX_MUD2N001,
- TX_MUD3N001, TX_MUD4N002, TX_MUD5N001, TX_MUD0N006, TX_MUD1N007,
- TX_MUD2N005, TX_MUD3N008, TX_MUD4N005, TX_MUD5N105
+ TX_MUD0_002, TX_MUD0_018, TX_MUD0_019, TX_MUD0_020, TX_MUD1_002,
+ TX_MUD2_002, TX_MUD0N002, TX_MUD0N006, TX_MUD0N011, TX_MUD1N004,
+ TX_MUD1N007, TX_MUD1N013, TX_MUD2N001, TX_MUD2N005, TX_MUD2N010,
+ TX_MUD3N001, TX_MUD3N008, TX_MUD3N016, TX_MUD4N002, TX_MUD4N005,
+ TX_MUD4N009, TX_MUD5N001, TX_MUD5N009, TX_MUD5N105
};
// TODO: Finish offsets
// TODO: Finish floppy offsets
extern const RoomTextOffsets muddTextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
+ { TX_SPEAKER_KIRK, 2941, 0 },
+ { TX_SPEAKER_MCCOY, 2966, 0 },
+ { TX_SPEAKER_SPOCK, 2976, 0 },
+ { TX_MUD0N011, 6036, 0 },
+ //TX_MUD1N013
{ -1, 0, 0 }
};
diff --git a/engines/startrek/rooms/trial1.cpp b/engines/startrek/rooms/trial1.cpp
index e605e5d304..49b2971793 100644
--- a/engines/startrek/rooms/trial1.cpp
+++ b/engines/startrek/rooms/trial1.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_ENTITY 8
@@ -169,18 +168,125 @@ extern const RoomAction trial1ActionList[] = {
};
enum trial1TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_UHURA, TX_SPEAKER_BENNIE,
+ TX_SPEAKER_ENTITY,
+ TX_TRI1_002, TX_TRI1_003, TX_TRI1_004, TX_TRI1_005, TX_TRI1_006,
+ TX_TRI1_007, TX_TRI1_008, TX_TRI1_009, TX_TRI1_010, TX_TRI1_011,
+ TX_TRI1_012, TX_TRI1_013, TX_TRI1_014, TX_TRI1_015, TX_TRI1_016,
+ TX_TRI1_017, TX_TRI1_018, TX_TRI1_019, TX_TRI1_020, TX_TRI1_021,
+ TX_TRI1_022, TX_TRI1_023, TX_TRI1_024, TX_TRI1_025, TX_TRI1_026,
+ TX_TRI1_027, TX_TRI1_029, TX_TRI1_030, TX_TRI1_031, TX_TRI1_032,
+ TX_TRI1_033, TX_TRI1_034, TX_TRI1_035, TX_TRI1_036, TX_TRI1_037,
+ TX_TRI1_038, TX_TRI1_039, TX_TRI1_040, TX_TRI1_041, TX_TRI1_042,
+ TX_TRI1_043, TX_TRI1_044, TX_TRI1_045, TX_TRI1_046, TX_TRI1_047,
+ TX_TRI1_048, TX_TRI1_049, TX_TRI1_050, TX_TRI1_051, TX_TRI1_052,
+ TX_TRI1_053, TX_TRI1_054, TX_TRI1_055, TX_TRI1_056, TX_TRI1_057,
+ TX_TRI1_J00, TX_TRI1N000, TX_TRI1N001, TX_TRI1N002, TX_TRI1N003,
+ TX_TRI1N004, TX_TRI1N005, TX_TRI1N006, TX_TRI1N007, TX_TRI1N008,
+ TX_TRI1N009, TX_TRI1N011, TX_TRI1N012, TX_TRI1N013, TX_TRI1N014,
+ TX_TRI1N015, TX_TRI1N016, TX_TRI1N017, TX_TRI1U068, TX_TRI1U079,
+ TX_TRI1U080, TX_TRI1U086, TX_TRI1U090, TX_TRI1U095, TX_TRI1U098,
+ TX_TRI1U101, TX_TRI1U102, TX_TRI1U106, TX_TRI1C001, TX_TRI1C002
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets trial1TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 1064, 0 },
- //{ TX_SPEAKER_MCCOY, 1075, 0 },
- //{ TX_SPEAKER_SPOCK, 1085, 0 },
+ { TX_SPEAKER_KIRK, 275, 0 },
+ { TX_SPEAKER_MCCOY, 286, 0 },
+ { TX_SPEAKER_SPOCK, 296, 0 },
+ { TX_SPEAKER_UHURA, 320, 0 },
+ { TX_SPEAKER_BENNIE, 306, 0 },
+ { TX_SPEAKER_ENTITY, 330, 0 },
+ { TX_TRI1_002, 7154, 0 },
+ { TX_TRI1_003, 7575, 0 },
+ { TX_TRI1_004, 6149, 0 },
+ { TX_TRI1_005, 6076, 0 },
+ { TX_TRI1_006, 7100, 0 },
+ { TX_TRI1_007, 936, 0 },
+ { TX_TRI1_008, 7619, 0 },
+ { TX_TRI1_009, 6209, 0 },
+ { TX_TRI1_010, 1276, 0 },
+ { TX_TRI1_011, 6761, 0 },
+ { TX_TRI1_012, 5106, 0 },
+ { TX_TRI1_013, 5610, 0 },
+ { TX_TRI1_014, 5737, 0 },
+ { TX_TRI1_015, 10856, 0 },
+ { TX_TRI1_016, 7808, 0 },
+ { TX_TRI1_017, 4855, 0 },
+ { TX_TRI1_018, 7936, 0 },
+ { TX_TRI1_019, 3040, 0 },
+ { TX_TRI1_020, 8025, 0 },
+ { TX_TRI1_021, 4261, 0 },
+ { TX_TRI1_022, 4596, 0 },
+ { TX_TRI1_023, 4723, 0 },
+ { TX_TRI1_024, 4387, 0 },
+ { TX_TRI1_025, 4457, 0 },
+ { TX_TRI1_026, 11067, 0 },
+ { TX_TRI1_027, 9814, 0 },
+ { TX_TRI1_029, 8075, 0 },
+ { TX_TRI1_030, 8140, 0 },
+ { TX_TRI1_031, 8211, 0 },
+ { TX_TRI1_032, 865, 0 },
+ { TX_TRI1_033, 10751, 0 },
+ { TX_TRI1_034, 2991, 0 },
+ { TX_TRI1_035, 9017, 0 },
+ { TX_TRI1_036, 8488, 0 },
+ { TX_TRI1_037, 9853, 0 },
+ { TX_TRI1_038, 8412, 0 },
+ { TX_TRI1_039, 8292, 0 },
+ { TX_TRI1_040, 4132, 0 },
+ { TX_TRI1_041, 5347, 0 },
+ { TX_TRI1_042, 5488, 0 },
+ { TX_TRI1_043, 4978, 0 },
+ { TX_TRI1_044, 8651, 0 },
+ { TX_TRI1_045, 10642, 0 },
+ { TX_TRI1_046, 2905, 0 },
+ { TX_TRI1_047, 695, 0 },
+ { TX_TRI1_048, 3398, 0 },
+ { TX_TRI1_049, 9712, 0 },
+ { TX_TRI1_050, 9100, 0 },
+ { TX_TRI1_051, 9218, 0 },
+ { TX_TRI1_052, 9892, 0 },
+ { TX_TRI1_053, 3193, 0 },
+ { TX_TRI1_054, 9318, 0 },
+ { TX_TRI1_055, 1502, 0 },
+ { TX_TRI1_056, 648, 0 },
+ { TX_TRI1_057, 1140, 0 },
+ { TX_TRI1_J00, 2812, 0 },
+ { TX_TRI1N000, 2606, 0 },
+ { TX_TRI1N001, 2431, 0 },
+ { TX_TRI1N002, 2527, 0 },
+ { TX_TRI1N003, 1870, 0 },
+ { TX_TRI1N004, 10811, 0 },
+ //{ TX_TRI1N004, 3577, 0 }, // ignore duplicate line
+ { TX_TRI1N005, 10082, 0 },
+ { TX_TRI1N006, 2249, 0 },
+ { TX_TRI1N007, 2714, 0 },
+ { TX_TRI1N008, 3629, 0 },
+ { TX_TRI1N009, 2340, 0 },
+ { TX_TRI1N011, 2154, 0 },
+ { TX_TRI1N012, 4065, 0 },
+ { TX_TRI1N013, 10207, 0 },
+ { TX_TRI1N014, 3932, 0 },
+ { TX_TRI1N015, 2076, 0 },
+ { TX_TRI1N016, 2004, 0 },
+ { TX_TRI1N017, 1938, 0 },
+ { TX_TRI1U068, 6299, 0 },
+ { TX_TRI1U079, 7248, 0 },
+ { TX_TRI1U080, 5936, 0 },
+ { TX_TRI1U086, 6358, 0 },
+ { TX_TRI1U090, 6011, 0 },
+ { TX_TRI1U095, 7738, 0 },
+ { TX_TRI1U098, 6613, 0 },
+ { TX_TRI1U101, 6947, 0 },
+ { TX_TRI1U102, 7379, 0 },
+ { TX_TRI1U106, 6444, 0 },
{ -1, 0, 0 }
};
extern const RoomText trial1Texts[] = {
+ { TX_TRI1C001, Common::EN_ANY, "Zzzt! Sptttz! Zzzt! Tttt!" },
+ { TX_TRI1C002, Common::EN_ANY, "Clunk." },
{ -1, Common::UNK_LANG, "" }
};
@@ -199,13 +305,13 @@ void Room::trial1Tick50() {
if (!_awayMission->trial.doorOpen)
_awayMission->disableInput = false;
if (!_awayMission->trial.entityDefeated) {
- showText(TX_SPEAKER_BENNIE, 56);
- showText(TX_SPEAKER_SPOCK, 47);
- showText(TX_SPEAKER_MCCOY, 32);
- showText(TX_SPEAKER_KIRK, 7);
- showText(TX_SPEAKER_BENNIE, 57);
- showText(TX_SPEAKER_KIRK, 10);
- showText(TX_SPEAKER_BENNIE, 55);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_056);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_047);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_032);
+ showText(TX_SPEAKER_KIRK, TX_TRI1_007);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_057);
+ showText(TX_SPEAKER_KIRK, TX_TRI1_010);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_055);
}
}
@@ -253,47 +359,47 @@ void Room::trial1PickedUpRod() {
}
void Room::trial1LookAtKirk() {
- showDescription(3);
+ showDescription(TX_TRI1N003);
}
void Room::trial1LookAtSpock() {
- showDescription(17);
+ showDescription(TX_TRI1N017);
}
void Room::trial1LookAtMccoy() {
- showDescription(16);
+ showDescription(TX_TRI1N016);
}
void Room::trial1LookAtRedshirt() {
- showDescription(15);
+ showDescription(TX_TRI1N015);
}
void Room::trial1LookAtWall() {
- showDescription(11);
+ showDescription(TX_TRI1N011);
}
void Room::trial1LookAtFloor() {
- showDescription(6);
+ showDescription(TX_TRI1N006);
}
void Room::trial1LookAtRods() {
- showDescription(9);
+ showDescription(TX_TRI1N009);
}
void Room::trial1LookAtDoor() {
- showDescription(1);
+ showDescription(TX_TRI1N001);
}
void Room::trial1LookAtLock() {
- showDescription(2);
+ showDescription(TX_TRI1N002);
}
void Room::trial1LookAtEntity() {
- showDescription(0);
+ showDescription(TX_TRI1N000);
}
void Room::trial1LookAtMoltenRock() {
- showDescription(7);
+ showDescription(TX_TRI1N007);
}
void Room::trial1TalkToKirk() {
@@ -301,16 +407,16 @@ void Room::trial1TalkToKirk() {
}
void Room::trial1TalkToSpock() {
- showText(TX_SPEAKER_SPOCK, 46);
- showText(TX_SPEAKER_MCCOY, 34);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_046);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_034);
}
void Room::trial1TalkToMccoy() {
- showText(TX_SPEAKER_MCCOY, 19);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_019);
}
void Room::trial1TalkToRedshirt() {
- showText(TX_SPEAKER_BENNIE, 53);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_053);
}
void Room::trial1TalkToEntity() {
@@ -318,15 +424,15 @@ void Room::trial1TalkToEntity() {
}
void Room::trial1UsePhaserOnCrewman() {
- showText(TX_SPEAKER_BENNIE, 48);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_048);
}
void Room::trial1UsePhaserOnEntity() {
- showDescription(4);
+ showDescription(TX_TRI1N004);
}
void Room::trial1UsePhaserOnWall() {
- showDescription(8);
+ showDescription(TX_TRI1N008);
}
@@ -360,7 +466,7 @@ void Room::trial1ReachedFloorToUseKillPhaser() {
}
void Room::trial1DoneShootingFloorWithKillPhaser() {
- showDescription(14);
+ showDescription(TX_TRI1N014);
loadActorAnim2(OBJECT_MOLTEN_ROCK, "t1mltd", 0xca, 0xbc);
_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E;
@@ -372,66 +478,66 @@ void Room::trial1DoneShootingFloorWithKillPhaser() {
}
void Room::trial1UsePhaserOnRod() {
- showDescription(12);
+ showDescription(TX_TRI1N012);
}
void Room::trial1UsePhaserOnDoor() {
- showText(TX_SPEAKER_SPOCK, 40);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_040);
}
void Room::trial1UsePhaserOnLock() {
- showText(TX_SPEAKER_MCCOY, 21);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_021);
}
void Room::trial1UseMTricorderOnKirk() {
- mccoyScan(DIR_S, 24, false);
+ mccoyScan(DIR_S, TX_TRI1_024, true);
}
void Room::trial1UseMTricorderOnSpock() {
// ENHANCEMENT: Original didn't play tricorder sound, etc
- mccoyScan(DIR_S, 25, false);
+ mccoyScan(DIR_S, TX_TRI1_025, true);
}
void Room::trial1UseMTricorderOnMccoy() {
- mccoyScan(DIR_S, 22, false);
+ mccoyScan(DIR_S, TX_TRI1_022, true);
}
void Room::trial1UseMTricorderOnRedshirt() {
- mccoyScan(DIR_S, 23, false);
+ mccoyScan(DIR_S, TX_TRI1_023, true);
}
void Room::trial1UseMTricorderOnEntity() {
- mccoyScan(DIR_S, 17, false);
+ mccoyScan(DIR_S, TX_TRI1_017, true);
}
void Room::trial1UseSTricorderOnWall() {
- spockScan(DIR_S, 43, false);
+ spockScan(DIR_S, TX_TRI1_043, true);
}
void Room::trial1UseSTricorderOnEntity() {
- spockScan(DIR_S, 12, false);
+ spockScan(DIR_S, TX_TRI1_012, true);
// BUG: infinite score mechanism
_awayMission->trial.missionScore += 1;
}
void Room::trial1UseSTricorderOnRods() {
- spockScan(DIR_S, 41, false);
+ spockScan(DIR_S, TX_TRI1_041, true);
}
void Room::trial1UseSTricorderOnFloor() {
- spockScan(DIR_S, 42, false);
+ spockScan(DIR_S, TX_TRI1_042, true);
// BUG: infinite score mechanism
_awayMission->trial.missionScore += 1;
}
void Room::trial1UseSTricorderOnDoor() {
- spockScan(DIR_S, 13, false);
+ spockScan(DIR_S, TX_TRI1_013, true);
}
void Room::trial1UseSTricorderOnLock() {
- spockScan(DIR_S, 14, false);
+ spockScan(DIR_S, TX_TRI1_014, true);
if (!_awayMission->trial.scannedLock) {
_awayMission->trial.scannedLock = true;
@@ -442,12 +548,12 @@ void Room::trial1UseSTricorderOnLock() {
void Room::trial1UseCommunicator() {
if (_awayMission->trial.forceFieldDown) {
- showText(TX_SPEAKER_UHURA_GLOBAL, 90);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U090);
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- 5, 4, 9,
- TX_BLANK
+ TX_TRI1_005, TX_TRI1_004, TX_TRI1_009,
+ TX_END
};
int choice = showMultipleTexts(choices);
@@ -455,51 +561,51 @@ void Room::trial1UseCommunicator() {
_awayMission->trial.missionEndMethod = 1;
endMission(1, 1, 1);
} else if (choice == 1) { // "Beam us to Vlict's position"
- showText(TX_SPEAKER_UHURA_GLOBAL, 80);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U080);
_awayMission->disableInput = true;
loadRoomIndex(4, 4);
} // Else don't transport anywhere
} else { // Force field still up
if (_awayMission->trial.uhuraAnalyzedCode)
- showText(TX_SPEAKER_UHURA_GLOBAL, 68);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U068);
else {
- showText(TX_SPEAKER_UHURA_GLOBAL, 86);
- showText(TX_SPEAKER_UHURA_GLOBAL, 106);
- showText(TX_SPEAKER_UHURA_GLOBAL, 98);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U086);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U106);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U098);
if (_awayMission->trial.scannedLock) {
- showText(TX_SPEAKER_KIRK, 11);
- showText(TX_SPEAKER_UHURA_GLOBAL, 101);
+ showText(TX_SPEAKER_KIRK, TX_TRI1_011);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U101);
const TextRef choices[] = {
TX_SPEAKER_KIRK,
- 6, 2,
- TX_BLANK
+ TX_TRI1_006, TX_TRI1_002,
+ TX_END
};
int choice = showMultipleTexts(choices);
if (choice == 0) { // Don't analyze the anomolous program
- showText(TX_SPEAKER_UHURA_GLOBAL, 79);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U079);
_awayMission->trial.doorCodeBehaviour = 2;
_awayMission->trial.uhuraAnalyzedCode = true;
_awayMission->trial.missionScore += 1;
} else { // Analyze the anomolous program
- showText(TX_SPEAKER_UHURA_GLOBAL, 102);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U102);
const TextRef choices2[] = {
TX_SPEAKER_KIRK,
- 3, 8,
- TX_BLANK
+ TX_TRI1_003, TX_TRI1_008,
+ TX_END
};
choice = showMultipleTexts(choices2);
if (choice == 0) { // Activate the program
- showText(TX_SPEAKER_UHURA_GLOBAL, 95);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U095);
_awayMission->trial.doorCodeBehaviour = 5;
_awayMission->trial.uhuraAnalyzedCode = true;
_awayMission->trial.missionScore += 3;
} else { // Don't activate, only open the door
- showText(TX_SPEAKER_UHURA_GLOBAL, 79);
+ showText(TX_SPEAKER_UHURA, TX_TRI1U079);
_awayMission->trial.doorCodeBehaviour = 2;
_awayMission->trial.uhuraAnalyzedCode = true;
_awayMission->trial.missionScore += 1;
@@ -511,34 +617,34 @@ void Room::trial1UseCommunicator() {
}
void Room::trial1UseMccoyOnEntity() {
- showText(TX_SPEAKER_MCCOY, 16);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_016);
}
void Room::trial1UseMccoyOnLock() {
if (!_awayMission->trial.entityDefeated)
- showText(TX_SPEAKER_MCCOY, 18);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_018);
else if (_awayMission->trial.doorCodeBehaviour == 0)
- showText(TX_SPEAKER_MCCOY, 20);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_020);
else
- showText(TX_SPEAKER_MCCOY, 29);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_029);
}
void Room::trial1UseMccoyOnFloor() {
- showText(TX_SPEAKER_MCCOY, 31);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_031);
}
void Room::trial1UseSpockOnEntity() {
- showText(TX_SPEAKER_SPOCK, 39);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_039);
}
void Room::trial1UseSpockOnLock() {
if (_awayMission->trial.doorOpen)
- showText(TX_SPEAKER_SPOCK, 38);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_038);
else if (!_awayMission->trial.entityDefeated)
- showText(TX_SPEAKER_SPOCK, 36);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_036);
else if (_awayMission->trial.doorCodeBehaviour == 0)
- showText(TX_SPEAKER_SPOCK, 44);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_044);
else if (_awayMission->trial.doorCodeBehaviour == 2)
walkCrewmanC(OBJECT_SPOCK, 0x1f, 0xb8, &Room::trial1SpockReachedKeypad);
else
@@ -573,11 +679,11 @@ void Room::trial1SpockUsedKeypadWithExtraProgram() {
void Room::trial1UseSpockOnFloor() {
- showText(TX_SPEAKER_SPOCK, 35);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_035);
}
void Room::trial1UseRedshirtOnEntity() {
- showText(TX_SPEAKER_BENNIE, 50);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_050);
}
@@ -585,9 +691,9 @@ void Room::trial1UseRedshirtOnLock() {
if (_awayMission->trial.doorOpen)
return;
else if (!_awayMission->trial.entityDefeated)
- showText(TX_SPEAKER_BENNIE, 51);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_051);
else if (_awayMission->trial.doorCodeBehaviour == 0)
- showText(TX_SPEAKER_BENNIE, 54);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_054);
else if (_awayMission->trial.doorCodeBehaviour == 2)
walkCrewmanC(OBJECT_REDSHIRT, 0x1f, 0xb8, &Room::trial1RedshirtReachedKeypad);
else
@@ -622,21 +728,21 @@ void Room::trial1RedshirtUsedKeypadWithExtraProgram() {
void Room::trial1UseRedshirtOnFloor() {
- showText(TX_SPEAKER_BENNIE, 49);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_049);
}
void Room::trial1UseRodOnMccoy() {
// ENHANCEMENT: This was originally only voiced with the wooden rod, not the iron rod.
// (This applies to the Spock and Redshirt functions below, too.)
- showText(TX_SPEAKER_MCCOY, 27);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_027);
}
void Room::trial1UseRodOnSpock() {
- showText(TX_SPEAKER_SPOCK, 37);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_037);
}
void Room::trial1UseRodOnRedshirt() {
- showText(TX_SPEAKER_BENNIE, 52);
+ showText(TX_SPEAKER_BENNIE, TX_TRI1_052);
}
void Room::trial1UseRodOnFloorOrWall() {
@@ -660,7 +766,7 @@ void Room::trial1DoneThrowingWoodRod() {
void Room::trial1UseWoodRodOnLock() {
- showDescription(5);
+ showDescription(TX_TRI1N005);
}
@@ -675,7 +781,7 @@ void Room::trial1ReachedMoltenRock() {
void Room::trial1DoneCoatingWoodRod() {
_awayMission->disableInput = false;
- showDescription(13);
+ showDescription(TX_TRI1N013);
loseItem(OBJECT_IWROD);
giveItem(OBJECT_IIROD);
@@ -706,19 +812,19 @@ void Room::trial1DoneThrowingIronRod() {
_awayMission->disableInput = false;
stopAllVocSounds();
- showText(TX_SPEAKER_SPOCK, 45);
- showText(TX_SPEAKER_MCCOY, 33);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_045);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_033);
_awayMission->trial.missionScore += 1;
}
void Room::trial1UseIronRodOnLock() {
- showDescription(4);
+ showDescription(TX_TRI1N004);
}
void Room::trial1GetThrownIronRod() {
- showText(TX_SPEAKER_SPOCK, 15);
+ showText(TX_SPEAKER_SPOCK, TX_TRI1_015);
}
void Room::trial1WalkToDoor() {
@@ -727,8 +833,7 @@ void Room::trial1WalkToDoor() {
}
void Room::trial1UseMedkit() {
- showText(TX_SPEAKER_MCCOY, 26);
+ showText(TX_SPEAKER_MCCOY, TX_TRI1_026);
}
}
-#endif
More information about the Scummvm-git-logs
mailing list