[Scummvm-git-logs] scummvm master -> 7e4faf2111ca7e563e550958c8ab4adc17513766

[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:
7e4faf2111 STARTREK: Hopefully Fix Remaining Compilation Issues.


Commit: 7e4faf2111ca7e563e550958c8ab4adc17513766
    https://github.com/scummvm/scummvm/commit/7e4faf2111ca7e563e550958c8ab4adc17513766
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T14:37:35+01:00

Commit Message:
STARTREK: Hopefully Fix Remaining Compilation Issues.

Changed paths:
    engines/startrek/rooms/love0.cpp
    engines/startrek/rooms/love5.cpp
    engines/startrek/rooms/mudd1.cpp
    engines/startrek/rooms/mudd3.cpp
    engines/startrek/rooms/mudd4.cpp
    engines/startrek/rooms/tug3.cpp


diff --git a/engines/startrek/rooms/love0.cpp b/engines/startrek/rooms/love0.cpp
index 1ad949b..0e84189 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 370f063..239d413 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 f3da753..0da6f76 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 eb02450..d11d9d8 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 4a1a1ee..1a73c6b 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 0d7537c..bccd173 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,