aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2018-08-09 14:17:39 +0100
committerD G Turner2018-08-09 14:17:39 +0100
commit42a1b579cb2a20832ede0a6ad3ce16ae685191cd (patch)
tree802510cf68d5bc502fbe61b8548faad51dba048a /engines
parentcc9f820115a2516ff9ba0e882f9afed1f38aa75f (diff)
downloadscummvm-rg350-42a1b579cb2a20832ede0a6ad3ce16ae685191cd.tar.gz
scummvm-rg350-42a1b579cb2a20832ede0a6ad3ce16ae685191cd.tar.bz2
scummvm-rg350-42a1b579cb2a20832ede0a6ad3ce16ae685191cd.zip
STARTREK: Even More Compilation Fixes.
Diffstat (limited to 'engines')
-rw-r--r--engines/startrek/room.cpp2
-rw-r--r--engines/startrek/rooms/demon4.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index a86d31b3d0..dcb873e5ac 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -313,7 +313,7 @@ int Room::showText(const TextRef *textIDs) {
}
int Room::showText(TextRef speaker, TextRef text) {
- int textIDs[3];
+ TextRef textIDs[3];
textIDs[0] = speaker;
textIDs[1] = text;
textIDs[2] = TX_BLANK;
diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp
index 0793cda6cb..d7e3227a8c 100644
--- a/engines/startrek/rooms/demon4.cpp
+++ b/engines/startrek/rooms/demon4.cpp
@@ -186,7 +186,7 @@ void Room::demon4UseSkullOnNauian() {
void Room::demon4KirkReachedNauianWithSkull() {
showText(TX_SPEAKER_NAUIAN, TX_DEM4_036);
- const int choices[] = { TX_SPEAKER_KIRK, TX_DEM4_006, TX_DEM4_003, TX_DEM4_005, TX_BLANK };
+ const TextRef choices[] = { TX_SPEAKER_KIRK, TX_DEM4_006, TX_DEM4_003, TX_DEM4_005, TX_BLANK };
int choice = showText(choices);
switch (choice) {