diff options
| author | D G Turner | 2018-08-09 13:59:29 +0100 |
|---|---|---|
| committer | D G Turner | 2018-08-09 13:59:29 +0100 |
| commit | cc9f820115a2516ff9ba0e882f9afed1f38aa75f (patch) | |
| tree | 31c7b3969316174747b7514dca67bc078fe4a598 /engines/startrek/rooms | |
| parent | 52372dea7069a46a29ccc69f8415e0fd4e3a2731 (diff) | |
| download | scummvm-rg350-cc9f820115a2516ff9ba0e882f9afed1f38aa75f.tar.gz scummvm-rg350-cc9f820115a2516ff9ba0e882f9afed1f38aa75f.tar.bz2 scummvm-rg350-cc9f820115a2516ff9ba0e882f9afed1f38aa75f.zip | |
STARTREK: Further Compilation Fixes.
Further cases of int vs. int32 / TextRef usage.
Diffstat (limited to 'engines/startrek/rooms')
| -rw-r--r-- | engines/startrek/rooms/demon3.cpp | 4 | ||||
| -rw-r--r-- | engines/startrek/rooms/demon4.cpp | 4 | ||||
| -rw-r--r-- | engines/startrek/rooms/demon6.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/startrek/rooms/demon3.cpp b/engines/startrek/rooms/demon3.cpp index e30a5fc671..8f3bf3b9be 100644 --- a/engines/startrek/rooms/demon3.cpp +++ b/engines/startrek/rooms/demon3.cpp @@ -344,14 +344,14 @@ void Room::demon3RedshirtUsedPanel() { _awayMission->redshirtDead = true; _awayMission->demon.field45 = true; } else { - const int textTable[] = { + const TextRef textTable[] = { TX_DEM3N005, TX_DEM3_033, TX_DEM3_035, TX_DEM3_034, }; - int text[] = { + TextRef text[] = { TX_SPEAKER_EVERTS, TX_NULL, TX_BLANK diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp index 615a19a811..0793cda6cb 100644 --- a/engines/startrek/rooms/demon4.cpp +++ b/engines/startrek/rooms/demon4.cpp @@ -227,7 +227,7 @@ void Room::demon4TalkToNauian() { _awayMission->demon.metNauian = true; showText(TX_SPEAKER_NAUIAN, TX_DEM4_044); - const int choices[] = { TX_SPEAKER_KIRK, TX_DEM4_002, TX_DEM4_004, TX_DEM4_009, TX_BLANK }; + const TextRef choices[] = { TX_SPEAKER_KIRK, TX_DEM4_002, TX_DEM4_004, TX_DEM4_009, TX_BLANK }; int choice = showText(choices); switch (choice) { @@ -250,7 +250,7 @@ void Room::demon4TalkToNauian() { showText(TX_SPEAKER_NAUIAN, TX_DEM4_043); - const int choices2[] = { TX_SPEAKER_KIRK, TX_DEM4_008, TX_DEM4_007, TX_BLANK }; + const TextRef choices2[] = { TX_SPEAKER_KIRK, TX_DEM4_008, TX_DEM4_007, TX_BLANK }; choice = showText(choices2); switch (choice) { diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp index 488683eb28..c958922baa 100644 --- a/engines/startrek/rooms/demon6.cpp +++ b/engines/startrek/rooms/demon6.cpp @@ -238,8 +238,8 @@ void Room::demon6UseCrewmanOnCase() { if (_roomVar.demon.insultedStephenRecently) return; showText(TX_SPEAKER_STEPHEN, TX_DEM6_044); - int choices1[] = {TX_SPEAKER_KIRK, TX_DEM6_001, TX_DEM6_006, TX_DEM6_003, TX_BLANK}; - int choice = showText(choices1); + TextRef choices1[] = {TX_SPEAKER_KIRK, TX_DEM6_001, TX_DEM6_006, TX_DEM6_003, TX_BLANK}; + TextRef choice = showText(choices1); if (choice == 0) { insult: @@ -251,7 +251,7 @@ insult: explain: while (true) { showText(TX_SPEAKER_STEPHEN, TX_DEM6_051); - int choices2[] = {TX_SPEAKER_STEPHEN, TX_DEM6_045, TX_DEM6_046, TX_DEM6_047, TX_DEM6_048, TX_DEM6_049, TX_DEM6_050, TX_BLANK}; + TextRef choices2[] = {TX_SPEAKER_STEPHEN, TX_DEM6_045, TX_DEM6_046, TX_DEM6_047, TX_DEM6_048, TX_DEM6_049, TX_DEM6_050, TX_BLANK}; choice = showText(choices2); switch (choice) { @@ -280,7 +280,7 @@ explain: } } else if (choice == 2) { showText(TX_SPEAKER_STEPHEN, TX_DEM6_031); - int choices3[] = {TX_SPEAKER_KIRK, TX_DEM6_001, TX_DEM6_006, TX_BLANK}; + TextRef choices3[] = {TX_SPEAKER_KIRK, TX_DEM6_001, TX_DEM6_006, TX_BLANK}; choice = showText(choices3); if (choice == 0) |