libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-19 02:38:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Fix Fall Through Compiler Warnings.

Browse Source
This commit is contained in:
D G Turner 2018-11-13 12:10:30 +00:00
parent c006f405f3
commit 09abcc5c2c
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sci/engine/ksound.cpp
View File

@ -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:

2
engines/sci/engine/scriptdebug.cpp
View File

@ -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)

4
engines/sci/graphics/text16.cpp
View File

@ -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

2
engines/sci/graphics/view.cpp
View File

@ -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));