[Scummvm-git-logs] scummvm master -> 2d6b182487bdaf995b9d4ac7150a13944c1c459f
bluegr
bluegr at gmail.com
Sat Feb 20 20:04:26 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2d6b182487 STARTREK: Re-implement shared functionality in the LOVE mission
Commit: 2d6b182487bdaf995b9d4ac7150a13944c1c459f
https://github.com/scummvm/scummvm/commit/2d6b182487bdaf995b9d4ac7150a13944c1c459f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-02-20T22:04:14+02:00
Commit Message:
STARTREK: Re-implement shared functionality in the LOVE mission
Changed paths:
engines/startrek/rooms/love0.cpp
engines/startrek/rooms/lovea.cpp
engines/startrek/rooms/mudd3.cpp
diff --git a/engines/startrek/rooms/love0.cpp b/engines/startrek/rooms/love0.cpp
index 76e11cd212..c06ba55fff 100644
--- a/engines/startrek/rooms/love0.cpp
+++ b/engines/startrek/rooms/love0.cpp
@@ -97,22 +97,21 @@ enum love0TextIds {
TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_FERRIS, TX_SPEAKER_COMPUTER,
TX_LOV0_001, TX_LOV0_002, TX_LOV0_003, TX_LOV0_004, TX_LOV0_005,
TX_LOV0_006, TX_LOV0_007, TX_LOV0_008, TX_LOV0_009, TX_LOV0_010,
- TX_LOV0_011, TX_LOV0_012, TX_LOV0_013, TX_LOV0_014, TX_LOV0_015,
- TX_LOV0_016, TX_LOV0_017, TX_LOV0_019, TX_LOV0_020, TX_LOV0_021,
- TX_LOV0_022, TX_LOV0_023, TX_LOV0_024, TX_LOV0_026,
- TX_LOV0_027, TX_LOV0_028, TX_LOV0_029, TX_LOV0_030, TX_LOV0_031,
- TX_LOV0_033, TX_LOV0_035, TX_LOV0_036, TX_LOV0_037, TX_LOV0_038,
- TX_LOV0_039, TX_LOV0_040, TX_LOV0_041, TX_LOV0_042, TX_LOV0_043,
- TX_LOV0_045, TX_LOV0_046, TX_LOV0_047, TX_LOV0_048, TX_LOV0_049,
- TX_LOV0_050,
- //TX_LOV0_101, TX_LOV0_102, TX_LOV0_103, TX_LOV0_104, TX_LOV0_105,
- //TX_LOV0_106, TX_LOV0_107,
- TX_LOV0_124, TX_LOV0N000,
- TX_LOV0N001, TX_LOV0N002, TX_LOV0N003, TX_LOV0N004, TX_LOV0N005,
- TX_LOV0N006, TX_LOV0N007, TX_LOV0N008, TX_LOV0N009, TX_COMPA186,
- TX_COMPA187, TX_COMPA189, TX_COMPA190, TX_COMPA191, TX_COMPA193,
- TX_COMPU186, TX_COMPU187, TX_COMPU188, TX_COMPU189, TX_COMPU190,
- TX_COMPU192, TX_COMPU193, TX_DIALOG_ERROR
+ TX_LOV0_023, TX_LOV0_024, TX_LOV0_027, TX_LOV0_028, TX_LOV0_030,
+ TX_LOV0_031, TX_LOV0_035, TX_LOV0_036, TX_LOV0_037, TX_LOV0_038,
+ TX_LOV0_049, TX_LOV0N000, TX_LOV0N001, TX_LOV0N002, TX_LOV0N003,
+ TX_LOV0N004, TX_LOV0N005, TX_LOV0N006, TX_LOV0N007, TX_LOV0N008,
+ TX_LOV0N009, TX_COMPA186, TX_COMPA187, TX_COMPA189, TX_COMPA190,
+ TX_COMPA191, TX_COMPA193, TX_COMPU186, TX_COMPU187, TX_COMPU188,
+ TX_COMPU189, TX_COMPU190, TX_COMPU192, TX_COMPU193, TX_DIALOG_ERROR
+ // Global in lovea
+ //TX_LOV0_011, TX_LOV0_012, TX_LOV0_013, TX_LOV0_014, TX_LOV0_015,
+ //TX_LOV0_016, TX_LOV0_017, TX_LOV0_019, TX_LOV0_020, TX_LOV0_021,
+ //TX_LOV0_022, TX_LOV0_026, TX_LOV0_029, TX_LOV0_033, TX_LOV0_039,
+ //TX_LOV0_040, TX_LOV0_041, TX_LOV0_042, TX_LOV0_043, TX_LOV0_045,
+ //TX_LOV0_046, TX_LOV0_047, TX_LOV0_048, TX_LOV0_050, TX_LOV0_101,
+ //TX_LOV0_102, TX_LOV0_103, TX_LOV0_104, TX_LOV0_105, TX_LOV0_106,
+ //TX_LOV0_107, TX_LOV0_124
};
// TODO: Finish floppy offsets
@@ -132,49 +131,17 @@ extern const RoomTextOffsets love0TextOffsets[] = {
{ TX_LOV0_008, 6848, 0 },
{ TX_LOV0_009, 7999, 0 },
{ TX_LOV0_010, 10477, 0 },
- { TX_LOV0_011, 10498, 0 },
- { TX_LOV0_012, 10625, 0 },
- { TX_LOV0_013, 10921, 0 },
- { TX_LOV0_014, 10685, 0 },
- { TX_LOV0_015, 10789, 0 },
- { TX_LOV0_016, 10592, 0 },
- { TX_LOV0_017, 11055, 0 },
- { TX_LOV0_019, 10975, 0 },
- { TX_LOV0_020, 10532, 0 },
- { TX_LOV0_021, 10843, 0 },
- { TX_LOV0_022, 10733, 0 },
{ TX_LOV0_023, 7881, 0 },
{ TX_LOV0_024, 7536, 0 },
- { TX_LOV0_026, 11854, 0 },
{ TX_LOV0_027, 6650, 0 },
{ TX_LOV0_028, 7062, 0 },
- { TX_LOV0_029, 11734, 0 },
{ TX_LOV0_030, 10335, 0 },
{ TX_LOV0_031, 6931, 0 },
- { TX_LOV0_033, 11794, 0 },
{ TX_LOV0_035, 7805, 0 },
{ TX_LOV0_036, 1591, 0 },
{ TX_LOV0_037, 10240, 0 },
{ TX_LOV0_038, 6760, 0 },
- { TX_LOV0_039, 11116, 0 },
- { TX_LOV0_040, 11243, 0 },
- { TX_LOV0_041, 11539, 0 },
- { TX_LOV0_042, 11303, 0 },
- { TX_LOV0_043, 11407, 0 },
- { TX_LOV0_045, 11210, 0 },
- { TX_LOV0_046, 11673, 0 },
- { TX_LOV0_047, 11593, 0 },
- { TX_LOV0_048, 11150, 0 },
{ TX_LOV0_049, 11461, 0 },
- { TX_LOV0_050, 11351, 0 },
- //{ TX_LOV0_101, 12062, 0 }, // global in lovea
- //{ TX_LOV0_102, 12126, 0 }, // global in lovea
- //{ TX_LOV0_103, 12196, 0 }, // global in lovea
- //{ TX_LOV0_104, 12246, 0 }, // global in lovea
- //{ TX_LOV0_105, 12303, 0 }, // global in lovea
- //{ TX_LOV0_106, 12415, 0 }, // global in lovea
- //{ TX_LOV0_107, 12483, 0 }, // global in lovea
- { TX_LOV0_124, 11931, 0 },
{ TX_LOV0N000, 6449, 0 },
{ TX_LOV0N001, 10380, 0 },
{ TX_LOV0N002, 6227, 0 },
@@ -199,6 +166,39 @@ extern const RoomTextOffsets love0TextOffsets[] = {
{ TX_COMPU192, 8220, 0 },
{ TX_COMPU193, 8858, 0 },
{ TX_DIALOG_ERROR, 12536, 0 },
+ // Global in lovea
+ //{ TX_LOV0_011, 10498, 0 },
+ //{ TX_LOV0_012, 10625, 0 },
+ //{ TX_LOV0_013, 10921, 0 },
+ //{ TX_LOV0_014, 10685, 0 },
+ //{ TX_LOV0_015, 10789, 0 },
+ //{ TX_LOV0_016, 10592, 0 },
+ //{ TX_LOV0_017, 11055, 0 },
+ //{ TX_LOV0_019, 10975, 0 },
+ //{ TX_LOV0_020, 10532, 0 },
+ //{ TX_LOV0_021, 10843, 0 },
+ //{ TX_LOV0_022, 10733, 0 },
+ //{ TX_LOV0_026, 11854, 0 },
+ //{ TX_LOV0_029, 11734, 0 },
+ //{ TX_LOV0_033, 11794, 0 },
+ //{ TX_LOV0_039, 11116, 0 },
+ //{ TX_LOV0_040, 11243, 0 },
+ //{ TX_LOV0_041, 11539, 0 },
+ //{ TX_LOV0_042, 11303, 0 },
+ //{ TX_LOV0_043, 11407, 0 },
+ //{ TX_LOV0_045, 11210, 0 },
+ //{ TX_LOV0_046, 11673, 0 },
+ //{ TX_LOV0_047, 11593, 0 },
+ //{ TX_LOV0_048, 11150, 0 },
+ //{ TX_LOV0_050, 11351, 0 },
+ //{ TX_LOV0_101, 12062, 0 },
+ //{ TX_LOV0_102, 12126, 0 },
+ //{ TX_LOV0_103, 12196, 0 },
+ //{ TX_LOV0_104, 12246, 0 },
+ //{ TX_LOV0_105, 12303, 0 },
+ //{ TX_LOV0_106, 12415, 0 },
+ //{ TX_LOV0_107, 12483, 0 },
+ //{ TX_LOV0_124, 11931, 0 },
{ -1, 0, 0 }
};
diff --git a/engines/startrek/rooms/lovea.cpp b/engines/startrek/rooms/lovea.cpp
index 17266a5e8c..348f26e53b 100644
--- a/engines/startrek/rooms/lovea.cpp
+++ b/engines/startrek/rooms/lovea.cpp
@@ -29,9 +29,14 @@ namespace StarTrek {
enum loveTextIds {
TX_COMMON_IDS_OFFSET_START = 5000, // needed to distinguish common IDs
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_UHURA,
- TX_LOV0_025, TX_LOV0_101, TX_LOV0_102, TX_LOV0_103, TX_LOV0_104,
- TX_LOV0_105, TX_LOV0_106, TX_LOV0_107, TX_LOV5_015, TX_LOV5_019,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_UHURA, TX_SPEAKER_FERRIS,
+ TX_LOV0_011, TX_LOV0_012, TX_LOV0_013, TX_LOV0_014, TX_LOV0_015,
+ TX_LOV0_016, TX_LOV0_017, TX_LOV0_019, TX_LOV0_020, TX_LOV0_021,
+ TX_LOV0_022, TX_LOV0_025, TX_LOV0_026, TX_LOV0_029, TX_LOV0_033,
+ TX_LOV0_039, TX_LOV0_040, TX_LOV0_041, TX_LOV0_042, TX_LOV0_043,
+ TX_LOV0_045, TX_LOV0_046, TX_LOV0_047, TX_LOV0_048, TX_LOV0_050,
+ TX_LOV0_101, TX_LOV0_102, TX_LOV0_103, TX_LOV0_104, TX_LOV0_105,
+ TX_LOV0_106, TX_LOV0_107, TX_LOV0_124, TX_LOV5_015, TX_LOV5_019,
TX_LOV5_027, TX_LOV5_030, TX_LOV5_038, TX_LOVA_100, TX_LOVA_F01,
TX_LOVA_F02, TX_LOVA_F03, TX_LOVA_F04, TX_LOVA_F07, TX_LOVA_F08,
TX_LOVA_F10, TX_LOVA_F54, TX_LOVA_F55, TX_TUG2_010, TX_MUD2_040,
@@ -45,7 +50,32 @@ extern const RoomTextOffsets loveTextOffsets[] = {
{ TX_SPEAKER_MCCOY, 5926, 0 },
{ TX_SPEAKER_SPOCK, 5936, 0 },
{ TX_SPEAKER_UHURA, 4990, 0 },
+ { TX_SPEAKER_FERRIS, 5946, 0 },
+ { TX_LOV0_011, 10498, 0 },
+ { TX_LOV0_012, 10625, 0 },
+ { TX_LOV0_013, 10921, 0 },
+ { TX_LOV0_014, 10685, 0 },
+ { TX_LOV0_015, 10789, 0 },
+ { TX_LOV0_016, 10592, 0 },
+ { TX_LOV0_017, 11055, 0 },
+ { TX_LOV0_019, 10975, 0 },
+ { TX_LOV0_020, 10532, 0 },
+ { TX_LOV0_021, 10843, 0 },
+ { TX_LOV0_022, 10733, 0 },
{ TX_LOV0_025, 11981, 0 },
+ { TX_LOV0_026, 11854, 0 },
+ { TX_LOV0_029, 11734, 0 },
+ { TX_LOV0_033, 11794, 0 },
+ { TX_LOV0_039, 11116, 0 },
+ { TX_LOV0_040, 11243, 0 },
+ { TX_LOV0_041, 11539, 0 },
+ { TX_LOV0_042, 11303, 0 },
+ { TX_LOV0_043, 11407, 0 },
+ { TX_LOV0_045, 11210, 0 },
+ { TX_LOV0_046, 11673, 0 },
+ { TX_LOV0_047, 11593, 0 },
+ { TX_LOV0_048, 11150, 0 },
+ { TX_LOV0_050, 11351, 0 },
{ TX_LOV0_101, 12062, 0 },
{ TX_LOV0_102, 12126, 0 },
{ TX_LOV0_103, 12196, 0 },
@@ -53,6 +83,7 @@ extern const RoomTextOffsets loveTextOffsets[] = {
{ TX_LOV0_105, 12303, 0 },
{ TX_LOV0_106, 12415, 0 },
{ TX_LOV0_107, 12483, 0 },
+ { TX_LOV0_124, 11931, 0 },
{ TX_LOV5_015, 3009, 0 },
{ TX_LOV5_019, 2931, 0 },
{ TX_LOV5_027, 3444, 0 },
@@ -82,8 +113,6 @@ extern const RoomTextOffsets loveTextOffsets[] = {
// Mccoy or Ferris say something under effects of laughing gas
void Room::loveaTimer0Expired() {
-// TODO
-#if 0
const TextRef ferrisText[] = {
TX_LOV0_039,
TX_LOV0_048,
@@ -145,7 +174,6 @@ void Room::loveaTimer0Expired() {
// reduce "spamming" of text?
_awayMission->timers[0] = getRandomWordInRange(200, 400);
}
-#endif
}
// Spock says something under effects of laughing gas
diff --git a/engines/startrek/rooms/mudd3.cpp b/engines/startrek/rooms/mudd3.cpp
index a1e4b1c1c3..8f73afdcd1 100644
--- a/engines/startrek/rooms/mudd3.cpp
+++ b/engines/startrek/rooms/mudd3.cpp
@@ -93,13 +93,13 @@ enum mudd3TextIds {
TX_MUD3_013, TX_MUD3_014, TX_MUD3_015, TX_MUD3_016, TX_MUD3_017,
TX_MUD3_018, TX_MUD3_019, TX_MUD3_020, TX_MUD3_021, TX_MUD3_022,
TX_MUD3_023, TX_MUD3_024, TX_MUD3_025, TX_MUD3_026, TX_MUD3_027,
- TX_MUD3_028, TX_MUD3_029, TX_MUD3_030, TX_MUD3_031, TX_MUD3_032,
+ TX_MUD3_028, TX_MUD3_029, TX_MUD3_030, TX_MUD3_031, TX_MUD3_032,
TX_MUD3_033, TX_MUD3_034, TX_MUD3_035, TX_MUD3_037, TX_MUD3_038,
TX_MUD3_039, TX_MUD3_040, TX_MUD3_041, TX_MUD3_042, TX_MUD3_043,
TX_MUD3_044, TX_MUD3_046, TX_MUD3_047, TX_MUD3_048, TX_MUD3_049,
TX_MUD3_050, TX_MUD3_051, TX_MUD3_052, TX_MUD3_053, TX_MUD3_054,
TX_MUD3_055, TX_MUD3_056, TX_MUD3_057, TX_MUD3_058, TX_MUD3_059,
- TX_MUD3_060, TX_MUD3_061, TX_MUD3_062, TX_MUD3_063, TX_MUD3_064,
+ TX_MUD3_060, TX_MUD3_061, TX_MUD3_062, TX_MUD3_063, TX_MUD3_064,
TX_MUD3_065, TX_MUD3_066, TX_MUD3_067, TX_MUD3_068, TX_MUD3_069,
TX_MUD3_070, TX_MUD3_071, TX_MUD3N000, TX_MUD3N002, TX_MUD3N003,
TX_MUD3N004, TX_MUD3N005, TX_MUD3N006, TX_MUD3N007, TX_MUD3N008,
More information about the Scummvm-git-logs
mailing list