diff options
| author | Torbjörn Andersson | 2017-08-06 13:30:51 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2017-08-06 13:30:51 +0200 |
| commit | 70a2ca8b7d64e993fdab89c7b8b0d30ab4334824 (patch) | |
| tree | 2e0686f9a69dc65cf8f2aeb801ccae8f2352b635 /engines/lastexpress/entities/mertens.cpp | |
| parent | 38a8015b830f8cec32f07bb9262d47cf096644e5 (diff) | |
| download | scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.tar.gz scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.tar.bz2 scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.zip | |
JANITORIAL: Silence more GCC 7 warnings
All these fall through were marked as deliberate, so again I've only
changed the comment to silence GCC.
Diffstat (limited to 'engines/lastexpress/entities/mertens.cpp')
| -rw-r--r-- | engines/lastexpress/entities/mertens.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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); |