aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/entities/mertens.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lastexpress/entities/mertens.cpp')
-rw-r--r--engines/lastexpress/entities/mertens.cpp150
1 files changed, 75 insertions, 75 deletions
diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp
index e465bac3c9..5672fe4d49 100644
--- a/engines/lastexpress/entities/mertens.cpp
+++ b/engines/lastexpress/entities/mertens.cpp
@@ -119,7 +119,7 @@ IMPLEMENT_FUNCTION_S(2, Mertens, bloodJacket)
break;
case kActionExitCompartment:
- CALLBACK_ACTION();
+ callbackAction();
break;
case kActionDefault:
@@ -168,7 +168,7 @@ IMPLEMENT_FUNCTION_SI(4, Mertens, enterExitCompartment2, ObjectIndex)
case kAction4:
getEntities()->exitCompartment(kEntityMertens, (ObjectIndex)params->param4);
- CALLBACK_ACTION();
+ callbackAction();
return;
case kActionCallback:
@@ -195,7 +195,7 @@ IMPLEMENT_FUNCTION_SIII(5, Mertens, enterExitCompartment3, ObjectIndex, EntityPo
case kActionExitCompartment:
getEntities()->exitCompartment(_entityIndex, (ObjectIndex)params->param4);
getData()->entityPosition = (EntityPosition)params->param5;
- CALLBACK_ACTION();
+ callbackAction();
break;
case kActionDefault:
@@ -227,7 +227,7 @@ IMPLEMENT_FUNCTION(6, Mertens, callbackActionOnDirection)
case kActionNone:
if (getData()->direction != kDirectionRight) {
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -235,7 +235,7 @@ IMPLEMENT_FUNCTION(6, Mertens, callbackActionOnDirection)
break;
case kActionExitCompartment:
- CALLBACK_ACTION();
+ callbackAction();
break;
case kActionCallback:
@@ -258,7 +258,7 @@ IMPLEMENT_FUNCTION_S(7, Mertens, playSound)
break;
case kActionEndSound:
- CALLBACK_ACTION();
+ callbackAction();
break;
case kActionDefault:
@@ -285,7 +285,7 @@ IMPLEMENT_FUNCTION_S(8, Mertens, playSound16)
break;
case kActionEndSound:
- CALLBACK_ACTION();
+ callbackAction();
break;
case kActionDefault:
@@ -331,7 +331,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
|| getEntities()->checkFields10(kEntityPlayer)) {
if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2)) {
getData()->inventoryItem = kItemNone;
- CALLBACK_ACTION();
+ callbackAction();
}
break;
}
@@ -362,7 +362,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2)) {
getData()->inventoryItem = kItemNone;
- CALLBACK_ACTION();
+ callbackAction();
}
break;
@@ -393,7 +393,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
params->param3 = 1;
if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2))
- CALLBACK_ACTION();
+ callbackAction();
break;
case kActionCallback:
@@ -426,7 +426,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
getEntities()->updateEntity(kEntityMertens, kCarGreenSleeping, kPosition_2000);
getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750));
- CALLBACK_ACTION();
+ callbackAction();
break;
case 3:
@@ -442,7 +442,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
getEntities()->updateEntity(kEntityMertens, kCarGreenSleeping, kPosition_2000);
getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750));
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -484,7 +484,7 @@ IMPLEMENT_FUNCTION_I(11, Mertens, function11, uint32)
UPDATE_PARAM(params->param2, getState()->time, params->param1)
- CALLBACK_ACTION();
+ callbackAction();
break;
case kActionCallback:
@@ -504,7 +504,7 @@ IMPLEMENT_FUNCTION_I(12, Mertens, bonsoir, EntityIndex)
return;
if (getSoundQueue()->isBuffered(kEntityMertens)) {
- CALLBACK_ACTION();
+ callbackAction();
return;
}
@@ -538,7 +538,7 @@ IMPLEMENT_FUNCTION_I(12, Mertens, bonsoir, EntityIndex)
getSound()->playSound(kEntityMertens, "CON1112G");
}
- CALLBACK_ACTION();
+ callbackAction();
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
@@ -638,7 +638,7 @@ IMPLEMENT_FUNCTION_II(13, Mertens, function13, bool, bool)
case 6:
case 9:
case 10:
- CALLBACK_ACTION();
+ callbackAction();
break;
case 7:
@@ -717,7 +717,7 @@ IMPLEMENT_FUNCTION_I(14, Mertens, function14, EntityIndex)
break;
case 5:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -781,7 +781,7 @@ IMPLEMENT_FUNCTION_I(15, Mertens, function15, bool)
break;
case 6:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -858,7 +858,7 @@ IMPLEMENT_FUNCTION_I(16, Mertens, function16, bool)
break;
case 6:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -886,7 +886,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17)
getScenes()->loadSceneFromItemPosition(kItem7);
ENTITY_PARAM(2, 1) = 1;
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -924,7 +924,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17)
break;
case 2:
- CALLBACK_ACTION();
+ callbackAction();
break;
case 3:
@@ -942,7 +942,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17)
getSavePoints()->push(kEntityMertens, kEntityMertens, kActionDrawScene);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -968,7 +968,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18)
getInventory()->setLocationAndProcess(kItem7, kObjectLocation1);
ENTITY_PARAM(2, 1) = 1;
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -976,7 +976,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18)
getScenes()->loadSceneFromItemPosition(kItem7);
ENTITY_PARAM(2, 1) = 1;
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -1007,7 +1007,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18)
ENTITY_PARAM(0, 1) = 0;
getData()->inventoryItem = kItemNone;
- CALLBACK_ACTION();
+ callbackAction();
}
break;
}
@@ -1023,7 +1023,7 @@ IMPLEMENT_FUNCTION(19, Mertens, function19)
if (ENTITY_PARAM(2, 1)) {
getInventory()->setLocationAndProcess(kItem7, kObjectLocation1);
ENTITY_PARAM(2, 1) = 0;
- CALLBACK_ACTION();
+ callbackAction();
} else {
setCallback(1);
setup_bloodJacket("601C");
@@ -1037,7 +1037,7 @@ IMPLEMENT_FUNCTION(19, Mertens, function19)
if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2))
getData()->entityPosition = kPosition_2088;
- CALLBACK_ACTION();
+ callbackAction();
}
break;
}
@@ -1055,7 +1055,7 @@ IMPLEMENT_FUNCTION(20, Mertens, function20)
if (ENTITY_PARAM(2, 1)) {
ENTITY_PARAM(2, 1) = 0;
- CALLBACK_ACTION();
+ callbackAction();
} else {
setCallback(1);
setup_bloodJacket("601C");
@@ -1064,7 +1064,7 @@ IMPLEMENT_FUNCTION(20, Mertens, function20)
case kActionCallback:
if (getCallback() == 1)
- CALLBACK_ACTION();
+ callbackAction();
break;
}
IMPLEMENT_FUNCTION_END
@@ -1090,7 +1090,7 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex)
if (params->param2)
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();
+ callbackAction();
break;
case kActionKnock:
@@ -1220,7 +1220,7 @@ IMPLEMENT_FUNCTION(22, Mertens, function22)
break;
case 9:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -1289,7 +1289,7 @@ IMPLEMENT_FUNCTION(23, Mertens, function23)
case 6:
getData()->location = kLocationOutsideCompartment;
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -1349,7 +1349,7 @@ IMPLEMENT_FUNCTION(24, Mertens, function24)
case 5:
getData()->location = kLocationOutsideCompartment;
- CALLBACK_ACTION();
+ callbackAction();
break;
case 6:
@@ -1378,7 +1378,7 @@ IMPLEMENT_FUNCTION(24, Mertens, function24)
break;
case 9:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -1456,7 +1456,7 @@ IMPLEMENT_FUNCTION(25, Mertens, function25)
case 5:
getData()->location = kLocationOutsideCompartment;
- CALLBACK_ACTION();
+ callbackAction();
break;
case 6:
@@ -1490,7 +1490,7 @@ IMPLEMENT_FUNCTION(25, Mertens, function25)
break;
case 9:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -1545,7 +1545,7 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool)
case 2:
getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
case 3:
@@ -1611,7 +1611,7 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool)
getData()->location = kLocationOutsideCompartment;
getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -1626,7 +1626,7 @@ IMPLEMENT_FUNCTION_I(27, Mertens, tylerCompartment, MertensActionType)
case kActionNone:
if (getProgress().field_14 == 29) {
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -1678,7 +1678,7 @@ label_callback11:
getSound()->playSound(kEntityPlayer, "LIB015");
getScenes()->loadScene(kScene41);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
} else {
@@ -1736,7 +1736,7 @@ label_callback11:
getSound()->playSound(kEntityPlayer, "LIB015");
getScenes()->loadScene(kScene41);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
} else {
@@ -1761,7 +1761,7 @@ label_callback11:
default:
getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
case 1:
@@ -1819,7 +1819,7 @@ label_callback11:
getSound()->playSound(kEntityPlayer, "LIB015");
getScenes()->loadScene(kScene41);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
} else {
@@ -1928,7 +1928,7 @@ label_callback11:
getData()->location = kLocationOutsideCompartment;
getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
case 8:
@@ -1955,7 +1955,7 @@ label_callback11:
case 19:
case 22:
case 28:
- CALLBACK_ACTION();
+ callbackAction();
break;
case 15:
@@ -1967,7 +1967,7 @@ label_callback11:
getSound()->playSound(kEntityPlayer, "LIB015");
getScenes()->loadScene(kScene41);
- CALLBACK_ACTION();
+ callbackAction();
break;
case 16:
@@ -1979,27 +1979,27 @@ label_callback11:
getSound()->playSound(kEntityPlayer, "LIB015");
getScenes()->loadScene(kScene41);
- CALLBACK_ACTION();
+ callbackAction();
break;
case 23:
getProgress().eventMertensAugustWaiting = true;
getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
case 24:
getProgress().eventMertensKronosInvitation = true;
getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
case 25:
getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2051,7 +2051,7 @@ IMPLEMENT_FUNCTION_S(28, Mertens, function28)
break;
case 4:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2113,7 +2113,7 @@ IMPLEMENT_FUNCTION_SS(29, Mertens, function29)
break;
case 4:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2138,14 +2138,14 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType)
case kActionDefault:
switch (params->param1) {
default:
- CALLBACK_ACTION();
+ callbackAction();
return;
case 1:
params->param2 = kPosition_8200;
if (getProgress().field_14) {
- CALLBACK_ACTION();
+ callbackAction();
return;
}
@@ -2271,7 +2271,7 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType)
break;
case 9:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2310,7 +2310,7 @@ IMPLEMENT_FUNCTION_I(31, Mertens, function31, MertensActionType)
case 2:
case 3:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2358,7 +2358,7 @@ IMPLEMENT_FUNCTION(32, Mertens, function32)
break;
case 5:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2380,7 +2380,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setCallback(ENTITY_PARAM(0, 8) ? 1 : 3);
setup_updateEntity(kCarGreenSleeping, ENTITY_PARAM(0, 8) ? kPosition_1500 : kPosition_540);
} else {
- CALLBACK_ACTION();
+ callbackAction();
}
break;
@@ -2399,7 +2399,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
case 2:
ENTITY_PARAM(1, 8) = 0;
- CALLBACK_ACTION();
+ callbackAction();
break;
case 3:
@@ -2478,7 +2478,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
break;
}
- CALLBACK_ACTION();
+ callbackAction();
break;
case 12:
@@ -2491,13 +2491,13 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
break;
}
- CALLBACK_ACTION();
+ callbackAction();
break;
case 13:
ENTITY_PARAM(2, 2) = 0;
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2546,7 +2546,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35)
case kActionDefault:
if (getProgress().field_14 == 29) {
- CALLBACK_ACTION();
+ callbackAction();
break;
} else {
getProgress().field_14 = 3;
@@ -2587,7 +2587,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35)
break;
case 4:
- CALLBACK_ACTION();
+ callbackAction();
break;
case 5:
@@ -2609,7 +2609,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35)
break;
case 7:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2624,7 +2624,7 @@ IMPLEMENT_FUNCTION(36, Mertens, function36)
case kActionDefault:
if (getProgress().field_14 == 29) {
- CALLBACK_ACTION();
+ callbackAction();
} else {
getProgress().field_14 = 3;
@@ -2710,7 +2710,7 @@ IMPLEMENT_FUNCTION(36, Mertens, function36)
case 6:
case 9:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2765,7 +2765,7 @@ IMPLEMENT_FUNCTION(37, Mertens, function37)
break;
case 4:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2789,12 +2789,12 @@ IMPLEMENT_FUNCTION(38, Mertens, function38)
case kActionDefault:
if (!ENTITY_PARAM(0, 4)) {
- CALLBACK_ACTION();
+ callbackAction();
break;
}
if (getProgress().field_14 == 29) {
- CALLBACK_ACTION();
+ callbackAction();
} else {
setCallback(1);
setup_updateEntity(kCarGreenSleeping, kPosition_8200);
@@ -2808,7 +2808,7 @@ IMPLEMENT_FUNCTION(38, Mertens, function38)
case 1:
if (!ENTITY_PARAM(0, 4)) {
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -2818,7 +2818,7 @@ IMPLEMENT_FUNCTION(38, Mertens, function38)
case 2:
ENTITY_PARAM(0, 4) = 0;
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2892,7 +2892,7 @@ IMPLEMENT_FUNCTION(39, Mertens, function39)
break;
case 10:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -2938,7 +2938,7 @@ IMPLEMENT_FUNCTION(40, Mertens, function40)
case 5:
ENTITY_PARAM(0, 6) = 1;
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -3911,7 +3911,7 @@ IMPLEMENT_FUNCTION(49, Mertens, function49)
break;
case 11:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 18:50:41 +0000