[Scummvm-git-logs] scummvm master -> 52372dea7069a46a29ccc69f8415e0fd4e3a2731

[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:
52372dea70 STARTREK: Further Compilation Fixes.


Commit: 52372dea7069a46a29ccc69f8415e0fd4e3a2731
    https://github.com/scummvm/scummvm/commit/52372dea7069a46a29ccc69f8415e0fd4e3a2731
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T13:24:00+01:00

Commit Message:
STARTREK: Further Compilation Fixes.

Mismatch in types caused compilation failure for ports where int was
not identical to int32 which is the typedef for TextRef.

Changed paths:
    engines/startrek/rooms/demon0.cpp


diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp
index 6dd3315..6a51186 100644
--- a/engines/startrek/rooms/demon0.cpp
+++ b/engines/startrek/rooms/demon0.cpp
@@ -104,51 +104,51 @@ void Room::demon0ReachedTopDoor() {
 }
 
 void Room::demon0TalkToPrelate() {
-	const int options1[] = {
+	const TextRef options1[] = {
 		TX_SPEAKER_KIRK,
 		TX_DEM0_006,
 		TX_DEM0_008,
 		TX_DEM0_003,
 		TX_BLANK
 	};
-	const int firstResponse0[] = {
+	const TextRef firstResponse0[] = {
 		TX_SPEAKER_ANGIVEN,
 		TX_DEM0_038,
 		TX_BLANK
 	};
-	const int firstResponse1[] = {
+	const TextRef firstResponse1[] = {
 		TX_SPEAKER_ANGIVEN,
 		TX_DEM0_032,
 		TX_BLANK
 	};
-	const int options2[] = {
+	const TextRef options2[] = {
 		TX_SPEAKER_KIRK,
 		TX_DEM0_002,
 		TX_DEM0_005,
 		TX_BLANK
 	};
-	const int secondResponse[] = {
+	const TextRef secondResponse[] = {
 		TX_SPEAKER_ANGIVEN,
 		TX_DEM0_031,
 		TX_BLANK
 	};
-	const int options3[] = {
+	const TextRef options3[] = {
 		TX_SPEAKER_KIRK,
 		TX_DEM0_010,
 		TX_DEM0_012,
 		TX_BLANK
 	};
-	const int thirdResponse[] = {
+	const TextRef thirdResponse[] = {
 		TX_SPEAKER_ANGIVEN,
 		TX_DEM0_035,
 		TX_BLANK
 	};
-	const int badConclusion[] = {
+	const TextRef badConclusion[] = {
 		TX_SPEAKER_ANGIVEN,
 		TX_DEM0_037,
 		TX_BLANK
 	};
-	const int goodConclusion[] = {
+	const TextRef goodConclusion[] = {
 		TX_SPEAKER_ANGIVEN,
 		TX_DEM0_034,
 		TX_BLANK
@@ -160,7 +160,7 @@ void Room::demon0TalkToPrelate() {
 	_awayMission->demon.missionScore += 3;
 	_awayMission->demon.talkedToPrelate = true;
 
-	const int *response = nullptr;
+	const TextRef *response = nullptr;
 
 	switch (showText(options1)) {
 	case 0: