[Scummvm-git-logs] scummvm master -> 9d6f12d98be4c76da04911118dee3fcef5fbc074
bluegr
bluegr at gmail.com
Mon Aug 16 21:50:06 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:
9d6f12d98b STARTREK: Covert VENG3 and VENG5-8 room text offsets to the new format
Commit: 9d6f12d98be4c76da04911118dee3fcef5fbc074
https://github.com/scummvm/scummvm/commit/9d6f12d98be4c76da04911118dee3fcef5fbc074
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-08-17T00:49:49+03:00
Commit Message:
STARTREK: Covert VENG3 and VENG5-8 room text offsets to the new format
Changed paths:
engines/startrek/room.cpp
engines/startrek/rooms/function_map.h
engines/startrek/rooms/veng3.cpp
engines/startrek/rooms/veng5.cpp
engines/startrek/rooms/veng6.cpp
engines/startrek/rooms/veng7.cpp
engines/startrek/rooms/veng8.cpp
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index 23c7f84119..f62d7ffcad 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -100,12 +100,12 @@ Room::Room(StarTrekEngine *vm, const Common::String &name) : _vm(vm), _awayMissi
ADD_ROOM(veng0)
ADD_ROOM(veng1)
ADD_ROOM(veng2)
- //ADD_ROOM(veng3)
+ ADD_ROOM(veng3)
ADD_ROOM(veng4)
- //ADD_ROOM(veng5)
- //ADD_ROOM(veng6)
- //ADD_ROOM(veng7)
- //ADD_ROOM(veng8)
+ ADD_ROOM(veng5)
+ ADD_ROOM(veng6)
+ ADD_ROOM(veng7)
+ ADD_ROOM(veng8)
ADD_ROOM_COMMON(veng)
if (_roomActionList == nullptr) {
diff --git a/engines/startrek/rooms/function_map.h b/engines/startrek/rooms/function_map.h
index c1643859c4..ecb7991318 100644
--- a/engines/startrek/rooms/function_map.h
+++ b/engines/startrek/rooms/function_map.h
@@ -79,12 +79,12 @@ extern const RoomText sins4Texts[], sins5Texts[];
extern const RoomAction veng0ActionList[], veng1ActionList[], veng2ActionList[], veng3ActionList[];
extern const RoomAction veng4ActionList[], veng5ActionList[], veng6ActionList[], veng7ActionList[];
extern const RoomAction veng8ActionList[];
-extern const RoomTextOffsets veng0TextOffsets[], veng1TextOffsets[], veng2TextOffsets[];//, veng3TextOffsets[];
-extern const RoomTextOffsets veng4TextOffsets[];//, veng5TextOffsets[], veng6TextOffsets[], veng7TextOffsets[];
-//extern const RoomTextOffsets veng8TextOffsets[];
-extern const RoomText veng0Texts[], veng1Texts[], veng2Texts[];//, veng3Texts[];
-extern const RoomText veng4Texts[];//, veng5Texts[], veng6Texts[], veng7Texts[];
-//extern const RoomText veng8Texts[];
+extern const RoomTextOffsets veng0TextOffsets[], veng1TextOffsets[], veng2TextOffsets[], veng3TextOffsets[];
+extern const RoomTextOffsets veng4TextOffsets[], veng5TextOffsets[], veng6TextOffsets[], veng7TextOffsets[];
+extern const RoomTextOffsets veng8TextOffsets[];
+extern const RoomText veng0Texts[], veng1Texts[], veng2Texts[], veng3Texts[];
+extern const RoomText veng4Texts[], veng5Texts[], veng6Texts[], veng7Texts[];
+extern const RoomText veng8Texts[];
extern const RoomTextOffsets vengTextOffsets[];
}
diff --git a/engines/startrek/rooms/veng3.cpp b/engines/startrek/rooms/veng3.cpp
index a6314d9315..a49739de66 100644
--- a/engines/startrek/rooms/veng3.cpp
+++ b/engines/startrek/rooms/veng3.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_DOOR 8
@@ -105,15 +104,75 @@ extern const RoomAction veng3ActionList[] = {
};
enum veng3TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_EVERTS,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_KIJE,
+ TX_BRIDU146, TX_DEM3_019, TX_MUD4_018, TX_VEN0_010, TX_VEN0_016,
+ TX_VEN2U093, TX_VEN2_028, TX_VEN2_066, TX_VEN2_098,
+ TX_VEN3N000, TX_VEN3N001, TX_VEN3N002, TX_VEN3N003, TX_VEN3N004,
+ TX_VEN3N005, TX_VEN3N006, TX_VEN3N007, TX_VEN3N009,
+ TX_VEN3N010, TX_VEN3N011, TX_VEN3N012, TX_VEN3N013, TX_VEN3N014,
+ TX_VEN3_001, TX_VEN3_002, TX_VEN3_003, TX_VEN3_004, TX_VEN3_005,
+ TX_VEN3_006, TX_VEN3_007, TX_VEN3_008, TX_VEN3_009, TX_VEN3_010,
+ TX_VEN3_011, TX_VEN3_012, TX_VEN3_013, TX_VEN3_014, TX_VEN3_015,
+ TX_VEN3_016, TX_VEN3_017, TX_VEN3_018, TX_VEN4N010, TX_VEN4_016,
+ TX_VEN6N007, TX_VENA_F32, TX_VENA_F34, TX_VENA_F40
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng3TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
- //{ TX_SPEAKER_EVERTS, 2642, 0 },
+ { TX_SPEAKER_KIRK, 6893, 0 },
+ { TX_SPEAKER_MCCOY, 6904, 0 },
+ { TX_SPEAKER_SPOCK, 6914, 0 },
+ { TX_SPEAKER_KIJE, 6924, 0 },
+ { TX_BRIDU146, 5935, 0 },
+ { TX_DEM3_019, 6419, 0 },
+ { TX_MUD4_018, 5866, 0 },
+ { TX_MUD4_018, 5999, 0 },
+ { TX_VEN0_010, 496, 0 },
+ { TX_VEN0_016, 6715, 0 },
+ //{ TX_VEN0_016, 6656, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 6067, 0 },
+ { TX_VEN2_028, 6174, 0 },
+ { TX_VEN2_066, 6252, 0 },
+ { TX_VEN2_098, 5062, 0 },
+ { TX_VEN3N000, 2263, 0 },
+ { TX_VEN3N001, 1954, 0 },
+ { TX_VEN3N002, 2040, 0 },
+ { TX_VEN3N003, 2347, 0 },
+ { TX_VEN3N004, 2157, 0 },
+ { TX_VEN3N005, 1842, 0 },
+ { TX_VEN3N006, 706, 0 },
+ { TX_VEN3N007, 1272, 0 },
+ //{ TX_VEN3N007, 1020, 0 }, // Skip duplicate text
+ { TX_VEN3N009, 1120, 0 },
+ { TX_VEN3N010, 4721, 0 },
+ { TX_VEN3N011, 1686, 0 },
+ { TX_VEN3N012, 1362, 0 },
+ { TX_VEN3N013, 1755, 0 },
+ { TX_VEN3N014, 4926, 0 },
+ { TX_VEN3_001, 4194, 0 },
+ { TX_VEN3_002, 2482, 0 },
+ { TX_VEN3_003, 4493, 0 },
+ { TX_VEN3_004, 3569, 0 },
+ { TX_VEN3_005, 4656, 0 },
+ { TX_VEN3_006, 1589, 0 },
+ { TX_VEN3_007, 3993, 0 },
+ { TX_VEN3_008, 3134, 0 },
+ { TX_VEN3_009, 3853, 0 },
+ { TX_VEN3_010, 4071, 0 },
+ { TX_VEN3_011, 3257, 0 },
+ { TX_VEN3_012, 4434, 0 },
+ { TX_VEN3_013, 1443, 0 },
+ { TX_VEN3_014, 2826, 0 },
+ { TX_VEN3_015, 3012, 0 },
+ { TX_VEN3_016, 3482, 0 },
+ { TX_VEN3_017, 3342, 0 },
+ { TX_VEN3_018, 4582, 0 },
+ { TX_VEN4N010, 5716, 0 },
+ { TX_VEN4_016, 6470, 0 },
+ { TX_VEN6N007, 5781, 0 },
+ { TX_VENA_F32, 5292, 0 },
+ { TX_VENA_F34, 5562, 0 },
+ { TX_VENA_F40, 5157, 0 },
{ -1, 0, 0 }
};
@@ -150,12 +209,12 @@ void Room::veng3Tick15() {
}
void Room::veng3TouchedTurbolift2() {
- playSoundEffectIndex(SND_DOOR1);
+ playSoundEffectIndex(kSfxDoor);
showRepublicMap(3, 1);
}
void Room::veng3TouchedTurbolift1() {
- playSoundEffectIndex(SND_DOOR1);
+ playSoundEffectIndex(kSfxDoor);
showRepublicMap(3, 0);
}
@@ -163,13 +222,13 @@ void Room::veng3WalkToDoor() {
if (_awayMission->veng.clearedDebris)
walkCrewmanC(OBJECT_KIRK, 0xa6, 0x6e, &Room::veng3ReachedTurbolift2);
else
- showText(TX_VEN3N006);
+ showDescription(TX_VEN3N006);
}
void Room::veng3ReachedTurbolift2() {
_awayMission->disableInput = true;
loadActorAnimC(OBJECT_DOOR, "s7r3db", 0xa6, 0x60, &Room::veng3Turbolift2Opened);
- playSoundEffectIndex(SND_DOOR1);
+ playSoundEffectIndex(kSfxDoor);
}
void Room::veng3Turbolift2Opened() {
@@ -183,7 +242,7 @@ void Room::veng3WalkToSickbayDoor() {
void Room::veng3ReachedSickbayDoor() {
_awayMission->disableInput = true;
loadActorAnimC(OBJECT_SICKBAY_DOOR, "s7r3da", 0x5b, 0x80, &Room::veng3SickbayDoorOpened);
- playSoundEffectIndex(SND_DOOR1);
+ playSoundEffectIndex(kSfxDoor);
}
void Room::veng3SickbayDoorOpened() {
@@ -191,18 +250,18 @@ void Room::veng3SickbayDoorOpened() {
}
void Room::veng3LookAtSupportBeam() {
- showText(TX_VEN3N007);
+ showDescription(TX_VEN3N007);
}
void Room::veng3LookAtDebris() {
if (!_awayMission->veng.clearedDebris)
- showText(TX_VEN3N009);
+ showDescription(TX_VEN3N009);
else
- showText(TX_VEN3N007); // UNUSED (debris is gone)
+ showDescription(TX_VEN3N007); // UNUSED (debris is gone)
}
void Room::veng3LookAtTurbolift2Door() {
- showText(TX_VEN3N012);
+ showDescription(TX_VEN3N012);
if (!_awayMission->veng.lookedAtTurbolift2Door) {
_awayMission->veng.lookedAtTurbolift2Door = true;
@@ -214,35 +273,35 @@ void Room::veng3LookAtTurbolift2Door() {
}
void Room::veng3LookAtSickbayDoor() {
- showText(TX_VEN3N011);
+ showDescription(TX_VEN3N011);
}
void Room::veng3LookAtCable() {
- showText(TX_VEN3N013);
+ showDescription(TX_VEN3N013);
}
void Room::veng3LookAtDeadGuy() {
- showText(TX_VEN3N005);
+ showDescription(TX_VEN3N005);
}
void Room::veng3LookAtKirk() {
- showText(TX_VEN3N001);
+ showDescription(TX_VEN3N001);
}
void Room::veng3LookAtMccoy() {
- showText(TX_VEN3N002);
+ showDescription(TX_VEN3N002);
}
void Room::veng3LookAtSpock() {
- showText(TX_VEN3N004);
+ showDescription(TX_VEN3N004);
}
void Room::veng3LookAtRedshirt() {
- showText(TX_VEN3N000);
+ showDescription(TX_VEN3N000);
}
void Room::veng3LookAnywhere() {
- showText(TX_VEN3N003);
+ showDescription(TX_VEN3N003);
}
void Room::veng3UseStunPhaserOnDebris() {
@@ -354,7 +413,7 @@ void Room::veng3TalkToRedshirt() {
}
void Room::veng3GetDebris() {
- showText(TX_VEN3N010);
+ showDescription(TX_VEN3N010);
}
void Room::veng3GetCable() {
@@ -370,11 +429,9 @@ void Room::veng3ReachedCable() {
void Room::veng3PickedUpCable() {
_awayMission->disableInput = false;
loadActorStandAnim(OBJECT_CABLE);
- showText(TX_VEN3N014);
+ showDescription(TX_VEN3N014);
giveItem(OBJECT_ICABLE2);
_awayMission->veng.tookCableFromSickbayHallway = true;
}
}
-
-#endif
diff --git a/engines/startrek/rooms/veng5.cpp b/engines/startrek/rooms/veng5.cpp
index c5425e6a52..ee0867fb92 100644
--- a/engines/startrek/rooms/veng5.cpp
+++ b/engines/startrek/rooms/veng5.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_DOOR 8
@@ -91,15 +90,72 @@ extern const RoomAction veng5ActionList[] = {
};
enum veng5TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_EVERTS,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_KIJE,
+ TX_BRIDU146, TX_DEM3_019, TX_MUD4_018, TX_VEN0_016,
+ TX_VEN2U093, TX_VEN2_028, TX_VEN2_066, TX_VEN2_098, TX_VEN4N010,
+ TX_VEN4_016, TX_VEN5N000, TX_VEN5N001, TX_VEN5N002, TX_VEN5N003,
+ TX_VEN5N004, TX_VEN5N005, TX_VEN5N006, TX_VEN5N007, TX_VEN5N008,
+ TX_VEN5N009, TX_VEN5N010, TX_VEN5_001, TX_VEN5_002, TX_VEN5_003,
+ TX_VEN5_004, TX_VEN5_005, TX_VEN5_006, TX_VEN5_007, TX_VEN5_008,
+ TX_VEN5_009, TX_VEN5_010, TX_VEN5_011, TX_VEN5_012, TX_VEN5_013,
+ TX_VEN5_015, TX_VEN5_016, TX_VEN5_017, TX_VEN5_018, TX_VEN5_019,
+ TX_VEN5_R19, TX_VEN5_R20, TX_VEN6N007, TX_VENA_F32, TX_VENA_F34,
+ TX_VENA_F40
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng5TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
- //{ TX_SPEAKER_EVERTS, 2642, 0 },
+ { TX_SPEAKER_KIRK, 5963, 0 },
+ { TX_SPEAKER_MCCOY, 5974, 0 },
+ { TX_SPEAKER_SPOCK, 5984, 0 },
+ { TX_SPEAKER_KIJE, 5994, 0 },
+ { TX_BRIDU146, 5020, 0 },
+ { TX_DEM3_019, 5504, 0 },
+ { TX_MUD4_018, 4951, 0 },
+ { TX_MUD4_018, 5084, 0 },
+ { TX_VEN0_016, 5741, 0 },
+ //{ TX_VEN0_016, 5800, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 5152, 0 },
+ { TX_VEN2_028, 5259, 0 },
+ { TX_VEN2_066, 5337, 0 },
+ { TX_VEN2_098, 4147, 0 },
+ { TX_VEN4N010, 4801, 0 },
+ { TX_VEN4_016, 5555, 0 },
+ { TX_VEN5N000, 897, 0 },
+ { TX_VEN5N001, 1206, 0 },
+ { TX_VEN5N002, 1339, 0 },
+ { TX_VEN5N003, 1270, 0 },
+ { TX_VEN5N004, 1394, 0 },
+ { TX_VEN5N005, 1474, 0 },
+ { TX_VEN5N006, 1572, 0 },
+ { TX_VEN5N007, 668, 0 },
+ { TX_VEN5N008, 739, 0 },
+ { TX_VEN5N009, 993, 0 },
+ { TX_VEN5N010, 3993, 0 },
+ { TX_VEN5_001, 3126, 0 },
+ { TX_VEN5_002, 3695, 0 },
+ { TX_VEN5_003, 2446, 0 },
+ { TX_VEN5_004, 3021, 0 },
+ { TX_VEN5_005, 372, 0 },
+ { TX_VEN5_006, 3200, 0 },
+ { TX_VEN5_007, 1672, 0 },
+ { TX_VEN5_008, 2577, 0 },
+ { TX_VEN5_009, 2869, 0 },
+ { TX_VEN5_010, 2170, 0 },
+ { TX_VEN5_011, 2024, 0 },
+ { TX_VEN5_012, 2735, 0 },
+ { TX_VEN5_013, 1780, 0 },
+ { TX_VEN5_015, 3574, 0 },
+ { TX_VEN5_016, 3764, 0 },
+ { TX_VEN5_017, 3280, 0 },
+ { TX_VEN5_018, 2095, 0 },
+ { TX_VEN5_019, 2299, 0 },
+ { TX_VEN5_R19, 3511, 0 },
+ { TX_VEN5_R20, 3410, 0 },
+ { TX_VEN6N007, 4866, 0 },
+ { TX_VENA_F32, 4377, 0 },
+ { TX_VENA_F34, 4647, 0 },
+ { TX_VENA_F40, 4242, 0 },
{ -1, 0, 0 }
};
@@ -131,7 +187,7 @@ void Room::veng5WalkToDoor() {
void Room::veng5ReachedDoor() {
_awayMission->disableInput = true;
- playSoundEffectIndex(SND_DOOR1);
+ playSoundEffectIndex(kSfxDoor);
loadActorAnimC(OBJECT_DOOR, "s7r5d1", 0x6b, 0x8c, &Room::veng5DoorOpened);
walkCrewman(OBJECT_KIRK, 0x64, 0x8e);
}
@@ -141,48 +197,48 @@ void Room::veng5DoorOpened() {
}
void Room::veng5TouchedTurboliftDoor() {
- playSoundEffectIndex(SND_DOOR1);
+ playSoundEffectIndex(kSfxDoor);
showRepublicMap(5, 1);
}
void Room::veng5LookAtDoor() {
- showText(TX_VEN5N007);
+ showDescription(TX_VEN5N007);
}
void Room::veng5LookAtLadder() {
- showText(TX_VEN5N008);
+ showDescription(TX_VEN5N008);
}
void Room::veng5LookAtDeadGuy() {
- showText(TX_VEN5N000);
+ showDescription(TX_VEN5N000);
}
void Room::veng5LookAtPowerPack() {
- showText(TX_VEN5N009);
+ showDescription(TX_VEN5N009);
}
void Room::veng5LookAtDebris() {
- showText(TX_VEN5N001);
+ showDescription(TX_VEN5N001);
}
void Room::veng5LookAtKirk() {
- showText(TX_VEN5N003);
+ showDescription(TX_VEN5N003);
}
void Room::veng5LookAtSpock() {
- showText(TX_VEN5N002);
+ showDescription(TX_VEN5N002);
}
void Room::veng5LookAtMccoy() {
- showText(TX_VEN5N004);
+ showDescription(TX_VEN5N004);
}
void Room::veng5LookAtRedshirt() {
- showText(TX_VEN5N005);
+ showDescription(TX_VEN5N005);
}
void Room::veng5LookAnywhere() {
- showText(TX_VEN5N006);
+ showDescription(TX_VEN5N006);
}
void Room::veng5UsePhaserOnPowerPack() {
@@ -222,7 +278,7 @@ void Room::veng5VaporizedDebris() {
}
void Room::veng5UseMTricorderOnDebris() {
- mccoyScan(DIR_W, TX_VEN5_008);
+ mccoyScan(DIR_W, TX_SPEAKER_MCCOY, TX_VEN5_008);
}
void Room::veng5UseSTricorderOnDebris() {
@@ -230,7 +286,7 @@ void Room::veng5UseSTricorderOnDebris() {
}
void Room::veng5UseMTricorderOnPowerPack() {
- mccoyScan(DIR_W, TX_VEN5_009); // ENHANCEMENT: Use mccoyScan, not showText
+ mccoyScan(DIR_W, TX_SPEAKER_MCCOY, TX_VEN5_009); // ENHANCEMENT: Use mccoyScan, not showText
}
void Room::veng5UseSTricorderOnPowerPack() {
@@ -275,11 +331,10 @@ void Room::veng5ReachedPowerPack() {
void Room::veng5PickedUpPowerPack() {
if (!_awayMission->veng.havePowerPack) {
loadActorStandAnim(OBJECT_POWER_PACK);
- showText(TX_VEN5N010);
+ showDescription(TX_VEN5N010);
_awayMission->veng.havePowerPack = true;
giveItem(OBJECT_IFUSION);
}
}
}
-#endif
diff --git a/engines/startrek/rooms/veng6.cpp b/engines/startrek/rooms/veng6.cpp
index 6297b2f55e..34e5eef6ae 100644
--- a/engines/startrek/rooms/veng6.cpp
+++ b/engines/startrek/rooms/veng6.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_CABLE_1 8
@@ -134,15 +133,93 @@ extern const RoomAction veng6ActionList[] = {
};
enum veng6TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_EVERTS,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_KIJE, TX_SPEAKER_COMPUTER,
+ TX_BRIDU146, TX_COMPA185, TX_DEM3_019, TX_MUD1N014, TX_MUD4_018,
+ TX_VEN0N016, TX_VEN0_016, TX_VEN2U093, TX_VEN2_028,
+ TX_VEN2_066, TX_VEN2_098, TX_VEN4N010, TX_VEN4_016, TX_VEN5N007,
+ TX_VEN6N000, TX_VEN6N001, TX_VEN6N002, TX_VEN6N003, TX_VEN6N005,
+ TX_VEN6N006, TX_VEN6N007, TX_VEN6N008, TX_VEN6N009, TX_VEN6N010,
+ TX_VEN6N011, TX_VEN6N012, TX_VEN6N013, TX_VEN6N015, TX_VEN6N016,
+ TX_VEN6N017, TX_VEN6N018, TX_VEN6N019, TX_VEN6N020, TX_VEN6N022,
+ TX_VEN6N024, TX_VEN6N025, TX_VEN6_001, TX_VEN6_002, TX_VEN6_003,
+ TX_VEN6_005, TX_VEN6_006, TX_VEN6_007, TX_VEN6_008, TX_VEN6_009,
+ TX_VEN6_010, TX_VEN6_011, TX_VEN6_012, TX_VEN6_013, TX_VEN6_014,
+ TX_VEN6_015, TX_VEN6_016, TX_VEN6_017, TX_VEN6_018, TX_VEN6_019,
+ TX_VEN6_020, TX_VEN6_021, TX_VEN6_022, TX_VEN6_023, TX_VENA_F32,
+ TX_VENA_F34, TX_VENA_F40
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng6TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
- //{ TX_SPEAKER_EVERTS, 2642, 0 },
+ { TX_SPEAKER_KIRK, 8894, 0 },
+ { TX_SPEAKER_MCCOY, 8905, 0 },
+ { TX_SPEAKER_SPOCK, 8915, 0 },
+ { TX_SPEAKER_KIJE, 8925, 0 },
+ { TX_SPEAKER_COMPUTER, 8937, 0 },
+ { TX_BRIDU146, 7831, 0 },
+ { TX_COMPA185, 4008, 0 },
+ { TX_DEM3_019, 8315, 0 },
+ { TX_MUD1N014, 6550, 0 },
+ { TX_MUD4_018, 7762, 0 },
+ //{ TX_MUD4_018, 7895, 0 }, // Skip duplicate text
+ { TX_VEN0N016, 2156, 0 },
+ { TX_VEN0_016, 8552, 0 },
+ //{ TX_VEN0_016, 8611, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 7963, 0 },
+ { TX_VEN2_028, 8070, 0 },
+ { TX_VEN2_066, 8148, 0 },
+ { TX_VEN2_098, 6958, 0 },
+ { TX_VEN4N010, 7612, 0 },
+ { TX_VEN4_016, 8366, 0 },
+ { TX_VEN5N007, 775, 0 },
+ { TX_VEN6N000, 2099, 0 },
+ { TX_VEN6N001, 1781, 0 },
+ { TX_VEN6N002, 1999, 0 },
+ { TX_VEN6N003, 1873, 0 },
+ { TX_VEN6N005, 5276, 0 },
+ { TX_VEN6N006, 4887, 0 },
+ { TX_VEN6N007, 4998, 0 },
+ { TX_VEN6N007, 7677, 0 },
+ { TX_VEN6N008, 6615, 0 },
+ { TX_VEN6N009, 1334, 0 },
+ { TX_VEN6N010, 1253, 0 },
+ { TX_VEN6N011, 845, 0 },
+ { TX_VEN6N012, 1425, 0 },
+ { TX_VEN6N013, 1052, 0 },
+ { TX_VEN6N015, 976, 0 },
+ { TX_VEN6N016, 8975, 0 },
+ { TX_VEN6N018, 9063, 0 },
+ { TX_VEN6N017, 1139, 0 },
+ { TX_VEN6N019, 2207, 0 },
+ { TX_VEN6N020, 3318, 0 },
+ { TX_VEN6N022, 3710, 0 },
+ { TX_VEN6N024, 6803, 0 },
+ { TX_VEN6N025, 1536, 0 },
+ { TX_VEN6_001, 5699, 0 },
+ { TX_VEN6_002, 4457, 0 },
+ { TX_VEN6_003, 4062, 0 },
+ { TX_VEN6_005, 2298, 0 },
+ { TX_VEN6_006, 6407, 0 },
+ { TX_VEN6_007, 5830, 0 },
+ { TX_VEN6_008, 2674, 0 },
+ { TX_VEN6_009, 2457, 0 },
+ { TX_VEN6_010, 5433, 0 },
+ { TX_VEN6_011, 4737, 0 },
+ { TX_VEN6_012, 3881, 0 },
+ { TX_VEN6_013, 5972, 0 },
+ { TX_VEN6_014, 2534, 0 },
+ { TX_VEN6_015, 6196, 0 },
+ { TX_VEN6_016, 4297, 0 },
+ { TX_VEN6_017, 4105, 0 },
+ { TX_VEN6_018, 2781, 0 },
+ { TX_VEN6_019, 4596, 0 },
+ { TX_VEN6_020, 5500, 0 },
+ { TX_VEN6_021, 1616, 0 },
+ { TX_VEN6_022, 9197, 0 },
+ { TX_VEN6_023, 2954, 0 },
+ { TX_VENA_F32, 7188, 0 },
+ { TX_VENA_F34, 7458, 0 },
+ { TX_VENA_F40, 7053, 0 },
{ -1, 0, 0 }
};
@@ -428,7 +505,7 @@ void Room::veng6OpenedOrClosedCabinet() {
playSoundEffectIndex(kSfxDoor);
_awayMission->veng.engineeringCabinetOpen = true;
if (!_awayMission->veng.tookEngineeringJournal)
- showText(TX_VEN6N005);
+ showDescription(TX_VEN6N005);
}
}
@@ -458,11 +535,11 @@ void Room::veng6UsePowerPackOnLeftConsole() {
}
void Room::veng6GetJunctionBox() {
- showText(TX_MUD1N014);
+ showDescription(TX_MUD1N014);
}
void Room::veng6GetOilCanister() {
- showText(TX_VEN6N008);
+ showDescription(TX_VEN6N008);
}
void Room::veng6GetEngineeringJournal() {
@@ -483,4 +560,3 @@ void Room::veng6TookEngineeringJournal() {
}
}
-#endif
diff --git a/engines/startrek/rooms/veng7.cpp b/engines/startrek/rooms/veng7.cpp
index 5415325f63..2c016e1539 100644
--- a/engines/startrek/rooms/veng7.cpp
+++ b/engines/startrek/rooms/veng7.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_CABLE 8
@@ -76,15 +75,54 @@ extern const RoomAction veng7ActionList[] = {
};
enum veng7TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_EVERTS,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_KIJE,
+ TX_BRIDU146, TX_DEM3_019, TX_MUD4_018, TX_VEN0N016, TX_VEN0_016,
+ TX_VEN1_004, TX_VEN2U093, TX_VEN2_028, TX_VEN2_066,
+ TX_VEN2_098, TX_VEN4N010, TX_VEN4_016, TX_VEN6N007, TX_VEN7N001,
+ TX_VEN7N002, TX_VEN7N003, TX_VEN7N004, TX_VEN7N005, TX_VEN7N006,
+ TX_VEN7N007, TX_VEN7N008, TX_VEN7N009, TX_VEN7_001, TX_VEN7_003,
+ TX_VEN7_005, TX_VEN7_006, TX_VEN7_007, TX_VENA_F32, TX_VENA_F34,
+ TX_VENA_F40
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng7TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
- //{ TX_SPEAKER_EVERTS, 2642, 0 },
+ { TX_SPEAKER_KIRK, 4142, 0 },
+ { TX_SPEAKER_MCCOY, 4153, 0 },
+ { TX_SPEAKER_SPOCK, 4163, 0 },
+ { TX_SPEAKER_KIJE, 4173, 0 },
+ { TX_BRIDU146, 3179, 0 },
+ { TX_DEM3_019, 3663, 0 },
+ { TX_MUD4_018, 3110, 0 },
+ { TX_MUD4_018, 3243, 0 },
+ { TX_VEN0N016, 708, 0 },
+ { TX_VEN0_016, 3959, 0 },
+ //{ TX_VEN0_016, 3900, 0 }, // Skip duplicate text
+ { TX_VEN1_004, 1460, 0 },
+ { TX_VEN2U093, 3311, 0 },
+ { TX_VEN2_028, 3418, 0 },
+ { TX_VEN2_066, 3496, 0 },
+ { TX_VEN2_098, 2306, 0 },
+ { TX_VEN4N010, 2960, 0 },
+ { TX_VEN4_016, 3714, 0 },
+ { TX_VEN6N007, 3025, 0 },
+ { TX_VEN7N001, 525, 0 },
+ { TX_VEN7N002, 1071, 0 },
+ { TX_VEN7N003, 928, 0 },
+ { TX_VEN7N004, 1023, 0 },
+ { TX_VEN7N005, 976, 0 },
+ { TX_VEN7N006, 1117, 0 },
+ { TX_VEN7N007, 767, 0 },
+ { TX_VEN7N008, 841, 0 },
+ { TX_VEN7N009, 2161, 0 },
+ { TX_VEN7_001, 1195, 0 },
+ { TX_VEN7_003, 1902, 0 },
+ { TX_VEN7_005, 1320, 0 },
+ { TX_VEN7_006, 1706, 0 },
+ { TX_VEN7_007, 1576, 0 },
+ { TX_VENA_F32, 2536, 0 },
+ { TX_VENA_F34, 2806, 0 },
+ { TX_VENA_F40, 2401, 0 },
{ -1, 0, 0 }
};
@@ -129,7 +167,8 @@ void Room::veng7LookAtCollapsedSection() {
void Room::veng7LookAtDeadGuy() {
// ENHANCEMENT: Original played TX_VEN0N016. This is reused and boring, and there is
// a more interesting unused audio file, so use that instead.
- showDescription(TX_VEN7N000);
+ //showDescription(TX_VEN7N000);
+ showDescription(TX_VEN0N016);
}
void Room::veng7LookAtDoor() {
@@ -207,4 +246,3 @@ void Room::veng7PickedUpCable() {
}
}
-#endif
diff --git a/engines/startrek/rooms/veng8.cpp b/engines/startrek/rooms/veng8.cpp
index 17a44abb8f..0dbc058433 100644
--- a/engines/startrek/rooms/veng8.cpp
+++ b/engines/startrek/rooms/veng8.cpp
@@ -20,7 +20,6 @@
*
*/
-#if 0
#include "startrek/room.h"
#define OBJECT_DEAD_GUY 8 // Unused
@@ -112,15 +111,92 @@ extern const RoomAction veng8ActionList[] = {
};
enum veng8TextIds {
- TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_EVERTS,
+ TX_SPEAKER_KIRK, TX_SPEAKER_MCCOY, TX_SPEAKER_SPOCK, TX_SPEAKER_KIJE,
+ TX_BRIDU146, TX_MUD4_018, TX_VEN2U093, TX_VEN2_028,
+ TX_VEN2_066, TX_VEN2_098, TX_VEN4N010, TX_VEN5N002, TX_VEN5N004,
+ TX_VEN6N007, TX_VEN8N000, TX_VEN8N001, TX_VEN8N003, TX_VEN8N004,
+ TX_VEN8N005, TX_VEN8N006, TX_VEN8N007, TX_VEN8N008, TX_VEN8N009,
+ TX_VEN8N010, TX_VEN8_001, TX_VEN8_002, TX_VEN8_003, TX_VEN8_004,
+ TX_VEN8_005, TX_VEN8_006, TX_VEN8_007, TX_VEN8_008, TX_VEN8_009,
+ TX_VEN8_010, TX_VEN8_011, TX_VEN8_012, TX_VEN8_013,
+ TX_VEN8_014, TX_VEN8_015, TX_VEN8_016, TX_VEN8_018, TX_VEN8_020,
+ TX_VEN8_021, TX_VEN8_023, TX_VEN8_024, TX_VEN8_025, TX_VEN8_026,
+ TX_VEN8_027, TX_VEN8_028, TX_VEN8_029, TX_VEN8_030, TX_VEN8_031,
+ TX_VEN8_032, TX_VEN8_033, TX_VEN8_034, TX_VEN8_035, TX_VEN8_036,
+ TX_VEN8_037, TX_VEN8_038, TX_VEN8_039, TX_VEN8_040, TX_VEN8_041,
+ TX_VEN8_042, TX_VENA_F32, TX_VENA_F34, TX_VENA_F40
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng8TextOffsets[] = {
- //{ TX_SPEAKER_KIRK, 2597, 0 },
- //{ TX_SPEAKER_MCCOY, 2622, 0 },
- //{ TX_SPEAKER_SPOCK, 2632, 0 },
- //{ TX_SPEAKER_EVERTS, 2642, 0 },
+ { TX_SPEAKER_KIRK, 7744, 0 },
+ { TX_SPEAKER_MCCOY, 7755, 0 },
+ { TX_SPEAKER_SPOCK, 7765, 0 },
+ { TX_SPEAKER_KIJE, 7779, 0 },
+ { TX_BRIDU146, 7146, 0 },
+ { TX_MUD4_018, 7077, 0 },
+ //{ TX_MUD4_018, 7210, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 7278, 0 },
+ { TX_VEN2_028, 7385, 0 },
+ { TX_VEN2_066, 7463, 0 },
+ { TX_VEN2_098, 6273, 0 },
+ { TX_VEN4N010, 6927, 0 },
+ { TX_VEN5N002, 1314, 0 },
+ { TX_VEN5N004, 1369, 0 },
+ { TX_VEN6N007, 6992, 0 },
+ { TX_VEN8N000, 1449, 0 },
+ { TX_VEN8N001, 1254, 0 },
+ { TX_VEN8N003, 1079, 0 },
+ { TX_VEN8N004, 695, 0 },
+ { TX_VEN8N005, 1621, 0 },
+ { TX_VEN8N006, 892, 0 },
+ { TX_VEN8N007, 990, 0 },
+ { TX_VEN8N008, 1173, 0 },
+ { TX_VEN8N009, 805, 0 },
+ { TX_VEN8N010, 1519, 0 },
+ { TX_VEN8_001, 2288, 0 },
+ { TX_VEN8_002, 1721, 0 },
+ { TX_VEN8_003, 2892, 0 },
+ { TX_VEN8_004, 4214, 0 },
+ { TX_VEN8_005, 1809, 0 },
+ { TX_VEN8_006, 1876, 0 },
+ { TX_VEN8_007, 5851, 0 },
+ { TX_VEN8_008, 5667, 0 },
+ { TX_VEN8_009, 5092, 0 },
+ //{ TX_VEN8_009, 3845, 0 }, // Skip duplicate text
+ { TX_VEN8_010, 4795, 0 },
+ { TX_VEN8_011, 3584, 0 },
+ { TX_VEN8_012, 5371, 0 },
+ { TX_VEN8_013, 4576, 0 },
+ { TX_VEN8_014, 3169, 0 },
+ { TX_VEN8_015, 4458, 0 },
+ { TX_VEN8_016, 7815, 0 },
+ { TX_VEN8_018, 2443, 0 },
+ { TX_VEN8_020, 2215, 0 },
+ { TX_VEN8_021, 2391, 0 },
+ { TX_VEN8_023, 2628, 0 },
+ { TX_VEN8_024, 7890, 0 },
+ { TX_VEN8_025, 6123, 0 },
+ { TX_VEN8_026, 3070, 0 },
+ { TX_VEN8_027, 4359, 0 },
+ { TX_VEN8_028, 2130, 0 },
+ { TX_VEN8_029, 2050, 0 },
+ { TX_VEN8_030, 3263, 0 },
+ { TX_VEN8_031, 3429, 0 },
+ { TX_VEN8_032, 1986, 0 },
+ { TX_VEN8_033, 3717, 0 },
+ { TX_VEN8_034, 2576, 0 },
+ { TX_VEN8_035, 4984, 0 },
+ { TX_VEN8_036, 2682, 0 },
+ { TX_VEN8_037, 5258, 0 },
+ { TX_VEN8_038, 5770, 0 },
+ { TX_VEN8_039, 5455, 0 },
+ { TX_VEN8_040, 2812, 0 },
+ { TX_VEN8_041, 2757, 0 },
+ { TX_VEN8_042, 4668, 0 },
+ { TX_VENA_F32, 6503, 0 },
+ { TX_VENA_F34, 6773, 0 },
+ { TX_VENA_F40, 6368, 0 },
{ -1, 0, 0 }
};
@@ -398,4 +474,3 @@ void Room::veng8UseSTricorderOnConsole() {
}
}
-#endif
More information about the Scummvm-git-logs
mailing list