[Scummvm-git-logs] scummvm master -> 42a1b579cb2a20832ede0a6ad3ce16ae685191cd

[digitall]

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:
42a1b579cb STARTREK: Even More Compilation Fixes.


Commit: 42a1b579cb2a20832ede0a6ad3ce16ae685191cd
    https://github.com/scummvm/scummvm/commit/42a1b579cb2a20832ede0a6ad3ce16ae685191cd
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T14:17:39+01:00

Commit Message:
STARTREK: Even More Compilation Fixes.

Changed paths:
    engines/startrek/room.cpp
    engines/startrek/rooms/demon4.cpp


diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index a86d31b..dcb873e 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 0793cda..d7e3227 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) {