diff options
| author | D G Turner | 2018-08-09 14:37:35 +0100 |
|---|---|---|
| committer | D G Turner | 2018-08-09 14:37:35 +0100 |
| commit | 7e4faf2111ca7e563e550958c8ab4adc17513766 (patch) | |
| tree | 452aba5eccbc8367c2e185771880ea03a18dc523 /engines/startrek/rooms | |
| parent | 42a1b579cb2a20832ede0a6ad3ce16ae685191cd (diff) | |
| download | scummvm-rg350-7e4faf2111ca7e563e550958c8ab4adc17513766.tar.gz scummvm-rg350-7e4faf2111ca7e563e550958c8ab4adc17513766.tar.bz2 scummvm-rg350-7e4faf2111ca7e563e550958c8ab4adc17513766.zip | |
STARTREK: Hopefully Fix Remaining Compilation Issues.
Diffstat (limited to 'engines/startrek/rooms')
| -rw-r--r-- | engines/startrek/rooms/love0.cpp | 2 | ||||
| -rw-r--r-- | engines/startrek/rooms/love5.cpp | 2 | ||||
| -rw-r--r-- | engines/startrek/rooms/mudd1.cpp | 2 | ||||
| -rw-r--r-- | engines/startrek/rooms/mudd3.cpp | 2 | ||||
| -rw-r--r-- | engines/startrek/rooms/mudd4.cpp | 4 | ||||
| -rw-r--r-- | engines/startrek/rooms/tug3.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/startrek/rooms/love0.cpp b/engines/startrek/rooms/love0.cpp index 1ad949bacc..0e841897b6 100644 --- a/engines/startrek/rooms/love0.cpp +++ b/engines/startrek/rooms/love0.cpp @@ -234,7 +234,7 @@ void Room::love0MccoyAccessedConsole() { // Interact with computer console, by selecting topics for the computer to talk about void Room::love0InteractWithConsole() { - const int choices[] = { + const TextRef choices[] = { TX_SPEAKER_COMPUTER, TX_COMPA190, TX_COMPA193, diff --git a/engines/startrek/rooms/love5.cpp b/engines/startrek/rooms/love5.cpp index 370f06336a..239d413c80 100644 --- a/engines/startrek/rooms/love5.cpp +++ b/engines/startrek/rooms/love5.cpp @@ -157,7 +157,7 @@ void Room::love5TalkToPreax() { if (!_awayMission->love.freedMarcusAndCheever) showText(TX_LOV5N006); else { - const int choices[] = { + const TextRef choices[] = { TX_SPEAKER_KIRK, TX_LOV5_008, TX_LOV5_004, diff --git a/engines/startrek/rooms/mudd1.cpp b/engines/startrek/rooms/mudd1.cpp index f3da75350b..0da6f7660d 100644 --- a/engines/startrek/rooms/mudd1.cpp +++ b/engines/startrek/rooms/mudd1.cpp @@ -153,7 +153,7 @@ void Room::mudd1SpockPressedRedButton() { _awayMission->disableInput = false; _awayMission->mudd.knowAboutTorpedo = true; - const int choices[] = { + const TextRef choices[] = { TX_SPEAKER_KIRK, TX_MUD1_004, TX_MUD1_003, diff --git a/engines/startrek/rooms/mudd3.cpp b/engines/startrek/rooms/mudd3.cpp index eb02450f9b..d11d9d8e36 100644 --- a/engines/startrek/rooms/mudd3.cpp +++ b/engines/startrek/rooms/mudd3.cpp @@ -249,7 +249,7 @@ void Room::mudd3Timer1Expired() { // Tricorders ready for use again // Harry Mudd stumbled into the room void Room::mudd3Timer2Expired() { - const int choices[] = { + const TextRef choices[] = { TX_SPEAKER_KIRK, TX_MUD3_010, TX_MUD3_009, diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp index 4a1a1eedb4..1a73c6b360 100644 --- a/engines/startrek/rooms/mudd4.cpp +++ b/engines/startrek/rooms/mudd4.cpp @@ -357,7 +357,7 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() { || _awayMission->mudd.muddErasedDatabase || _awayMission->mudd.databaseDestroyed || !_awayMission->mudd.accessedAlienDatabase) { // NOTE: why this last line? Test this... - const int choices[] = { + const TextRef choices[] = { TX_SPEAKER_KIRK, TX_MUD4_009, TX_MUD4_016, @@ -418,7 +418,7 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() { endMission(_awayMission->mudd.missionScore, 0x1b, _awayMission->mudd.torpedoStatus); } } else { - const int choices[] = { + const TextRef choices[] = { TX_SPEAKER_KIRK, TX_MUD4_014, TX_MUD4_021, diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp index 0d7537cea9..bccd173c1e 100644 --- a/engines/startrek/rooms/tug3.cpp +++ b/engines/startrek/rooms/tug3.cpp @@ -224,7 +224,7 @@ void Room::tug3TalkToElasi1() { return; _awayMission->tug.talkedToCereth = true; - const int choices[] = { + const TextRef choices[] = { TX_SPEAKER_KIRK, TX_TUG3_004, TX_TUG3_003, |