aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/entities
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lastexpress/entities')
-rw-r--r--engines/lastexpress/entities/anna.cpp18
-rw-r--r--engines/lastexpress/entities/august.cpp6
-rw-r--r--engines/lastexpress/entities/boutarel.cpp2
-rw-r--r--engines/lastexpress/entities/coudert.cpp18
-rw-r--r--engines/lastexpress/entities/francois.cpp8
-rw-r--r--engines/lastexpress/entities/gendarmes.cpp2
-rw-r--r--engines/lastexpress/entities/kahina.cpp6
-rw-r--r--engines/lastexpress/entities/mertens.cpp24
-rw-r--r--engines/lastexpress/entities/rebecca.cpp4
-rw-r--r--engines/lastexpress/entities/tatiana.cpp4
-rw-r--r--engines/lastexpress/entities/verges.cpp4
-rw-r--r--engines/lastexpress/entities/yasmin.cpp10
12 files changed, 53 insertions, 53 deletions
diff --git a/engines/lastexpress/entities/anna.cpp b/engines/lastexpress/entities/anna.cpp
index 3354964af2..52e975086a 100644
--- a/engines/lastexpress/entities/anna.cpp
+++ b/engines/lastexpress/entities/anna.cpp
@@ -385,7 +385,7 @@ IMPLEMENT_FUNCTION(12, Anna, practiceMusic)
setup_playSound("MAX1120");
break;
}
- // Fallback to next case
+ // fall through
case 4:
--params->param1;
@@ -452,7 +452,7 @@ IMPLEMENT_FUNCTION_IS(15, Anna, compartmentLogic, TimeValue)
setup_playSound("LIB013");
break;
}
- // Fallback to next action
+ // fall through
case kActionKnock:
if (params->param5) {
@@ -510,7 +510,7 @@ IMPLEMENT_FUNCTION_IS(15, Anna, compartmentLogic, TimeValue)
setup_playSound("MAX1120");
break;
}
- // Fallback to next case
+ // fall through
case 2:
getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand);
@@ -1467,7 +1467,7 @@ label_callback_1:
setup_playSound("MAX1120");
break;
}
- // Fallback to next case
+ // fall through
case 4:
getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand);
@@ -1857,7 +1857,7 @@ IMPLEMENT_FUNCTION(41, Anna, goBackToSleep)
setup_playSound("MAX1120");
break;
}
- // Fallback to next case
+ // fall through
case 3:
getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand);
@@ -2431,7 +2431,7 @@ IMPLEMENT_FUNCTION(53, Anna, dressing)
setup_playSound("LIB013");
break;
}
- // Fallback to next case
+ // fall through
case kActionKnock:
getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorNormal, kCursorNormal);
@@ -2495,7 +2495,7 @@ IMPLEMENT_FUNCTION(53, Anna, dressing)
setup_playSound("MAX1120");
break;
}
- // Fallback to next case
+ // fall through
case 2:
getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand);
@@ -2579,7 +2579,7 @@ IMPLEMENT_FUNCTION(54, Anna, giveMaxToConductor2)
setup_playSound("LIB013");
break;
}
- // Fallback to next case
+ // fall through
case kActionKnock:
getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorNormal, kCursorNormal);
@@ -2636,7 +2636,7 @@ IMPLEMENT_FUNCTION(54, Anna, giveMaxToConductor2)
setup_playSound("MAX1120");
break;
}
- // Fallback to next case
+ // fall through
case 2:
getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand);
diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp
index 14dcf200f0..1176d9d473 100644
--- a/engines/lastexpress/entities/august.cpp
+++ b/engines/lastexpress/entities/august.cpp
@@ -358,7 +358,7 @@ IMPLEMENT_FUNCTION_II(19, August, function19, bool, bool)
strcpy((char *)&parameters->seq1, "666");
break;
}
- // Fallback to next action
+ // fall through
case kChapter4:
case kChapter5:
@@ -443,7 +443,7 @@ IMPLEMENT_FUNCTION_I(20, August, function20, bool)
strcpy((char *)&parameters->seq1, "666");
break;
}
- // Fallback to next case
+ // fall through
case kChapter4:
case kChapter5:
@@ -581,7 +581,7 @@ label_continue:
setup_savegame(kSavegameTypeEvent, kEventMeetAugustHisCompartment);
break;
}
- // Fallback to next case
+ // fall through
case kActionKnock:
getObjects()->update(kObjectCompartment3, kEntityAugust, kObjectLocation1, kCursorNormal, kCursorNormal);
diff --git a/engines/lastexpress/entities/boutarel.cpp b/engines/lastexpress/entities/boutarel.cpp
index 32507b0d63..0385eb084d 100644
--- a/engines/lastexpress/entities/boutarel.cpp
+++ b/engines/lastexpress/entities/boutarel.cpp
@@ -185,7 +185,7 @@ IMPLEMENT_FUNCTION_I(11, Boutarel, function11, bool)
getObjects()->update(kObjectCompartmentC, kEntityPlayer, kObjectLocation2, kCursorKeepValue, kCursorKeepValue);
else
getObjects()->update(kObjectCompartmentC, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
- // Fallback to next case
+ // fall through
case 1:
getObjects()->update(kObject50, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
diff --git a/engines/lastexpress/entities/coudert.cpp b/engines/lastexpress/entities/coudert.cpp
index 80d93d8a87..66e6b83620 100644
--- a/engines/lastexpress/entities/coudert.cpp
+++ b/engines/lastexpress/entities/coudert.cpp
@@ -1739,7 +1739,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
setup_function14(kEntityVerges);
break;
}
- // Fallback to next case
+ // fall through
case 2:
if (ENTITY_PARAM(0, 5)) {
@@ -1747,7 +1747,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
setup_function14(kEntityMertens);
break;
}
- // Fallback to next case
+ // fall through
case 3:
if (ENTITY_PARAM(0, 4)) {
@@ -1755,7 +1755,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
setup_function14(kEntityMmeBoutarel);
break;
}
- // Fallback to next case
+ // fall through
case 4:
ENTITY_PARAM(2, 6) = 0;
@@ -1776,7 +1776,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
setup_function37();
break;
}
- // Fallback to next case
+ // fall through
case 7:
if (ENTITY_PARAM(2, 2)) {
@@ -1784,7 +1784,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
setup_function39();
break;
}
- // Fallback to next case
+ // fall through
case 8:
if (ENTITY_PARAM(1, 2)) {
@@ -1792,7 +1792,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
setup_function55();
break;
}
- // Fallback to next case
+ // fall through
case 9:
if (ENTITY_PARAM(1, 7)) {
@@ -1800,7 +1800,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
setup_function34(false);
break;
}
- // Fallback to next case
+ // fall through
case 10:
ENTITY_PARAM(2, 6) = 0;
@@ -3022,7 +3022,7 @@ IMPLEMENT_FUNCTION(46, Coudert, function46)
case 6:
getEntities()->drawSequenceLeft(kEntityCoudert, "629Cf");
getEntities()->enterCompartment(kEntityCoudert, kObjectCompartmentF, true);
- // Fallback to next case
+ // fall through
case 7:
if (getSoundQueue()->isBuffered(kEntityCoudert)) {
@@ -3091,7 +3091,7 @@ IMPLEMENT_FUNCTION_I(47, Coudert, function47, bool)
case 3:
getEntities()->drawSequenceLeft(kEntityCoudert, "627Wf");
getEntities()->enterCompartment(kEntityCoudert, kObjectCompartmentF);
- // Fallback to next case
+ // fall through
case 4:
if (getSoundQueue()->isBuffered(kEntityCoudert)) {
diff --git a/engines/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp
index 8ef27cbe92..d2fb66c7ce 100644
--- a/engines/lastexpress/entities/francois.cpp
+++ b/engines/lastexpress/entities/francois.cpp
@@ -220,7 +220,7 @@ IMPLEMENT_FUNCTION(9, Francois, exitCompartment)
case 1:
getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocation2, kCursorKeepValue, kCursorKeepValue);
- // Fallback to next case
+ // fall through
case 2:
getData()->location = kLocationOutsideCompartment;
@@ -256,7 +256,7 @@ IMPLEMENT_FUNCTION(10, Francois, enterCompartment)
case 1:
getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocation2, kCursorKeepValue, kCursorKeepValue);
getSavePoints()->push(kEntityFrancois, kEntityMmeBoutarel, kAction102484312);
- // Fallback to next case
+ // fall through
case 2:
getData()->location = kLocationInsideCompartment;
@@ -423,7 +423,7 @@ label_callback:
case 2:
getSavePoints()->push(kEntityFrancois, kEntityCoudert, kAction168253822);
- // Fallback to next case
+ // fall through
case 3:
params->param2 = kCarRedSleeping;
@@ -684,7 +684,7 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, chaseBeetle, ObjectIndex, EntityPosition)
case 8:
getEntities()->exitCompartment(kEntityFrancois, (ObjectIndex)parameters->param1);
- // Fallback to next case
+ // fall through
case 9:
setCallback(10);
diff --git a/engines/lastexpress/entities/gendarmes.cpp b/engines/lastexpress/entities/gendarmes.cpp
index 1b51dd2006..572f47c99a 100644
--- a/engines/lastexpress/entities/gendarmes.cpp
+++ b/engines/lastexpress/entities/gendarmes.cpp
@@ -566,7 +566,7 @@ void Gendarmes::handleAction(const SavePoint &savepoint, bool shouldPlaySound, S
break;
}
}
- // Fallback to next action
+ // fall through
case kActionDrawScene:
if (!ENTITY_PARAM(0, 1) && getEntities()->hasValidFrame(kEntityGendarmes)) {
diff --git a/engines/lastexpress/entities/kahina.cpp b/engines/lastexpress/entities/kahina.cpp
index bbb2853721..047e3f0bd9 100644
--- a/engines/lastexpress/entities/kahina.cpp
+++ b/engines/lastexpress/entities/kahina.cpp
@@ -285,7 +285,7 @@ IMPLEMENT_FUNCTION(12, Kahina, awaitingCath)
case kActionKnock:
getSound()->playSound(kEntityPlayer, "LIB012");
- // Fallback to next action
+ // fall through
case kActionOpenDoor:
if (!getEvent(kEventKronosGoingToInvitation)) {
@@ -419,7 +419,7 @@ IMPLEMENT_FUNCTION(15, Kahina, searchTrain)
setup_updateEntity(kCarRedSleeping, kPosition_9460);
break;
}
- // Fallback to next case
+ // fall through
case 4:
if (getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_8200)
@@ -905,7 +905,7 @@ label_callback_2:
case 10:
params->param1 = 0;
- // Fallback to next case
+ // fall through
case 11:
case 12:
diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp
index 4bd276b7eb..7126adbfdc 100644
--- a/engines/lastexpress/entities/mertens.cpp
+++ b/engines/lastexpress/entities/mertens.cpp
@@ -1659,7 +1659,7 @@ label_callback11:
case 3:
getAction()->playAnimation(isNight() ? kEventMertensPushCallNight : kEventMertensPushCall);
- // fallback to default case
+ // fall through
default:
getSound()->playSound(kEntityPlayer, "LIB015");
@@ -1717,7 +1717,7 @@ label_callback11:
case 3:
getAction()->playAnimation(isNight() ? kEventMertensPushCallNight : kEventMertensPushCall);
- // fallback to default case
+ // fall through
default:
getSound()->playSound(kEntityPlayer, "LIB015");
@@ -1800,7 +1800,7 @@ label_callback11:
case 3:
getAction()->playAnimation(isNight() ? kEventMertensPushCallNight : kEventMertensPushCall);
- // fallback to default case
+ // fall through
default:
getSound()->playSound(kEntityPlayer, "LIB015");
@@ -2332,7 +2332,7 @@ IMPLEMENT_FUNCTION(32, Mertens, function32)
setup_function11(900);
break;
}
- // Fallback to next case
+ // fall through
case 3:
setCallback(4);
@@ -2402,7 +2402,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setup_function16(true);
break;
}
- // Fallback to next case
+ // fall through
case 5:
if (ENTITY_PARAM(1, 7)) {
@@ -2410,7 +2410,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setup_function16(false);
break;
}
- // Fallback to next case
+ // fall through
case 6:
if (ENTITY_PARAM(1, 5)) {
@@ -2418,7 +2418,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setup_function15(true);
break;
}
- // Fallback to next case
+ // fall through
case 7:
if (ENTITY_PARAM(1, 4)) {
@@ -2426,7 +2426,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setup_function15(false);
break;
}
- // Fallback to next case
+ // fall through
case 8:
if (ENTITY_PARAM(1, 2)) {
@@ -2434,7 +2434,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setup_function35();
break;
}
- // Fallback to next case
+ // fall through
case 9:
if (ENTITY_PARAM(0, 6)) {
@@ -2442,7 +2442,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setup_function36();
break;
}
- // Fallback to next case
+ // fall through
case 10:
if (ENTITY_PARAM(1, 3)) {
@@ -2450,7 +2450,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
setup_function40();
break;
}
- // Fallback to next case
+ // fall through
case 11:
if (ENTITY_PARAM(1, 1)) {
@@ -4059,7 +4059,7 @@ IMPLEMENT_FUNCTION(53, Mertens, function53)
getEntities()->clearSequences(kEntityMertens);
getData()->location = kLocationInsideCompartment;
getData()->entityPosition = kPosition_5790;
- // Fallback to next case
+ // fall through
case 3:
getObjects()->update(kObjectCompartment4, kEntityMertens, kObjectLocation1, kCursorHandKnock, kCursorHand);
diff --git a/engines/lastexpress/entities/rebecca.cpp b/engines/lastexpress/entities/rebecca.cpp
index 40175ad8c4..b8b4aa1275 100644
--- a/engines/lastexpress/entities/rebecca.cpp
+++ b/engines/lastexpress/entities/rebecca.cpp
@@ -897,7 +897,7 @@ IMPLEMENT_FUNCTION(24, Rebecca, function24)
setup_playSound("REB1199A");
break;
}
- // Fallback to next case
+ // fall through
case 3:
if (getCallback() == 3)
@@ -908,7 +908,7 @@ IMPLEMENT_FUNCTION(24, Rebecca, function24)
setup_playSound("REB1199B");
break;
}
- // Fallback to next case
+ // fall through
case 4:
setCallback(5);
diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp
index f684f37c85..807a8449c4 100644
--- a/engines/lastexpress/entities/tatiana.cpp
+++ b/engines/lastexpress/entities/tatiana.cpp
@@ -568,7 +568,7 @@ IMPLEMENT_FUNCTION(21, Tatiana, returnToCompartment)
getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction135854208);
getObjects()->update(kObjectCompartmentA, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorNormal);
getObjects()->update(kObjectCompartmentB, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorNormal);
- // Fallback to next case
+ // fall through
case 3:
if (getSoundQueue()->isBuffered(kEntityTatiana)) {
@@ -2264,7 +2264,7 @@ IMPLEMENT_FUNCTION(55, Tatiana, function55)
case kActionDefault:
getEntities()->clearSequences(kEntityTatiana);
- // fall back to next action
+ // fall through
case kActionDrawScene:
if (getEntities()->isPlayerPosition(kCarRestaurant, 72))
diff --git a/engines/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp
index 31b6e19c63..b16217b5eb 100644
--- a/engines/lastexpress/entities/verges.cpp
+++ b/engines/lastexpress/entities/verges.cpp
@@ -781,7 +781,7 @@ IMPLEMENT_FUNCTION(25, Verges, policeSearch)
}
break;
}
- // Fallback to next case
+ // fall through
case 2:
if (getEvent(kEventKronosConversation)) {
@@ -1832,7 +1832,7 @@ IMPLEMENT_FUNCTION(41, Verges, askPassengersToStayInCompartments)
case 1:
getEntities()->drawSequenceLeft(kEntityVerges, "620E");
- // Fallback to next case
+ // fall through
case 2:
if (getSoundQueue()->isBuffered(kEntityVerges)) {
diff --git a/engines/lastexpress/entities/yasmin.cpp b/engines/lastexpress/entities/yasmin.cpp
index e9c1c53a11..971799fb9b 100644
--- a/engines/lastexpress/entities/yasmin.cpp
+++ b/engines/lastexpress/entities/yasmin.cpp
@@ -234,22 +234,22 @@ IMPLEMENT_FUNCTION(9, Yasmin, part1)
case 2:
if (Entity::timeCheckCallback(kTime1161000, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE)))
break;
- // Fallback to case 3
+ // fall through
case 3:
if (Entity::timeCheckPlaySoundUpdatePosition(kTime1162800, params->param3, 4, "Har1102", kPosition_4070))
break;
- // Fallback to case 4
+ // fall through
case 4:
if (Entity::timeCheckCallback(kTime1165500, params->param4, 5, "Har1104", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound)))
break;
- // Fallback to case 5
+ // fall through
case 5:
if (Entity::timeCheckCallback(kTime1174500, params->param5, 6, "Har1106", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound)))
break;
- // Fallback to case 6
+ // fall through
case 6:
Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG));
@@ -364,7 +364,7 @@ IMPLEMENT_FUNCTION(14, Yasmin, part3)
case 1:
if (Entity::timeCheckCallback(kTime2106000, params->param2, 2, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE)))
break;
- // Fallback to case 2
+ // fall through
case 2:
Entity::timeCheckCallback(kTime2160000, params->param3, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG));
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 15:43:10 +0000