From 002557fbd2575e2cdb82e19c9909a4c654593139 Mon Sep 17 00:00:00 2001 From: Julien Templier Date: Thu, 21 Oct 2010 23:44:59 +0000 Subject: LASTEXPRESS: Rename CURRENT_PARAMS to CURRENT_PARAM svn-id: r53691 --- engines/lastexpress/entities/alexei.cpp | 4 +- engines/lastexpress/entities/august.cpp | 28 +++++----- engines/lastexpress/entities/chapters.cpp | 84 ++++++++++++++-------------- engines/lastexpress/entities/coudert.cpp | 12 ++-- engines/lastexpress/entities/entity.cpp | 10 ++-- engines/lastexpress/entities/entity_intern.h | 2 +- engines/lastexpress/entities/francois.cpp | 16 +++--- engines/lastexpress/entities/gendarmes.cpp | 80 +++++++++++++------------- engines/lastexpress/entities/kronos.cpp | 10 ++-- engines/lastexpress/entities/mertens.cpp | 12 ++-- engines/lastexpress/entities/milos.cpp | 36 ++++++------ engines/lastexpress/entities/mmeboutarel.cpp | 4 +- engines/lastexpress/entities/tatiana.cpp | 12 ++-- engines/lastexpress/entities/verges.cpp | 14 ++--- 14 files changed, 162 insertions(+), 162 deletions(-) (limited to 'engines/lastexpress/entities') diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp index 664eb18782..890a2af65f 100644 --- a/engines/lastexpress/entities/alexei.cpp +++ b/engines/lastexpress/entities/alexei.cpp @@ -319,7 +319,7 @@ IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue) } if (params->param5) { - UPDATE_PARAM(CURRENT_PARAMS(1, 1), getState()->timeTicks, 75); + UPDATE_PARAM(CURRENT_PARAM(1, 1), getState()->timeTicks, 75); params->param5 = 0; params->param6 = 1; @@ -328,7 +328,7 @@ IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue) getObjects()->update(kObjectHandleInsideBathroom, kEntityAlexei, kObjectLocation1, kCursorNormal, kCursorNormal); } - CURRENT_PARAMS(1, 1) = 0; + CURRENT_PARAM(1, 1) = 0; break; case kActionKnock: diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp index c152d13c2a..0882eabeed 100644 --- a/engines/lastexpress/entities/august.cpp +++ b/engines/lastexpress/entities/august.cpp @@ -541,9 +541,9 @@ label_continue: break; if (params->param6) { - UPDATE_PARAM_PROC(CURRENT_PARAMS(1, 1), getState()->time, 6300) + UPDATE_PARAM_PROC(CURRENT_PARAM(1, 1), getState()->time, 6300) params->param6 = 0; - CURRENT_PARAMS(1, 1) = 0; + CURRENT_PARAM(1, 1) = 0; UPDATE_PARAM_PROC_END } @@ -638,7 +638,7 @@ label_continue: params->param3 = 0; params->param5 = 0; params->param6 = 0; - CURRENT_PARAMS(1, 1) = 0; + CURRENT_PARAM(1, 1) = 0; break; case 6: @@ -794,10 +794,10 @@ IMPLEMENT_FUNCTION_I(23, August, function23, TimeValue) if (!params->param2) { - if (!CURRENT_PARAMS(1, 3)) - CURRENT_PARAMS(1, 3) = getState()->timeTicks + 45; + if (!CURRENT_PARAM(1, 3)) + CURRENT_PARAM(1, 3) = getState()->timeTicks + 45; - if (CURRENT_PARAMS(1, 3) >= getState()->timeTicks) + if (CURRENT_PARAM(1, 3) >= getState()->timeTicks) break; if (!params->param5) { @@ -807,7 +807,7 @@ IMPLEMENT_FUNCTION_I(23, August, function23, TimeValue) } label_callback_8: - UPDATE_PARAM_PROC(CURRENT_PARAMS(1, 4), getState()->timeTicks, 75) + UPDATE_PARAM_PROC(CURRENT_PARAM(1, 4), getState()->timeTicks, 75) getEntities()->exitCompartment(kEntityAugust, kObjectCompartment1, true); if (getProgress().eventCorpseMovedFromFloor) { @@ -826,8 +826,8 @@ label_callback_8: UPDATE_PARAM_PROC_END label_callback_9: - if (params->param3 && params->param1 < getState()->time && !CURRENT_PARAMS(1, 5)) { - CURRENT_PARAMS(1, 5) = 1; + if (params->param3 && params->param1 < getState()->time && !CURRENT_PARAM(1, 5)) { + CURRENT_PARAM(1, 5) = 1; getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); setCallback(12); @@ -836,14 +836,14 @@ label_callback_9: break; } - if (!CURRENT_PARAMS(1, 1)) - CURRENT_PARAMS(1, 1) = getState()->timeTicks + 45; + if (!CURRENT_PARAM(1, 1)) + CURRENT_PARAM(1, 1) = getState()->timeTicks + 45; - if (CURRENT_PARAMS(1, 1) >= getState()->timeTicks) + if (CURRENT_PARAM(1, 1) >= getState()->timeTicks) break; if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1) { - UPDATE_PARAM(CURRENT_PARAMS(1, 2), getState()->timeTicks, 75); + UPDATE_PARAM(CURRENT_PARAM(1, 2), getState()->timeTicks, 75); getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); @@ -876,7 +876,7 @@ label_callback_9: } getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, params->param4 ? kCursorNormal : kCursorTalk, kCursorHand); - CURRENT_PARAMS(1, 2) = 0; + CURRENT_PARAM(1, 2) = 0; } else { if (getProgress().eventCorpseMovedFromFloor && getProgress().jacket != kJacketBlood) { diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp index d145eb6073..0e027f8bf0 100644 --- a/engines/lastexpress/entities/chapters.cpp +++ b/engines/lastexpress/entities/chapters.cpp @@ -419,14 +419,14 @@ label_enter_epernay: label_exit_epernay: // Exiting Epernay station - TIME_CHECK_EXITSTATION_2(kTimeExitEpernay, CURRENT_PARAMS(1, 1), params->param4, 3, "Epernay"); + TIME_CHECK_EXITSTATION_2(kTimeExitEpernay, CURRENT_PARAM(1, 1), params->param4, 3, "Epernay"); label_epernay_police: TIME_CHECK_EXITSTATION_0(params->param5, ENTITY_PARAM(0, 2), 4, "Unschedu"); label_enter_chalons: - if (getState()->time > kTimeEnterChalons && !CURRENT_PARAMS(1, 2)) { - CURRENT_PARAMS(1, 2) = 1; + if (getState()->time > kTimeEnterChalons && !CURRENT_PARAM(1, 2)) { + CURRENT_PARAM(1, 2) = 1; getProgress().field_18 = 2; } @@ -435,75 +435,75 @@ label_enter_chalons: goto label_exit_strasbourg; // Entering Chalons station - TIME_CHECK_ENTERSTATION(kTimeEnterChalons, CURRENT_PARAMS(1, 3), 5, "Chalons", kCityChalons); + TIME_CHECK_ENTERSTATION(kTimeEnterChalons, CURRENT_PARAM(1, 3), 5, "Chalons", kCityChalons); label_exit_chalons: // Exiting Chalons station - TIME_CHECK_EXITSTATION(kTimeExitChalons, CURRENT_PARAMS(1, 4), 6, "Chalons"); + TIME_CHECK_EXITSTATION(kTimeExitChalons, CURRENT_PARAM(1, 4), 6, "Chalons"); label_enter_barleduc: // Entering Bar-Le-Duc station - TIME_CHECK_ENTERSTATION(kTimeCityBarLeDuc, CURRENT_PARAMS(1, 5), 7, "BarLeDuc", kCityBarleduc); + TIME_CHECK_ENTERSTATION(kTimeCityBarLeDuc, CURRENT_PARAM(1, 5), 7, "BarLeDuc", kCityBarleduc); label_exit_barleduc: // Exiting Bar-Le-Duc station - TIME_CHECK_EXITSTATION(kTimeExitBarLeDuc, CURRENT_PARAMS(1, 6), 8, "BarLeDuc"); + TIME_CHECK_EXITSTATION(kTimeExitBarLeDuc, CURRENT_PARAM(1, 6), 8, "BarLeDuc"); label_enter_nancy: - if (getState()->time > kTime1260000 && !CURRENT_PARAMS(1, 7)) { - CURRENT_PARAMS(1, 7) = 1; + if (getState()->time > kTime1260000 && !CURRENT_PARAM(1, 7)) { + CURRENT_PARAM(1, 7) = 1; getState()->timeDelta = 1; } // Entering Nancy station - TIME_CHECK_ENTERSTATION(kTimeCityNancy, CURRENT_PARAMS(1, 8), 9, "Nancy", kCityNancy); + TIME_CHECK_ENTERSTATION(kTimeCityNancy, CURRENT_PARAM(1, 8), 9, "Nancy", kCityNancy); label_exit_nancy: // Exiting Nancy station - TIME_CHECK_EXITSTATION(kTimeExitNancy, CURRENT_PARAMS(2, 1), 10, "Nancy"); + TIME_CHECK_EXITSTATION(kTimeExitNancy, CURRENT_PARAM(2, 1), 10, "Nancy"); label_enter_luneville: // Entering Luneville station - TIME_CHECK_ENTERSTATION(kTimeCityLuneville, CURRENT_PARAMS(2, 2), 11, "Luneville", kCityLuneville); + TIME_CHECK_ENTERSTATION(kTimeCityLuneville, CURRENT_PARAM(2, 2), 11, "Luneville", kCityLuneville); label_exit_luneville: // Exiting Luneville station - TIME_CHECK_EXITSTATION(kTimeExitLuneville, CURRENT_PARAMS(2, 3), 12, "Luneville"); + TIME_CHECK_EXITSTATION(kTimeExitLuneville, CURRENT_PARAM(2, 3), 12, "Luneville"); label_enter_avricourt: // Entering Avricourt station - TIME_CHECK_ENTERSTATION(kTimeCityAvricourt, CURRENT_PARAMS(2, 4), 13, "Avricourt", kCityAvricourt); + TIME_CHECK_ENTERSTATION(kTimeCityAvricourt, CURRENT_PARAM(2, 4), 13, "Avricourt", kCityAvricourt); label_exit_avricourt: // Exiting Avricourt station - TIME_CHECK_EXITSTATION(kTimeExitAvricourt, CURRENT_PARAMS(2, 5), 14, "Avricourt"); + TIME_CHECK_EXITSTATION(kTimeExitAvricourt, CURRENT_PARAM(2, 5), 14, "Avricourt"); label_enter_deutschavricourt: // Entering Deutsch-Avricourt station - TIME_CHECK_ENTERSTATION(kTimeCityDeutschAvricourt, CURRENT_PARAMS(2, 6), 15, "DeutschA", kCityDeutschAvricourt); + TIME_CHECK_ENTERSTATION(kTimeCityDeutschAvricourt, CURRENT_PARAM(2, 6), 15, "DeutschA", kCityDeutschAvricourt); label_exit_deutschavricourt: // Exiting Avricourt station - TIME_CHECK_EXITSTATION(kTimeExitDeutschAvricourt, CURRENT_PARAMS(2, 7), 16, "DeutschA"); + TIME_CHECK_EXITSTATION(kTimeExitDeutschAvricourt, CURRENT_PARAM(2, 7), 16, "DeutschA"); label_enter_strasbourg: - TIME_CHECK_SAVEGAME(kTimeCityStrasbourg, CURRENT_PARAMS(2, 8), 17, kSavegameTypeTime, kTimeNone); + TIME_CHECK_SAVEGAME(kTimeCityStrasbourg, CURRENT_PARAM(2, 8), 17, kSavegameTypeTime, kTimeNone); label_exit_strasbourg: // Exiting Strasbourg station - TIME_CHECK_EXITSTATION(kTimeExitStrasbourg, CURRENT_PARAMS(3, 1), 19, "Strasbou"); + TIME_CHECK_EXITSTATION(kTimeExitStrasbourg, CURRENT_PARAM(3, 1), 19, "Strasbou"); label_enter_badenoos: // Entering Baden Oos station - TIME_CHECK_ENTERSTATION(kTimeCityBadenOos, CURRENT_PARAMS(3, 2), 20, "BadenOos", kCityBadenOos); + TIME_CHECK_ENTERSTATION(kTimeCityBadenOos, CURRENT_PARAM(3, 2), 20, "BadenOos", kCityBadenOos); label_exit_badenoos: // Exiting Baden Oos station - TIME_CHECK_EXITSTATION(kTimeExitBadenOos, CURRENT_PARAMS(3, 3), 21, "BadenOos"); + TIME_CHECK_EXITSTATION(kTimeExitBadenOos, CURRENT_PARAM(3, 3), 21, "BadenOos"); label_chapter1_next: - if (getState()->time > kTimeChapter1End3 && ! CURRENT_PARAMS(3, 4)) { - CURRENT_PARAMS(3, 4) = 1; + if (getState()->time > kTimeChapter1End3 && ! CURRENT_PARAM(3, 4)) { + CURRENT_PARAM(3, 4) = 1; setup_chapter1Next(); } break; @@ -928,27 +928,27 @@ label_callback_2: TIME_CHECK_ENTERSTATION(kTimeEnterAttnangPuchheim, params->param8, 3, "Attnang", kCityAttnangPuchheim); label_callback_3: - TIME_CHECK_EXITSTATION(kTimeExitAttnangPuchheim, CURRENT_PARAMS(1, 1), 4, "Attnang"); + TIME_CHECK_EXITSTATION(kTimeExitAttnangPuchheim, CURRENT_PARAM(1, 1), 4, "Attnang"); label_callback_4: - TIME_CHECK_ENTERSTATION(kTimeEnterWels, CURRENT_PARAMS(1, 2), 5, "Wels", kCityWels); + TIME_CHECK_ENTERSTATION(kTimeEnterWels, CURRENT_PARAM(1, 2), 5, "Wels", kCityWels); label_callback_5: - TIME_CHECK_EXITSTATION(kTimeEnterWels, CURRENT_PARAMS(1, 3), 6, "Wels"); + TIME_CHECK_EXITSTATION(kTimeEnterWels, CURRENT_PARAM(1, 3), 6, "Wels"); label_callback_6: - TIME_CHECK_ENTERSTATION(kTimeEnterLinz, CURRENT_PARAMS(1, 4), 7, "Linz", kCityLinz); + TIME_CHECK_ENTERSTATION(kTimeEnterLinz, CURRENT_PARAM(1, 4), 7, "Linz", kCityLinz); label_callback_7: - TIME_CHECK_EXITSTATION(kTimeCityLinz, CURRENT_PARAMS(1, 5), 8, "Linz"); + TIME_CHECK_EXITSTATION(kTimeCityLinz, CURRENT_PARAM(1, 5), 8, "Linz"); label_callback_8: - if (getState()->time > kTime2187000 && !CURRENT_PARAMS(1, 6)) { - CURRENT_PARAMS(1, 6) = 1; + if (getState()->time > kTime2187000 && !CURRENT_PARAM(1, 6)) { + CURRENT_PARAM(1, 6) = 1; getState()->timeDelta = 5; } - TIME_CHECK_ENTERSTATION(kTimeCityVienna, CURRENT_PARAMS(1, 7), 9, "Vienna", kCityVienna); + TIME_CHECK_ENTERSTATION(kTimeCityVienna, CURRENT_PARAM(1, 7), 9, "Vienna", kCityVienna); break; case kActionEndSound: @@ -1220,12 +1220,12 @@ IMPLEMENT_FUNCTION(19, Chapters, chapter4Handler) TIME_CHECK_ENTERSTATION(kTimeEnterPoszony, params->param8, 1, "Pozsony", kCityPoszony); label_exitPozsony: - TIME_CHECK_EXITSTATION(kTimeExitPoszony, CURRENT_PARAMS(1, 1), 2, "Pozsony"); + TIME_CHECK_EXITSTATION(kTimeExitPoszony, CURRENT_PARAM(1, 1), 2, "Pozsony"); label_enterGalanta: if (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) { - if (getState()->time > kTime2403000 && !CURRENT_PARAMS(1, 2)) { - CURRENT_PARAMS(1, 2) = 1; + if (getState()->time > kTime2403000 && !CURRENT_PARAM(1, 2)) { + CURRENT_PARAM(1, 2) = 1; getProgress().field_18 = 2; } } @@ -1233,28 +1233,28 @@ label_enterGalanta: if (params->param1) goto label_callback_4; - TIME_CHECK_ENTERSTATION(kTimeEnterGalanta, CURRENT_PARAMS(1, 3), 3, "Galanta", kCityGalanta); + TIME_CHECK_ENTERSTATION(kTimeEnterGalanta, CURRENT_PARAM(1, 3), 3, "Galanta", kCityGalanta); label_exitGalanta: - TIME_CHECK_EXITSTATION(kTimeExitGalanta, CURRENT_PARAMS(1, 4), 4, "Galanta"); + TIME_CHECK_EXITSTATION(kTimeExitGalanta, CURRENT_PARAM(1, 4), 4, "Galanta"); label_callback_4: - if (getState()->time > kTime2470500 && !CURRENT_PARAMS(1, 5)) { - CURRENT_PARAMS(1, 5) = 1; + if (getState()->time > kTime2470500 && !CURRENT_PARAM(1, 5)) { + CURRENT_PARAM(1, 5) = 1; if (getProgress().field_18 == 2) getState()->timeDelta = 1; } - if (getState()->time > kTime2506500 && !CURRENT_PARAMS(1, 6)) { - CURRENT_PARAMS(1, 6) = 1; + if (getState()->time > kTime2506500 && !CURRENT_PARAM(1, 6)) { + CURRENT_PARAM(1, 6) = 1; if (getProgress().field_18 == 2) getProgress().field_18 = 1; } - if (getState()->time > kTime2520000 && !CURRENT_PARAMS(1, 7)) { - CURRENT_PARAMS(1, 7) = 1; + if (getState()->time > kTime2520000 && !CURRENT_PARAM(1, 7)) { + CURRENT_PARAM(1, 7) = 1; if (!params->param2 && !params->param3) { setCallback(5); diff --git a/engines/lastexpress/entities/coudert.cpp b/engines/lastexpress/entities/coudert.cpp index 780a8bafae..254e9543e1 100644 --- a/engines/lastexpress/entities/coudert.cpp +++ b/engines/lastexpress/entities/coudert.cpp @@ -917,11 +917,11 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex) break; case kActionNone: - UPDATE_PARAM_PROC(CURRENT_PARAMS(1, 3), getState()->time, 300) + UPDATE_PARAM_PROC(CURRENT_PARAM(1, 3), getState()->time, 300) getSound()->playSound(kEntityPlayer, "ZFX1004", getSound()->getSoundFlag(kEntityCoudert)); UPDATE_PARAM_PROC_END - UPDATE_PARAM(CURRENT_PARAMS(1, 4), getState()->time, 900); + UPDATE_PARAM(CURRENT_PARAM(1, 4), getState()->time, 900); getObjects()->updateLocation2((ObjectIndex)params->param1, kObjectLocation1); @@ -929,7 +929,7 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex) getObjects()->update((ObjectIndex)params->param1, (EntityIndex)params->param3, (ObjectLocation)params->param4, (CursorStyle)params->param5, (CursorStyle)params->param6); if (params->param2) - getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param7, (ObjectLocation)params->param8, (CursorStyle)CURRENT_PARAMS(1, 1), (CursorStyle)CURRENT_PARAMS(1, 2)); + getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param7, (ObjectLocation)params->param8, (CursorStyle)CURRENT_PARAM(1, 1), (CursorStyle)CURRENT_PARAM(1, 2)); CALLBACK_ACTION(); break; @@ -953,8 +953,8 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex) if (params->param2) { params->param7 = getObjects()->get((ObjectIndex)params->param2).entity; params->param8 = getObjects()->get((ObjectIndex)params->param2).location; - CURRENT_PARAMS(1, 1) = getObjects()->get((ObjectIndex)params->param2).cursor; - CURRENT_PARAMS(1, 2) = getObjects()->get((ObjectIndex)params->param2).cursor2; + CURRENT_PARAM(1, 1) = getObjects()->get((ObjectIndex)params->param2).cursor; + CURRENT_PARAM(1, 2) = getObjects()->get((ObjectIndex)params->param2).cursor2; getObjects()->update((ObjectIndex)params->param2, kEntityCoudert, kObjectLocation1, kCursorHandKnock, kCursorHand); } @@ -2849,7 +2849,7 @@ label_callback_19: if (ENTITY_PARAM(0, 2)) { TIME_CHECK_OBJECT(kTime2025000, params->param7, kObject111, kObjectLocation7); TIME_CHECK_OBJECT(kTime2133000, params->param8, kObject111, kObjectLocation8); - TIME_CHECK_OBJECT(kTime2173500, CURRENT_PARAMS(1, 1), kObject111, kObjectLocation9); + TIME_CHECK_OBJECT(kTime2173500, CURRENT_PARAM(1, 1), kObject111, kObjectLocation9); } break; diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp index 8400c38737..502fecac84 100644 --- a/engines/lastexpress/entities/entity.cpp +++ b/engines/lastexpress/entities/entity.cpp @@ -345,22 +345,22 @@ void Entity::callSavepoint(const SavePoint &savepoint, bool handleExcuseMe) { break; case kActionExitCompartment: - if (!CURRENT_PARAMS(1, 1)) + if (!CURRENT_PARAM(1, 1)) getSavePoints()->call(_entityIndex, (EntityIndex)params->param4, (ActionIndex)params->param5, (char *)¶ms->seq2); CALLBACK_ACTION(); break; case kActionExcuseMeCath: - if (handleExcuseMe && !CURRENT_PARAMS(1, 2)) { + if (handleExcuseMe && !CURRENT_PARAM(1, 2)) { getSound()->excuseMe(_entityIndex); - CURRENT_PARAMS(1, 2) = 1; + CURRENT_PARAM(1, 2) = 1; } break; case kAction10: - if (!CURRENT_PARAMS(1, 1)) { + if (!CURRENT_PARAM(1, 1)) { getSavePoints()->call(_entityIndex, (EntityIndex)params->param4, (ActionIndex)params->param5, (char *)¶ms->seq2); - CURRENT_PARAMS(1, 1) = 1; + CURRENT_PARAM(1, 1) = 1; } break; diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h index 8243992b2e..7566471322 100644 --- a/engines/lastexpress/entities/entity_intern.h +++ b/engines/lastexpress/entities/entity_intern.h @@ -313,7 +313,7 @@ void class::setup_##name() { \ ////////////////////////////////////////////////////////////////////////// // Parameters macros (for default IIII parameters) ////////////////////////////////////////////////////////////////////////// -#define CURRENT_PARAMS(index, id) \ +#define CURRENT_PARAM(index, id) \ ((EntityData::EntityParametersIIII*)_data->getCurrentParameters(index))->param##id #define ENTITY_PARAM(index, id) \ diff --git a/engines/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp index 169192f275..73dbc57adc 100644 --- a/engines/lastexpress/entities/francois.cpp +++ b/engines/lastexpress/entities/francois.cpp @@ -280,7 +280,7 @@ IMPLEMENT_FUNCTION_I(11, Francois, function11, TimeValue) case kActionNone: if (!getSound()->isBuffered(kEntityFrancois)) { - UPDATE_PARAM_PROC(CURRENT_PARAMS(1, 1), getState()->timeTicks, params->param6) + UPDATE_PARAM_PROC(CURRENT_PARAM(1, 1), getState()->timeTicks, params->param6) switch (rnd(7)) { default: break; @@ -312,7 +312,7 @@ IMPLEMENT_FUNCTION_I(11, Francois, function11, TimeValue) } params->param6 = 15 * rnd(7); - CURRENT_PARAMS(1, 1) = 0; + CURRENT_PARAM(1, 1) = 0; UPDATE_PARAM_PROC_END } @@ -1105,14 +1105,14 @@ label_callback_7: TIME_CHECK_CALLBACK(kTime2182500, params->param8, 8, setup_function12); label_callback_8: - TIME_CHECK_CALLBACK(kTime2241000, CURRENT_PARAMS(1, 1), 9, setup_function12); + TIME_CHECK_CALLBACK(kTime2241000, CURRENT_PARAM(1, 1), 9, setup_function12); label_callback_9: if (!getInventory()->hasItem(kItemWhistle) && getInventory()->get(kItemWhistle)->location != kObjectLocation3) { - TIME_CHECK_CALLBACK_1(kTime2011500, CURRENT_PARAMS(1, 2), 10, setup_function11, kTime2016000); + TIME_CHECK_CALLBACK_1(kTime2011500, CURRENT_PARAM(1, 2), 10, setup_function11, kTime2016000); label_callback_10: - TIME_CHECK_CALLBACK_1(kTime2115000, CURRENT_PARAMS(1, 3), 11, setup_function11, kTime2119500); + TIME_CHECK_CALLBACK_1(kTime2115000, CURRENT_PARAM(1, 3), 11, setup_function11, kTime2119500); } label_callback_11: @@ -1130,13 +1130,13 @@ label_callback_11: } label_callback_12: - TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAMS(1, 5), 13, setup_function14, kObjectCompartmentE, kPosition_4840, "e"); + TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAM(1, 5), 13, setup_function14, kObjectCompartmentE, kPosition_4840, "e"); label_callback_13: - TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAMS(1, 6), 14, setup_function14, kObjectCompartmentF, kPosition_4070, "f"); + TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAM(1, 6), 14, setup_function14, kObjectCompartmentF, kPosition_4070, "f"); label_callback_14: - TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAMS(1, 7), 15, setup_function14, kObjectCompartmentB, kPosition_7500, "b"); + TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAM(1, 7), 15, setup_function14, kObjectCompartmentB, kPosition_7500, "b"); } } break; 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; } diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp index 935f707e43..e11339f5d4 100644 --- a/engines/lastexpress/entities/kronos.cpp +++ b/engines/lastexpress/entities/kronos.cpp @@ -528,8 +528,8 @@ IMPLEMENT_FUNCTION(20, Kronos, function20) params->param8 = getState()->time + 13500; } - if (CURRENT_PARAMS(1, 2) != kTimeInvalid && params->param7 < getState()->time) { - UPDATE_PARAM_PROC_TIME(params->param8, !params->param1, CURRENT_PARAMS(1, 2), 450) + if (CURRENT_PARAM(1, 2) != kTimeInvalid && params->param7 < getState()->time) { + UPDATE_PARAM_PROC_TIME(params->param8, !params->param1, CURRENT_PARAM(1, 2), 450) getSavePoints()->push(kEntityKronos, kEntityKahina, kAction237555748); UPDATE_PARAM_PROC_END } @@ -574,7 +574,7 @@ IMPLEMENT_FUNCTION(20, Kronos, function20) params->param2 = params->param3; } - if (params->param5 > 23400 || CURRENT_PARAMS(1, 1)) { + if (params->param5 > 23400 || CURRENT_PARAM(1, 1)) { if (getEntities()->isInKronosSanctum(kEntityPlayer)) { setCallback(1); setup_savegame(kSavegameTypeEvent, kEventKahinaWrongDoor); @@ -585,7 +585,7 @@ IMPLEMENT_FUNCTION(20, Kronos, function20) case kActionEndSound: getObjects()->update(kObjectCompartmentKronos, kEntityPlayer, kObjectLocation3, kCursorHandKnock, kCursorHand); - if (CURRENT_PARAMS(1, 1)) { + if (CURRENT_PARAM(1, 1)) { getSound()->playSound(kEntityPlayer, "BUMP"); getScenes()->loadSceneFromPosition(kCarGreenSleeping, 26); @@ -602,7 +602,7 @@ IMPLEMENT_FUNCTION(20, Kronos, function20) if (getEntities()->isInsideTrainCar(kEntityPlayer, kCarKronos)) { getSound()->playSound(kEntityKronos, "Kro3001"); getObjects()->update(kObjectCompartmentKronos, kEntityPlayer, kObjectLocation3, kCursorNormal, kCursorNormal); - CURRENT_PARAMS(1, 1) = 1; + CURRENT_PARAM(1, 1) = 1; break; } diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp index a076d7729f..384a368685 100644 --- a/engines/lastexpress/entities/mertens.cpp +++ b/engines/lastexpress/entities/mertens.cpp @@ -1079,11 +1079,11 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex) break; case kActionNone: - UPDATE_PARAM_PROC(CURRENT_PARAMS(1, 4), getState()->time, 300) + UPDATE_PARAM_PROC(CURRENT_PARAM(1, 4), getState()->time, 300) getSound()->playSound(kEntityPlayer, "ZFX1004", getSound()->getSoundFlag(kEntityMertens)); UPDATE_PARAM_PROC_END - UPDATE_PARAM(CURRENT_PARAMS(1, 5), getState()->time, 900); + UPDATE_PARAM(CURRENT_PARAM(1, 5), getState()->time, 900); // Update objects getObjects()->updateLocation2((ObjectIndex)params->param1, kObjectLocation1); @@ -1091,7 +1091,7 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex) getObjects()->update((ObjectIndex)params->param1, (EntityIndex)params->param4, (ObjectLocation)params->param5, (CursorStyle)params->param6, (CursorStyle)params->param7); if (params->param2) - getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param8, (ObjectLocation)CURRENT_PARAMS(1, 1), (CursorStyle)CURRENT_PARAMS(1, 2), (CursorStyle)CURRENT_PARAMS(1, 3)); + getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param8, (ObjectLocation)CURRENT_PARAM(1, 1), (CursorStyle)CURRENT_PARAM(1, 2), (CursorStyle)CURRENT_PARAM(1, 3)); CALLBACK_ACTION(); break; @@ -1115,9 +1115,9 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex) if (params->param2) { params->param8 = getObjects()->get((ObjectIndex)params->param2).entity; - CURRENT_PARAMS(1, 1) = getObjects()->get((ObjectIndex)params->param2).location; - CURRENT_PARAMS(1, 2) = getObjects()->get((ObjectIndex)params->param2).cursor; - CURRENT_PARAMS(1, 3) = getObjects()->get((ObjectIndex)params->param2).cursor2; + CURRENT_PARAM(1, 1) = getObjects()->get((ObjectIndex)params->param2).location; + CURRENT_PARAM(1, 2) = getObjects()->get((ObjectIndex)params->param2).cursor; + CURRENT_PARAM(1, 3) = getObjects()->get((ObjectIndex)params->param2).cursor2; getObjects()->update((ObjectIndex)params->param2, kEntityMertens, kObjectLocation1, kCursorHandKnock, kCursorHand); } diff --git a/engines/lastexpress/entities/milos.cpp b/engines/lastexpress/entities/milos.cpp index 0b4afc109f..4c53ecf901 100644 --- a/engines/lastexpress/entities/milos.cpp +++ b/engines/lastexpress/entities/milos.cpp @@ -191,9 +191,9 @@ IMPLEMENT_FUNCTION_I(11, Milos, function11, TimeValue) break; if (params->param6) { - UPDATE_PARAM_PROC(CURRENT_PARAMS(1, 1), getState()->time, 4500) + UPDATE_PARAM_PROC(CURRENT_PARAM(1, 1), getState()->time, 4500) params->param6 = 0; - CURRENT_PARAMS(1, 1) = 0; + CURRENT_PARAM(1, 1) = 0; UPDATE_PARAM_PROC_END } @@ -212,16 +212,16 @@ IMPLEMENT_FUNCTION_I(11, Milos, function11, TimeValue) if (!params->param4) params->param4 = getState()->time + 18000; - if (CURRENT_PARAMS(1, 2) != kTimeInvalid) { + if (CURRENT_PARAM(1, 2) != kTimeInvalid) { if (params->param4 >= getState()->time) { - if (!getEntities()->isDistanceBetweenEntities(kEntityPlayer, kEntityMilos, 2000) || !CURRENT_PARAMS(1, 2)) - CURRENT_PARAMS(1, 2) = getState()->time + 150; + if (!getEntities()->isDistanceBetweenEntities(kEntityPlayer, kEntityMilos, 2000) || !CURRENT_PARAM(1, 2)) + CURRENT_PARAM(1, 2) = getState()->time + 150; - if (CURRENT_PARAMS(1, 2) >= getState()->time) + if (CURRENT_PARAM(1, 2) >= getState()->time) break; } - CURRENT_PARAMS(1, 2) = kTimeInvalid; + CURRENT_PARAM(1, 2) = kTimeInvalid; if (getEntities()->isDistanceBetweenEntities(kEntityPlayer, kEntityMilos, 2000)) getProgress().field_98 = 1; @@ -430,13 +430,13 @@ IMPLEMENT_FUNCTION(14, Milos, function14) if (params->param1) { // TODO replace with UPDATE_PARAM_PROC (without the kTimeInvalid part) - if (!CURRENT_PARAMS(1, 1)) - CURRENT_PARAMS(1, 1) = getState()->timeTicks + 45; + if (!CURRENT_PARAM(1, 1)) + CURRENT_PARAM(1, 1) = getState()->timeTicks + 45; - if (CURRENT_PARAMS(1, 1) < getState()->timeTicks) { + if (CURRENT_PARAM(1, 1) < getState()->timeTicks) { if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1) { - UPDATE_PARAM(CURRENT_PARAMS(1, 2), getState()->timeTicks, 75); + UPDATE_PARAM(CURRENT_PARAM(1, 2), getState()->timeTicks, 75); getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); @@ -444,7 +444,7 @@ IMPLEMENT_FUNCTION(14, Milos, function14) switch (params->param5) { default: getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); - CURRENT_PARAMS(1, 2) = 0; + CURRENT_PARAM(1, 2) = 0; break; case 1: @@ -468,7 +468,7 @@ IMPLEMENT_FUNCTION(14, Milos, function14) if (params->param7 < 3) { params->param5 = 1; getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); - CURRENT_PARAMS(1, 2) = 0; + CURRENT_PARAM(1, 2) = 0; break; } @@ -495,10 +495,10 @@ IMPLEMENT_FUNCTION(14, Milos, function14) } // TODO replace with UPDATE_PARAM_PROC (without the kTimeInvalid part) - if (!CURRENT_PARAMS(1, 3)) - CURRENT_PARAMS(1, 3) = getState()->timeTicks + 75; + if (!CURRENT_PARAM(1, 3)) + CURRENT_PARAM(1, 3) = getState()->timeTicks + 75; - if (CURRENT_PARAMS(1, 3) < getState()->timeTicks) { + if (CURRENT_PARAM(1, 3) < getState()->timeTicks) { if (!params->param4) { setCallback(12); @@ -507,7 +507,7 @@ IMPLEMENT_FUNCTION(14, Milos, function14) } label_callback_12: - UPDATE_PARAM(CURRENT_PARAMS(1, 4), getState()->timeTicks, 75); + UPDATE_PARAM(CURRENT_PARAM(1, 4), getState()->timeTicks, 75); getEntities()->exitCompartment(kEntityMilos, kObjectCompartment1, true); @@ -645,7 +645,7 @@ label_callback_12: case 9: case 11: getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); - CURRENT_PARAMS(1, 2) = 0; + CURRENT_PARAM(1, 2) = 0; break; case 8: diff --git a/engines/lastexpress/entities/mmeboutarel.cpp b/engines/lastexpress/entities/mmeboutarel.cpp index 03c809c3d0..489adf8d04 100644 --- a/engines/lastexpress/entities/mmeboutarel.cpp +++ b/engines/lastexpress/entities/mmeboutarel.cpp @@ -430,7 +430,7 @@ label_callback_1: TIME_CHECK(kTime1094400, params->param8, setup_function14); if (params->param4) { - UPDATE_PARAM(CURRENT_PARAMS(1, 1), getState()->timeTicks, 75); + UPDATE_PARAM(CURRENT_PARAM(1, 1), getState()->timeTicks, 75); params->param3 = 1; params->param4 = 0; @@ -439,7 +439,7 @@ label_callback_1: getObjects()->update(kObject51, kEntityMmeBoutarel, kObjectLocation1, kCursorNormal, kCursorNormal); } - CURRENT_PARAMS(1, 1) = 0; + CURRENT_PARAM(1, 1) = 0; break; case kActionKnock: diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp index 7442eda72b..4908c71505 100644 --- a/engines/lastexpress/entities/tatiana.cpp +++ b/engines/lastexpress/entities/tatiana.cpp @@ -1777,19 +1777,19 @@ IMPLEMENT_FUNCTION(46, Tatiana, function46) } } - if (CURRENT_PARAMS(1, 1) == kTimeInvalid || getState()->time <= kTime2394000) + if (CURRENT_PARAM(1, 1) == kTimeInvalid || getState()->time <= kTime2394000) break; if (getState()->time >= kTime2398500) { - CURRENT_PARAMS(1, 1) = kTimeInvalid; + CURRENT_PARAM(1, 1) = kTimeInvalid; } else { - if (getEntities()->isInGreenCarEntrance(kEntityPlayer) || !CURRENT_PARAMS(1, 1)) - CURRENT_PARAMS(1, 1) = getState()->time; + if (getEntities()->isInGreenCarEntrance(kEntityPlayer) || !CURRENT_PARAM(1, 1)) + CURRENT_PARAM(1, 1) = getState()->time; - if (CURRENT_PARAMS(1, 1) >= getState()->time) + if (CURRENT_PARAM(1, 1) >= getState()->time) break; - CURRENT_PARAMS(1, 1) = kTimeInvalid; + CURRENT_PARAM(1, 1) = kTimeInvalid; } if (getEntities()->isInGreenCarEntrance(kEntityPlayer)) { diff --git a/engines/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp index 4bebc205ec..0d1cad0d48 100644 --- a/engines/lastexpress/entities/verges.cpp +++ b/engines/lastexpress/entities/verges.cpp @@ -494,7 +494,7 @@ IMPLEMENT_FUNCTION_ISS(16, Verges, function16, EntityIndex) break; case kActionNone: - if (CURRENT_PARAMS(1, 1) && params->param8) { + if (CURRENT_PARAM(1, 1) && params->param8) { getSavePoints()->push(kEntityVerges, (EntityIndex)params->param1, kAction125499160); if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2) && !getEntities()->isPlayerPosition(kCarRedSleeping, 2)) @@ -505,9 +505,9 @@ IMPLEMENT_FUNCTION_ISS(16, Verges, function16, EntityIndex) break; case kActionEndSound: - CURRENT_PARAMS(1, 1)++; + CURRENT_PARAM(1, 1)++; - if (CURRENT_PARAMS(1, 1) == 1) + if (CURRENT_PARAM(1, 1) == 1) getSound()->playSound(kEntityVerges, (char *)¶ms->seq2); break; @@ -923,16 +923,16 @@ label_callback4: } label_callback8: - TIME_CHECK_CALLBACK_1(kTime1107000, CURRENT_PARAMS(1, 1), 9, setup_function9, "TRA1001A"); + TIME_CHECK_CALLBACK_1(kTime1107000, CURRENT_PARAM(1, 1), 9, setup_function9, "TRA1001A"); label_callback9: - TIME_CHECK_CALLBACK_1(kTime1134000, CURRENT_PARAMS(1, 2), 10, setup_function9, "TRA1002"); + TIME_CHECK_CALLBACK_1(kTime1134000, CURRENT_PARAM(1, 2), 10, setup_function9, "TRA1002"); label_callback10: - TIME_CHECK_CALLBACK_1(kTime1165500, CURRENT_PARAMS(1, 3), 11, setup_function9, "TRA1003"); + TIME_CHECK_CALLBACK_1(kTime1165500, CURRENT_PARAM(1, 3), 11, setup_function9, "TRA1003"); label_callback11: - TIME_CHECK_CALLBACK_1(kTime1225800, CURRENT_PARAMS(1, 4), 12, setup_function9, "TRA1004"); + TIME_CHECK_CALLBACK_1(kTime1225800, CURRENT_PARAM(1, 4), 12, setup_function9, "TRA1004"); label_callback12: if (ENTITY_PARAM(0, 5) && !params->param2) { -- cgit v1.2.3