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/sci | |
| 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/sci')
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/graphics/plane32.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/graphics/text16.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index aaea889d83..6c5dcd16a9 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -587,10 +587,10 @@ reg_t kPlatform(EngineState *s, int argc, reg_t *argv) { switch (operation) { case kPlatformUnknown: - // For Mac versions, kPlatform(0) with other args has more functionality + // For Mac versions, kPlatform(0) with other args has more functionality. Otherwise, fall through. if (g_sci->getPlatform() == Common::kPlatformMacintosh && argc > 1) return kMacPlatform(s, argc - 1, argv + 1); - // Otherwise, fall through + // fall through case kPlatformGetPlatform: if (isWindows) return make_reg(0, kSciPlatformWindows); diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp index 50a34656de..d9e0d2d9ff 100644 --- a/engines/sci/graphics/plane32.cpp +++ b/engines/sci/graphics/plane32.cpp @@ -766,7 +766,8 @@ void Plane::setType() { _type = kPlaneTypeTransparentPicture; break; } - // fall through for games without transparent picture planes + // The game doesn't have transparent picture planes + // fall through default: if (!g_sci->_features->hasTransparentPicturePlanes() || _type != kPlaneTypeTransparentPicture) { _type = kPlaneTypePicture; diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp index 903136c29d..9808180716 100644 --- a/engines/sci/graphics/text16.cpp +++ b/engines/sci/graphics/text16.cpp @@ -225,7 +225,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId if ((*(const byte *)(textPtr + 1)) == 0xA) { curCharCount++; textPtr++; } - // it's meant to pass through here + // fall through case 0xA: case 0x9781: // this one is used by SQ4/japanese as line break as well (was added for SCI1/PC98) curCharCount++; textPtr++; @@ -233,7 +233,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId // skip another byte in case char is double-byte (PC-98) curCharCount++; textPtr++; } - // and it's also meant to pass through here + // fall through case 0: SetFont(previousFontId); _ports->penColor(previousPenColor); |