diff options
Diffstat (limited to 'engines/startrek/rooms/veng1.cpp')
| -rw-r--r-- | engines/startrek/rooms/veng1.cpp | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/engines/startrek/rooms/veng1.cpp b/engines/startrek/rooms/veng1.cpp index dc39eb588b..e6834580de 100644 --- a/engines/startrek/rooms/veng1.cpp +++ b/engines/startrek/rooms/veng1.cpp @@ -116,9 +116,10 @@ extern const RoomAction veng1ActionList[] = { { {ACTION_DONE_WALK, 11, 0, 0}, &Room::veng1ReachedDebrisToGet }, { {ACTION_DONE_ANIM, 12, 0, 0}, &Room::veng1TriedToGetDebris }, - { {ACTION_USE, OBJECT_IMEDKIT, OBJECT_DEAD_GUY, 0}, &Room::veng1UseMccoyOnDeadGuy }, - { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_DEAD_GUY, 0}, &Room::veng1UseMccoyOnDeadGuy }, - { {ACTION_USE, OBJECT_MCCOY, OBJECT_DEAD_GUY, 0}, &Room::veng1UseMccoyOnDeadGuy }, + // Common code + { {ACTION_USE, OBJECT_IMEDKIT, OBJECT_DEAD_GUY, 0}, &Room::vengaUseMccoyOnDeadGuy }, + { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_DEAD_GUY, 0}, &Room::vengaUseMccoyOnDeadGuy }, + { {ACTION_USE, OBJECT_MCCOY, OBJECT_DEAD_GUY, 0}, &Room::vengaUseMccoyOnDeadGuy }, }; extern const int veng1NumActions = ARRAYSIZE(veng1ActionList); @@ -390,31 +391,4 @@ void Room::veng1TriedToGetDebris() { } } -void Room::veng1UseMccoyOnDeadGuy() { // NOTE: Identical to function in VENG3 - int val = getRandomWordInRange(0, 5); - - switch (val) { - case 0: - // NOTE: The exact text differs from the text used in DEM3. But, in order for this - // text indexing scheme to work, two rooms can't use the same audio with different - // text. Original was "He's dead, jim." instead of "He's dead, Jim...". - showText(TX_SPEAKER_MCCOY, TX_DEM3_019); - break; - - case 1: - showText(TX_SPEAKER_MCCOY, TX_VEN4_016); - break; - - case 2: - case 3: - showText(TX_SPEAKER_MCCOY, TX_G_014); - break; - - case 4: - case 5: - showText(TX_SPEAKER_MCCOY, TX_VEN0_016); - break; - } -} - } |