Permalink
Browse files

STARTREK: Further Compilation Fixes.

Further cases of int vs. int32 / TextRef usage.
  • Loading branch information...
digitall committed Aug 9, 2018
1 parent 52372de commit cc9f820115a2516ff9ba0e882f9afed1f38aa75f
Showing with 8 additions and 8 deletions.
  1. +2 −2 engines/startrek/rooms/demon3.cpp
  2. +2 −2 engines/startrek/rooms/demon4.cpp
  3. +4 −4 engines/startrek/rooms/demon6.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
@@ -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) {
@@ -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 @@ void Room::demon6UseCrewmanOnCase() {
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 @@ void Room::demon6UseCrewmanOnCase() {
}
} 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)

0 comments on commit cc9f820

Please sign in to comment.