diff options
author | Filippos Karapetis | 2019-06-11 01:28:12 +0300 |
---|---|---|
committer | Filippos Karapetis | 2019-06-11 01:28:12 +0300 |
commit | e8f0e9e998a8d16ff037ed48ae7676592179d5c6 (patch) | |
tree | 7d48402b71ac00e526e52b62e276eed92da0ed98 /engines/startrek/rooms/demon0.cpp | |
parent | 05301c240b3ccc195c533cf7a2eddde683ee7d06 (diff) | |
download | scummvm-rg350-e8f0e9e998a8d16ff037ed48ae7676592179d5c6.tar.gz scummvm-rg350-e8f0e9e998a8d16ff037ed48ae7676592179d5c6.tar.bz2 scummvm-rg350-e8f0e9e998a8d16ff037ed48ae7676592179d5c6.zip |
STARTREK: Rename the different showText() functions for disambiguation
Hopefully, this will fix the AmigaOS and DS builds
Diffstat (limited to 'engines/startrek/rooms/demon0.cpp')
-rw-r--r-- | engines/startrek/rooms/demon0.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp index 2aaba6f791..2a16bd5bb1 100644 --- a/engines/startrek/rooms/demon0.cpp +++ b/engines/startrek/rooms/demon0.cpp @@ -162,7 +162,7 @@ void Room::demon0TalkToPrelate() { const TextRef *response = nullptr; - switch (showText(options1, true)) { + switch (showMultipleTexts(options1, true)) { case 0: response = firstResponse0; break; @@ -175,26 +175,26 @@ void Room::demon0TalkToPrelate() { } if (response != nullptr) - showText(response, true); + showMultipleTexts(response, true); - if (showText(options2, true) == 1) + if (showMultipleTexts(options2, true) == 1) demon0BadResponse(); - showText(secondResponse, true); + showMultipleTexts(secondResponse, true); - if (showText(options3, true) == 1) + if (showMultipleTexts(options3, true) == 1) demon0BadResponse(); - showText(thirdResponse, true); + showMultipleTexts(thirdResponse, true); if (_awayMission->demon.wasRudeToPrelate) - showText(badConclusion, true); + showMultipleTexts(badConclusion, true); else - showText(goodConclusion, true); + showMultipleTexts(goodConclusion, true); } void Room::demon0LookAtPrelate() { - showText(4, true); + showDescription(4, true); } void Room::demon0UsePhaserOnSnow() { @@ -222,39 +222,39 @@ void Room::demon0LookAtSign() { } void Room::demon0LookAtTrees() { - showText(6, true); + showDescription(6, true); } void Room::demon0LookAtSnow() { - showText(7, true); + showDescription(7, true); } void Room::demon0LookAnywhere() { - showText(0, true); + showDescription(0, true); } void Room::demon0LookAtBushes() { - showText(10, true); + showDescription(10, true); } void Room::demon0LookAtKirk() { - showText(5, true); + showDescription(5, true); } void Room::demon0LookAtMcCoy() { - showText(2, true); + showDescription(2, true); } void Room::demon0LookAtRedShirt() { - showText(3, true); + showDescription(3, true); } void Room::demon0LookAtSpock() { - showText(9, true); + showDescription(9, true); } void Room::demon0LookAtShelter() { - showText(1, true); + showDescription(1, true); } void Room::demon0TalkToKirk() { |