aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2018-11-13 12:10:30 +0000
committerD G Turner2018-11-13 12:10:30 +0000
commit09abcc5c2c59341fadd0450db3755e1d2662655d (patch)
treeeddfbc516069531d83a92f0b7ce6f4b72837610b
parentc006f405f3b9e7109ab5f0dd08671d26c582f886 (diff)
downloadscummvm-rg350-09abcc5c2c59341fadd0450db3755e1d2662655d.tar.gz
scummvm-rg350-09abcc5c2c59341fadd0450db3755e1d2662655d.tar.bz2
scummvm-rg350-09abcc5c2c59341fadd0450db3755e1d2662655d.zip
SCI: Fix Fall Through Compiler Warnings.
-rw-r--r--engines/sci/engine/ksound.cpp2
-rw-r--r--engines/sci/engine/scriptdebug.cpp2
-rw-r--r--engines/sci/graphics/text16.cpp4
-rw-r--r--engines/sci/graphics/view.cpp2
4 files changed, 10 insertions, 0 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 4d171bdd1c..e6cd4ffc7f 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -257,6 +257,8 @@ reg_t kDoAudio(EngineState *s, int argc, reg_t *argv) {
debugC(kDebugLevelSound, "kDoAudio: CD audio subop");
return kDoCdAudio(s, argc - 1, argv + 1);
}
+ // fall through
+ // FIXME: fall through intended?
// 3 new subops in Pharkas CD (including CD demo). kDoAudio in Pharkas sits at seg026:038C
case 11:
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index f884e4da60..f5c1f8de8f 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -450,6 +450,8 @@ void SciEngine::scriptDebug() {
case kDebugSeekSpecialCallk:
if (paramb1 != _debugState.seekSpecial)
return;
+ // fall through
+ // FIXME: fall through intended?
case kDebugSeekCallk:
if (op != op_callk)
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 9808180716..a661de63f9 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -367,6 +367,8 @@ void GfxText16::Width(const char *text, int16 from, int16 len, GuiResourceId org
len -= CodeProcessing(text, orgFontId, 0, false);
break;
}
+ // fall through
+ // FIXME: fall through intended?
default:
textHeight = MAX<int16> (textHeight, _ports->_curPort->fontHeight);
textWidth += _font->getCharWidth(curChar);
@@ -471,6 +473,8 @@ void GfxText16::Draw(const char *text, int16 from, int16 len, GuiResourceId orgF
len -= CodeProcessing(text, orgFontId, orgPenColor, true);
break;
}
+ // fall through
+ // FIXME: fall through intended?
default:
charWidth = _font->getCharWidth(curChar);
// clear char
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index 02ffc240d9..319e3ac4fb 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -140,6 +140,7 @@ void GfxView::initData(GuiResourceId resourceId) {
switch (curViewType) {
case kViewEga: // SCI0 (and Amiga 16 colors)
isEGA = true;
+ // fall through
case kViewAmiga: // Amiga ECS (32 colors)
case kViewAmiga64: // Amiga AGA (64 colors)
case kViewVga: // View-format SCI1
@@ -578,6 +579,7 @@ void unpackCelData(const SciSpan<const byte> &inBuffer, SciSpan<byte> &celBitmap
switch (curByte & 0xC0) {
case 0x40: // copy bytes as is (In copy case, runLength can go up to 127 i.e. pixel & 0x40). Fixes bug #3135872.
runLength += 64;
+ // fall through
case 0x00: // copy bytes as-is
if (!literalPos) {
memcpy(outPtr + pixelNr, rlePtr, MIN<uint16>(runLength, pixelCount - pixelNr));