[Scummvm-git-logs] scummvm master -> db4756c62850b1b11e118ded127e95c71da5ef41
bluegr
bluegr at gmail.com
Mon Aug 16 23:22:41 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:
db4756c628 STARTREK: Convert MUDD4 room text offsets to the new format
Commit: db4756c62850b1b11e118ded127e95c71da5ef41
https://github.com/scummvm/scummvm/commit/db4756c62850b1b11e118ded127e95c71da5ef41
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-08-17T02:22:26+03:00
Commit Message:
STARTREK: Convert MUDD4 room text offsets to the new format
Changed paths:
engines/startrek/room.cpp
engines/startrek/rooms/function_map.h
engines/startrek/rooms/mudd4.cpp
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index f62d7ffcad..39de1ca748 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -74,7 +74,7 @@ Room::Room(StarTrekEngine *vm, const Common::String &name) : _vm(vm), _awayMissi
ADD_ROOM(mudd1)
ADD_ROOM(mudd2)
ADD_ROOM(mudd3)
- //ADD_ROOM(mudd4)
+ ADD_ROOM(mudd4)
ADD_ROOM(mudd5)
ADD_ROOM_COMMON(mudd)
ADD_ROOM(feather0)
diff --git a/engines/startrek/rooms/function_map.h b/engines/startrek/rooms/function_map.h
index ecb7991318..c4a4274dbf 100644
--- a/engines/startrek/rooms/function_map.h
+++ b/engines/startrek/rooms/function_map.h
@@ -49,9 +49,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 /*mudd4TextOffsets[],*/ mudd5TextOffsets[];
+extern const RoomTextOffsets mudd4TextOffsets[], mudd5TextOffsets[];
extern const RoomText mudd0Texts[], mudd1Texts[], mudd2Texts[], mudd3Texts[];
-extern const RoomText /*mudd4Texts[],*/ mudd5Texts[];
+extern const RoomText mudd4Texts[], mudd5Texts[];
extern const RoomTextOffsets muddTextOffsets[];
extern const RoomAction feather0ActionList[], feather1ActionList[], feather2ActionList[], feather3ActionList[];
diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp
index d75dd63d3c..261d4dff6d 100644
--- a/engines/startrek/rooms/mudd4.cpp
+++ b/engines/startrek/rooms/mudd4.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_VIEWSCREEN 8
@@ -120,17 +119,24 @@ extern const RoomAction mudd4ActionList[] = {
enum mudd4TextIds {
TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_UHURA, TX_SPEAKER_BUCHERT,
TX_SPEAKER_SCOTT, TX_SPEAKER_MUDD,
- TX_MUD4_002, TX_MUD4_004, TX_MUD4_006,
- TX_MUD4_007, TX_MUD4_013, TX_MUD4_018, TX_MUD4_019, TX_MUD4_020,
+ TX_MUD4_001, TX_MUD4_002, TX_MUD4_004, TX_MUD4_005, TX_MUD4_006,
+ TX_MUD4_007, TX_MUD4_008, TX_MUD4_009, TX_MUD4_010, TX_MUD4_011,
+ TX_MUD4_012, TX_MUD4_014, TX_MUD4_015, TX_MUD4_021, TX_MUD4_026,
+ TX_MUD4_029, TX_MUD4_030, TX_MUD4_034, TX_MUD4_035, TX_MUD4_036,
+ TX_MUD4_037, TX_MUD4_046, TX_MUD4_047, TX_MUD4_050, TX_MUD4_051,
+ TX_MUD4_063, TX_MUD4_064, TX_MUD4_065, TX_MUD4_067, TX_MUD4_069,
+ TX_MUD4_070, TX_MUD4_071, TX_MUD4_073, TX_MUD4_076, TX_MUD4_013,
+ TX_MUD4_016, TX_MUD4_017, TX_MUD4_018, TX_MUD4_019, TX_MUD4_020,
TX_MUD4_023, TX_MUD4_024, TX_MUD4_025, TX_MUD4_027, TX_MUD4_028,
- TX_MUD4_031, TX_MUD4_033, TX_MUD4_038, TX_MUD4_039, TX_MUD4_040,
- TX_MUD4_041, TX_MUD4_042, TX_MUD4_043, TX_MUD4_045, TX_MUD4_048,
- TX_MUD4_049, TX_MUD4_052, TX_MUD4_053, TX_MUD4_054, TX_MUD4_055,
- TX_MUD4_056, TX_MUD4_057, TX_MUD4_058, TX_MUD4_059, TX_MUD4_060,
- TX_MUD4_061, TX_MUD4_062, TX_MUD4_075, TX_MUD4_A29, TX_MUD4_S02,
- TX_MUD4_S03, TX_MUD4_S04, TX_MUD4N000, TX_MUD4N001, TX_MUD4N005,
- TX_MUD4N007,
- TX_STATICU1
+ TX_MUD4_031, TX_MUD4_032, TX_MUD4_033, TX_MUD4_038, TX_MUD4_039,
+ TX_MUD4_040, TX_MUD4_041, TX_MUD4_042, TX_MUD4_043, TX_MUD4_045,
+ TX_MUD4_048, TX_MUD4_049, TX_MUD4_052, TX_MUD4_053, TX_MUD4_054,
+ TX_MUD4_055, TX_MUD4_056, TX_MUD4_057, TX_MUD4_058, TX_MUD4_059,
+ TX_MUD4_060, TX_MUD4_061, TX_MUD4_062, TX_MUD4_066, TX_MUD4_068,
+ TX_MUD4_072, TX_MUD4_074, TX_MUD4_075, TX_MUD4_A29, TX_MUD4_S02,
+ TX_MUD4_S03, TX_MUD4_S04, TX_MUD4N000, TX_MUD4N001, TX_MUD4N003,
+ TX_MUD4N004, TX_MUD4N005, TX_MUD4N006, TX_MUD4N007, TX_MUD4N008,
+ TX_MUD4N011, TX_MUD4N012, TX_MUD4N013, TX_MUD4_003, TX_STATICU1
};
// TODO: Finish offsets
@@ -139,24 +145,57 @@ extern const RoomTextOffsets mudd4TextOffsets[] = {
{ TX_SPEAKER_KIRK, 4048, 0 },
{ TX_SPEAKER_MCCOY, 4059, 0 },
{ TX_SPEAKER_SPOCK, 4069, 0 },
- //{ TX_SPEAKER_UHURA, 2632, 0 },
+ { TX_SPEAKER_UHURA, 491, 0 },
{ TX_SPEAKER_BUCHERT, 4079, 0 },
{ TX_SPEAKER_SCOTT, 4091, 0 },
{ TX_SPEAKER_MUDD, 4101, 0 },
+ { TX_MUD4_001, 12511, 0 },
{ TX_MUD4_002, 6069, 0 },
{ TX_MUD4_004, 6134, 0 },
+ { TX_MUD4_005, 11984, 0 },
{ TX_MUD4_006, 5958, 0 },
{ TX_MUD4_007, 6103, 0 },
+ { TX_MUD4_008, 9263, 0 },
+ { TX_MUD4_009, 9687, 0 },
+ { TX_MUD4_010, 10886, 0 },
+ { TX_MUD4_011, 10945, 0 },
+ { TX_MUD4_012, 10793, 0 },
{ TX_MUD4_013, 4255, 0 },
+ { TX_MUD4_014, 8571, 0 },
+ { TX_MUD4_015, 12129, 0 },
+ { TX_MUD4_016, 10051, 0 },
+ { TX_MUD4_017, 8939, 0 },
{ TX_MUD4_018, 454, 0 },
{ TX_MUD4_019, 7470, 0 },
{ TX_MUD4_020, 7279, 0 },
+ { TX_MUD4_021, 8726, 0 },
+ { TX_MUD4_026, 9960, 0 },
+ { TX_MUD4_029, 10391, 0 },
+ { TX_MUD4_030, 10461, 0 },
+ { TX_MUD4_034, 9772, 0 },
+ { TX_MUD4_035, 11155, 0 },
+ { TX_MUD4_036, 10357, 0 },
+ { TX_MUD4_037, 9869, 0 },
+ { TX_MUD4_046, 12235, 0 },
+ { TX_MUD4_047, 12171, 0 },
+ { TX_MUD4_050, 8178, 0 },
+ { TX_MUD4_051, 12411, 0 },
+ { TX_MUD4_063, 12072, 0 },
+ { TX_MUD4_064, 10677, 0 },
+ { TX_MUD4_065, 8267, 0 },
+ { TX_MUD4_067, 10915, 0 },
+ { TX_MUD4_069, 11221, 0 },
+ { TX_MUD4_070, 10818, 0 },
+ { TX_MUD4_071, 10145, 0 },
+ { TX_MUD4_073, 11092, 0 },
+ { TX_MUD4_076, 12314, 0 },
{ TX_MUD4_023, 7208, 0 },
{ TX_MUD4_024, 7106, 0 },
{ TX_MUD4_025, 6345, 0 },
{ TX_MUD4_027, 6588, 0 },
{ TX_MUD4_028, 6812, 0 },
{ TX_MUD4_031, 4607, 0 },
+ { TX_MUD4_032, 9626, 0 },
{ TX_MUD4_033, 7060, 0 },
{ TX_MUD4_038, 5197, 0 },
{ TX_MUD4_039, 5224, 0 },
@@ -178,20 +217,32 @@ extern const RoomTextOffsets mudd4TextOffsets[] = {
{ TX_MUD4_060, 4676, 0 },
{ TX_MUD4_061, 4119, 0 },
{ TX_MUD4_062, 4288, 0 },
+ { TX_MUD4_066, 8396, 0 },
+ { TX_MUD4_068, 9395, 0 },
+ { TX_MUD4_072, 9205, 0 },
+ { TX_MUD4_074, 8881, 0 },
{ TX_MUD4_075, 7611, 0 },
{ TX_MUD4_A29, 7503, 0 },
{ TX_MUD4_S02, 6377, 0 },
{ TX_MUD4_S03, 7323, 0 },
{ TX_MUD4_S04, 6912, 0 },
{ TX_MUD4N000, 7801, 0 },
- { TX_MUD4N001, 0, 0 },
+ { TX_MUD4N001, 11747, 0 },
+ { TX_MUD4N003, 11615, 0 },
+ { TX_MUD4N004, 11792, 0 },
{ TX_MUD4N005, 3106, 0 },
+ { TX_MUD4N006, 11677, 0 },
{ TX_MUD4N007, 3298, 0 },
+ { TX_MUD4N008, 8029, 0 },
+ { TX_MUD4N011, 11912, 0 },
+ { TX_MUD4N012, 11278, 0 },
+ { TX_MUD4N013, 7985, 0 },
{ -1, 0, 0 }
};
extern const RoomText mudd4Texts[] = {
- { -1, Common::UNK_LANG, "" }
+ { TX_MUD4_003, Common::EN_ANY, "#MUD4\\MUD4_003#<<Done>>" },
+ { -1, Common::UNK_LANG, "" }
};
void Room::mudd4Tick1() {
@@ -451,7 +502,7 @@ void Room::mudd4KirkUsedCommunications() {
TX_SPEAKER_KIRK,
TX_MUD4_024,
TX_MUD4_033,
- TX_MUD4_022, // ENHANCEMENT: This line was recorded twice (MUD4_022 and MUD4_023). It's used twice, so, might as well make use of the second recording.
+ TX_MUD4_023,
TX_END
};
@@ -724,4 +775,3 @@ void Room::mudd4TouchedHotspot0() { // Trigger door sound
}
}
-#endif
More information about the Scummvm-git-logs
mailing list