[Scummvm-git-logs] scummvm master -> c577976cd78c40e4899e01addacec3bb8fbc6565

[sluicebox]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c577976cd7 SCI: Remove FIXME from intended fall-throughs


Commit: c577976cd78c40e4899e01addacec3bb8fbc6565
    https://github.com/scummvm/scummvm/commit/c577976cd78c40e4899e01addacec3bb8fbc6565
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-12-20T23:04:42-05:00

Commit Message:
SCI: Remove FIXME from intended fall-throughs

Changed paths:
    engines/sci/graphics/text16.cpp


diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 11238b0124..c8e14e645f 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -408,12 +408,12 @@ void GfxText16::Width(const char *text, int16 from, int16 len, GuiResourceId org
 				textHeight = MAX<int16> (textHeight, _ports->_curPort->fontHeight);
 				break;
 			case 0x7C:
+				// pipe character is a control character in SCI1.1, otherwise treat as normal
 				if (getSciVersion() >= SCI_VERSION_1_1) {
 					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);
@@ -530,12 +530,12 @@ void GfxText16::Draw(const char *text, int16 from, int16 len, GuiResourceId orgF
 		case 0x9781: // this one is used by SQ4/japanese as line break as well
 			break;
 		case 0x7C:
+			// pipe character is a control character in SCI1.1, otherwise treat as normal
 			if (getSciVersion() >= SCI_VERSION_1_1) {
 				len -= CodeProcessing(text, orgFontId, orgPenColor, true);
 				break;
 			}
 			// fall through
-			// FIXME: fall through intended?
 		default:
 			charWidth = _font->getCharWidth(curChar);
 			// clear char