diff options
Diffstat (limited to 'engines/lastexpress/entities/gendarmes.cpp')
-rw-r--r-- | engines/lastexpress/entities/gendarmes.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/engines/lastexpress/entities/gendarmes.cpp b/engines/lastexpress/entities/gendarmes.cpp index 1c2f6b7e8b..55e86d3e9e 100644 --- a/engines/lastexpress/entities/gendarmes.cpp +++ b/engines/lastexpress/entities/gendarmes.cpp @@ -119,73 +119,73 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition) if (params->param2 <= kPosition_3050) { if (params->param2 != kPosition_3050) { if (params->param2 == kPosition_2740) - CURRENT_PARAMS(2, 5) = kObjectCompartment8; + CURRENT_PARAM(2, 5) = kObjectCompartment8; } else { - CURRENT_PARAMS(2, 5) = kObjectCompartment7; - CURRENT_PARAMS(2, 6) = true; + CURRENT_PARAM(2, 5) = kObjectCompartment7; + CURRENT_PARAM(2, 6) = true; } } else if (params->param2 <= kPosition_4840) { if (params->param2 != kPosition_4840) { if (params->param2 == kPosition_4070) { - CURRENT_PARAMS(2, 5) = kObjectCompartment6; - CURRENT_PARAMS(2, 7) = kPosition_4455; + CURRENT_PARAM(2, 5) = kObjectCompartment6; + CURRENT_PARAM(2, 7) = kPosition_4455; } } else { - CURRENT_PARAMS(2, 5) = kObjectCompartment5; - CURRENT_PARAMS(2, 6) = true; - CURRENT_PARAMS(2, 7) = kPosition_4455; + CURRENT_PARAM(2, 5) = kObjectCompartment5; + CURRENT_PARAM(2, 6) = true; + CURRENT_PARAM(2, 7) = kPosition_4455; } } else if (params->param2 <= kPosition_6470) { if (params->param2 != kPosition_6470) { if (params->param2 == kPosition_5790) { - CURRENT_PARAMS(2, 5) = kObjectCompartment4; - CURRENT_PARAMS(2, 7) = kPosition_6130; + CURRENT_PARAM(2, 5) = kObjectCompartment4; + CURRENT_PARAM(2, 7) = kPosition_6130; } } else { - CURRENT_PARAMS(2, 5) = kObjectCompartment3; - CURRENT_PARAMS(2, 6) = true; - CURRENT_PARAMS(2, 7) = kPosition_6130; + CURRENT_PARAM(2, 5) = kObjectCompartment3; + CURRENT_PARAM(2, 6) = true; + CURRENT_PARAM(2, 7) = kPosition_6130; } } else if (params->param2 != kPosition_7500) { if (params->param2 == kPosition_8200) { - CURRENT_PARAMS(2, 5) = kObjectCompartment1; - CURRENT_PARAMS(2, 6) = true; - CURRENT_PARAMS(2, 7) = kPosition_7850; + CURRENT_PARAM(2, 5) = kObjectCompartment1; + CURRENT_PARAM(2, 6) = true; + CURRENT_PARAM(2, 7) = kPosition_7850; } } else { - CURRENT_PARAMS(2, 5) = kObjectCompartment2; - CURRENT_PARAMS(2, 7) = kPosition_7850; + CURRENT_PARAM(2, 5) = kObjectCompartment2; + CURRENT_PARAM(2, 7) = kPosition_7850; } if (params->param1 == kCarBaggageRear) - CURRENT_PARAMS(2, 5) += 31; // Switch to next compartment car + CURRENT_PARAM(2, 5) += 31; // Switch to next compartment car - if (CURRENT_PARAMS(2, 6)) { - strcpy((char *)&CURRENT_PARAMS(1, 1), "632A"); - strcpy((char *)&CURRENT_PARAMS(1, 4), "632B"); - strcpy((char *)&CURRENT_PARAMS(1, 7), "632C"); + if (CURRENT_PARAM(2, 6)) { + strcpy((char *)&CURRENT_PARAM(1, 1), "632A"); + strcpy((char *)&CURRENT_PARAM(1, 4), "632B"); + strcpy((char *)&CURRENT_PARAM(1, 7), "632C"); } else { - strcpy((char *)&CURRENT_PARAMS(1, 1), "632D"); - strcpy((char *)&CURRENT_PARAMS(1, 4), "632E"); - strcpy((char *)&CURRENT_PARAMS(1, 7), "632F"); + strcpy((char *)&CURRENT_PARAM(1, 1), "632D"); + strcpy((char *)&CURRENT_PARAM(1, 4), "632E"); + strcpy((char *)&CURRENT_PARAM(1, 7), "632F"); } - strcat((char *)&CURRENT_PARAMS(1, 1), (char *)¶ms->seq1); - strcat((char *)&CURRENT_PARAMS(1, 4), (char *)¶ms->seq1); - strcat((char *)&CURRENT_PARAMS(1, 7), (char *)¶ms->seq1); + strcat((char *)&CURRENT_PARAM(1, 1), (char *)¶ms->seq1); + strcat((char *)&CURRENT_PARAM(1, 4), (char *)¶ms->seq1); + strcat((char *)&CURRENT_PARAM(1, 7), (char *)¶ms->seq1); if ((getEntities()->isInsideCompartment(kEntityPlayer, (CarIndex)params->param1, (EntityPosition)params->param2) - || getEntities()->isInsideCompartment(kEntityPlayer, (CarIndex)params->param1, (EntityPosition)CURRENT_PARAMS(2, 7)) + || getEntities()->isInsideCompartment(kEntityPlayer, (CarIndex)params->param1, (EntityPosition)CURRENT_PARAM(2, 7)) || (params->param1 == kCarGreenSleeping && params->param2 == kPosition_8200 && getEntities()->isOutsideAlexeiWindow())) && !getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_7850)) { setCallback(1); - setup_function10((CarIndex)params->param1, (EntityPosition)params->param2, (ObjectIndex)CURRENT_PARAMS(2, 5)); + setup_function10((CarIndex)params->param1, (EntityPosition)params->param2, (ObjectIndex)CURRENT_PARAM(2, 5)); } else { - getEntities()->drawSequenceLeft(kEntityGendarmes, (char *)&CURRENT_PARAMS(1, 1)); - getEntities()->enterCompartment(kEntityGendarmes, (ObjectIndex)CURRENT_PARAMS(2, 5)); + getEntities()->drawSequenceLeft(kEntityGendarmes, (char *)&CURRENT_PARAM(1, 1)); + getEntities()->enterCompartment(kEntityGendarmes, (ObjectIndex)CURRENT_PARAM(2, 5)); - setCallback(CURRENT_PARAMS(2, 6) ? 2 : 3); - setup_arrestPlaysound(CURRENT_PARAMS(2, 6) ? "POL1044A" : "POL1044B"); + setCallback(CURRENT_PARAM(2, 6) ? 2 : 3); + setup_arrestPlaysound(CURRENT_PARAM(2, 6) ? "POL1044A" : "POL1044B"); } break; @@ -200,12 +200,12 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition) case 2: case 3: - getEntities()->drawSequenceLeft(kEntityGendarmes, (char *)&CURRENT_PARAMS(1, 4)); + getEntities()->drawSequenceLeft(kEntityGendarmes, (char *)&CURRENT_PARAM(1, 4)); if (getEntities()->isNobodyInCompartment((CarIndex)params->param1, (EntityPosition)params->param2) || !strcmp(params->seq2, "NODIALOG")) { setCallback(4); setup_arrestCallback(150); } else { - char *arrestSound = (char *)&CURRENT_PARAMS(2, 2); + char *arrestSound = (char *)&CURRENT_PARAM(2, 2); strcpy(arrestSound, "POL1045"); strcat(arrestSound, (char *)¶ms->seq2); @@ -217,7 +217,7 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition) case 4: case 5: if (!getEntities()->isNobodyInCompartment((CarIndex)params->param1, (EntityPosition)params->param2) && strcmp(params->seq2, "NODIALOG")) { - char *arrestSound = (char *)&CURRENT_PARAMS(2, 2); + char *arrestSound = (char *)&CURRENT_PARAM(2, 2); strcpy(arrestSound, "POL1043"); strcat(arrestSound, (char *)¶ms->seq2); @@ -227,12 +227,12 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition) getData()->location = kLocationInsideCompartment; setCallback(6); - setup_arrestDraw((char *)&CURRENT_PARAMS(1, 7)); + setup_arrestDraw((char *)&CURRENT_PARAM(1, 7)); break; case 6: getData()->location = kLocationOutsideCompartment; - getEntities()->exitCompartment(kEntityGendarmes, (ObjectIndex)CURRENT_PARAMS(2, 5)); + getEntities()->exitCompartment(kEntityGendarmes, (ObjectIndex)CURRENT_PARAM(2, 5)); CALLBACK_ACTION(); break; } |